Auto-enable early access flag for users in non-production environments

controllers/accounts/auth.go

@@ -86,9 +86,11 @@ func (ctrl *AuthController) Register(ctx *gin.Context) {
 		SetPassword(payload.Password).
 		SetScope(scope)
 
+	// Checking the environment to set the user as verified and give early access
 	if serverConf.Environment != "production" {
 		userCreate = userCreate.
-			SetIsEmailVerified(true)
+			SetIsEmailVerified(true).
+			SetHasEarlyAccess(true)
 	}
 
 	user, err := userCreate.Save(ctx)
@@ -260,7 +262,7 @@ func (ctrl *AuthController) Login(ctx *gin.Context) {
 
 	// Check if user has early access
 	environment := serverConf.Environment
-	if !user.HasEarlyAccess && (environment == "production" || environment == "staging") {
+	if !user.HasEarlyAccess && (environment == "production") {
 		u.APIResponse(ctx, http.StatusUnauthorized, "error",
 			"Your early access request is still pending", nil,
 		)

controllers/accounts/auth_test.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
+	"os"
 	"regexp"
 	"strings"
 	"testing"
@@ -13,6 +15,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/jarcoal/httpmock"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/paycrest/aggregator/config"
 	"github.com/paycrest/aggregator/ent"
 	"github.com/paycrest/aggregator/routers/middleware"
 	svc "github.com/paycrest/aggregator/services"
@@ -32,6 +35,7 @@ import (
 )
 
 func TestAuth(t *testing.T) {
+
 	// setup httpmock
 	httpmock.Activate()
 	defer httpmock.Deactivate()
@@ -433,6 +437,62 @@ func TestAuth(t *testing.T) {
 			assert.Contains(t, errorMap, "message")
 		})
 
+		t.Run("testing UserEarlyAccess", func(t *testing.T) {
+			tests := []struct {
+				name                string
+				environment         string
+				expectedEarlyAccess bool
+			}{
+				{
+					name:                "Non-production environment (development)",
+					environment:         "development",
+					expectedEarlyAccess: true,
+				},
+				{
+					name:                "Non-production environment (staging)",
+					environment:         "staging",
+					expectedEarlyAccess: true,
+				},
+				{
+					name:                "Production environment",
+					environment:         "production",
+					expectedEarlyAccess: false,
+				},
+			}
+
+			for _, tt := range tests {
+				t.Run(tt.name, func(t *testing.T) {
+					os.Setenv("ENVIRONMENT", tt.environment)
+
+					serverConf := config.ServerConfiguration{Environment: tt.environment}
+
+					hasEarlyAccess := serverConf.Environment != "production"
+
+					ctx := context.Background()
+					user, err := client.User.Create().
+						SetFirstName("Ike").
+						SetLastName("Ayo").
+						SetEmail(fmt.Sprintf("test-%[email protected]", tt.environment)).
+						SetPassword("password").
+						SetScope("sender").
+						SetHasEarlyAccess(hasEarlyAccess).
+						Save(ctx)
+					assert.NoError(t, err)
+
+					createdUser, err := client.User.Get(ctx, user.ID)
+					if err != nil {
+						t.Fatal("Failed to fetch user from database:", err)
+					}
+					assert.Equal(t, tt.expectedEarlyAccess, createdUser.HasEarlyAccess, "unexpected HasEarlyAccess for environment %s", tt.environment)
+
+					// Cleanup
+					err = client.User.DeleteOne(user).Exec(ctx)
+					assert.NoError(t, err)
+				})
+
+			}
+		})
+
 	})
 
 	t.Run("ConfirmEmail", func(t *testing.T) {

ent/schema/user.go

@@ -39,7 +39,7 @@ func (User) Fields() []ent.Field {
 		field.String("scope"),
 		field.Bool("is_email_verified").
 			Default(false),
-		field.Bool("has_early_access").
+		field.Bool("has_early_access"). // has_early_access is "false" by default
 			Default(false),
 	}
 }