diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-12-07 13:31:39 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-12-07 13:31:39 +0100 |
| commit | 0884f89431cd26bcc9674b3b7ab628b090f5881e (patch) | |
| tree | cdd3b3f77f780a8b59d075dbcc3d4d013811e405 /internal/api/client/auth/callback.go | |
| parent | Update dependencies (#333) (diff) | |
| download | gotosocial-0884f89431cd26bcc9674b3b7ab628b090f5881e.tar.xz | |
Implement Cobra CLI tooling, Viper config tooling (#336)
* start pulling out + replacing urfave and config
* replace many many instances of config
* move more stuff => viper
* properly remove urfave
* move some flags to root command
* add testrig commands to root
* alias config file keys
* start adding cli parsing tests
* reorder viper init
* remove config path alias
* fmt
* change config file keys to non-nested
* we're more or less in business now
* tidy up the common func
* go fmt
* get tests passing again
* add note about the cliparsing tests
* reorganize
* update docs with changes
* structure cmd dir better
* rename + move some files around
* fix dangling comma
Diffstat (limited to 'internal/api/client/auth/callback.go')
| -rw-r--r-- | internal/api/client/auth/callback.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/internal/api/client/auth/callback.go b/internal/api/client/auth/callback.go index 286bcd935..d50fea3db 100644 --- a/internal/api/client/auth/callback.go +++ b/internal/api/client/auth/callback.go @@ -30,6 +30,8 @@ import ( "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/spf13/viper" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/oidc" @@ -211,7 +213,8 @@ func (m *Module) parseUserFromClaims(ctx context.Context, claims *oidc.Claims, i password := uuid.NewString() + uuid.NewString() // create the user! this will also create an account and store it in the database so we don't need to do that here - user, err = m.db.NewSignup(ctx, username, "", m.config.AccountsConfig.RequireApproval, claims.Email, password, ip, "", appID, claims.EmailVerified, admin) + requireApproval := viper.GetBool(config.Keys.AccountsApprovalRequired) + user, err = m.db.NewSignup(ctx, username, "", requireApproval, claims.Email, password, ip, "", appID, claims.EmailVerified, admin) if err != nil { return nil, fmt.Errorf("error creating user: %s", err) } |