fix: added support for signupDisabled (#803)

nhost · Nov 16, 2023 · d9b92a7 · d9b92a7
1 parent f1f9c08
commit d9b92a7
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 20 deletions.
diff --git a/cmd/config/example.go b/cmd/config/example.go
@@ -105,7 +105,8 @@ func commandExample(cCtx *cli.Context) error { //nolint:funlen,maintidx
 				},
 			},
 			SignUp: &model.ConfigAuthSignUp{
-				Enabled: ptr(true),
+				Enabled:         ptr(true),
+				DisableNewUsers: ptr(false),
 			},
 			User: &model.ConfigAuthUser{
 				Roles: &model.ConfigAuthUserRoles{

diff --git a/cmd/config/validate_test.go b/cmd/config/validate_test.go
@@ -58,7 +58,10 @@ func expectedConfig() *model.ConfigConfig {
 				ClientUrl:   ptr("http://localhost:3000"),
 				AllowedUrls: []string{},
 			},
-			SignUp: &model.ConfigAuthSignUp{Enabled: ptr(true)},
+			SignUp: &model.ConfigAuthSignUp{
+				Enabled:         ptr(true),
+				DisableNewUsers: ptr(false),
+			},
 			User: &model.ConfigAuthUser{
 				Roles: &model.ConfigAuthUserRoles{
 					Default: ptr("user"),

diff --git a/dockercompose/auth_test.go b/dockercompose/auth_test.go
@@ -28,6 +28,7 @@ func expectedAuth() *Service {
 			"AUTH_API_PREFIX":                           "/v1",
 			"AUTH_CLIENT_URL":                           "http://localhost:3000",
 			"AUTH_DISABLE_NEW_USERS":                    "false",
+			"AUTH_DISABLE_SIGNUP":                       "false",
 			"AUTH_EMAIL_PASSWORDLESS_ENABLED":           "true",
 			"AUTH_EMAIL_SIGNIN_EMAIL_VERIFIED_REQUIRED": "true",
 			"AUTH_GRAVATAR_DEFAULT":                     "gravatarDefault",

diff --git a/dockercompose/main_test.go b/dockercompose/main_test.go
@@ -153,7 +153,8 @@ func getConfig() *model.ConfigConfig { //nolint:maintidx
 				},
 			},
 			SignUp: &model.ConfigAuthSignUp{
-				Enabled: ptr(true),
+				Enabled:         ptr(true),
+				DisableNewUsers: ptr(false),
 			},
 			Totp: &model.ConfigAuthTotp{
 				Enabled: ptr(true),

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/go-git/go-git/v5 v5.9.0
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-getter v1.7.3
-	github.com/nhost/be v0.0.0-20231107151453-7e54cb68abc2
+	github.com/nhost/be v0.0.0-20231115145121-4df40f281955
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/urfave/cli/v2 v2.25.7
 	github.com/wI2L/jsondiff v0.4.0

diff --git a/go.sum b/go.sum
@@ -446,6 +446,8 @@ github.com/nhost/be v0.0.0-20231107143741-114c8c189274 h1:53zsrfBgz1EjWIz04btAbO
 github.com/nhost/be v0.0.0-20231107143741-114c8c189274/go.mod h1:wYw8iVi1dZG6IAK0eCSOFAWHAISTa+9sjGA6Vx/x1Sg=
 github.com/nhost/be v0.0.0-20231107151453-7e54cb68abc2 h1:KhTGs5SUCi7zWYAS9Dag2POf6ok6rWUCW+On8KakoME=
 github.com/nhost/be v0.0.0-20231107151453-7e54cb68abc2/go.mod h1:wYw8iVi1dZG6IAK0eCSOFAWHAISTa+9sjGA6Vx/x1Sg=
+github.com/nhost/be v0.0.0-20231115145121-4df40f281955 h1:2IW0EEbAnz6QoOa4SztmAAImZqOZW6zpstSznyaenU4=
+github.com/nhost/be v0.0.0-20231115145121-4df40f281955/go.mod h1:wYw8iVi1dZG6IAK0eCSOFAWHAISTa+9sjGA6Vx/x1Sg=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -2,13 +2,12 @@
 
   go = prev.go_1_21.overrideAttrs
     (finalAttrs: previousAttrs: rec {
-      version = "1.21.3";
+      version = "1.21.4";
 
       src = final.fetchurl {
         url = "https://go.dev/dl/go${version}.src.tar.gz";
-        sha256 = "sha256-GG8rb4yLcE5paCGwmrIEGlwe4T3LwxVqE63PdZMe5Ig=";
+        sha256 = "sha256-R7Jqg9K2WjwcG8rOJztpvuSaentRaKdgTe09JqN714c=";
       };
-
     });
 
   buildGoModule = prev.buildGoModule.override { go = go; };

diff --git a/vendor/github.com/nhost/be/services/mimir/model/cuegraph_gen.go b/vendor/github.com/nhost/be/services/mimir/model/cuegraph_gen.go
diff --git a/vendor/github.com/nhost/be/services/mimir/schema/appconfig/hasura_auth.go b/vendor/github.com/nhost/be/services/mimir/schema/appconfig/hasura_auth.go
diff --git a/vendor/github.com/nhost/be/services/mimir/schema/schema.cue b/vendor/github.com/nhost/be/services/mimir/schema/schema.cue
diff --git a/vendor/github.com/nhost/be/services/mimir/schema/schema_gen.graphqls b/vendor/github.com/nhost/be/services/mimir/schema/schema_gen.graphqls
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -397,7 +397,7 @@ github.com/muesli/reflow/wrap
 # github.com/muesli/termenv v0.15.2
 ## explicit; go 1.17
 github.com/muesli/termenv
-# github.com/nhost/be v0.0.0-20231107151453-7e54cb68abc2
+# github.com/nhost/be v0.0.0-20231115145121-4df40f281955
 ## explicit; go 1.21
 github.com/nhost/be/services/mimir/model
 github.com/nhost/be/services/mimir/schema