devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

fix: rename magic_link_login enum

Browse Source
This commit is contained in:
Lakhan Samani 2021-12-24 07:20:22 +05:30
parent 1b3f931074
commit 7ee4715af2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/enum/signup_methods.go
View File

@ -4,7 +4,7 @@ type SignupMethod int
const ( const (
BasicAuth SignupMethod = iota BasicAuth SignupMethod = iota
MagicLink MagicLinkLogin
Google Google
Github Github
Facebook Facebook
@ -13,7 +13,7 @@ const (
func (d SignupMethod) String() string { func (d SignupMethod) String() string {
return [...]string{ return [...]string{
"basic_auth", "basic_auth",
"magic_link", "magic_link_login",
"google", "google",
"github", "github",
"facebook", "facebook",

8
server/resolvers/magic_link_login.go
View File

@ -37,7 +37,7 @@ func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*mod
existingUser, err := db.Mgr.GetUserByEmail(params.Email) existingUser, err := db.Mgr.GetUserByEmail(params.Email)
if err != nil { if err != nil {
user.SignupMethods = enum.MagicLink.String() user.SignupMethods = enum.MagicLinkLogin.String()
// define roles for new user // define roles for new user
if len(params.Roles) > 0 { if len(params.Roles) > 0 {
// check if roles exists // check if roles exists
@ -87,8 +87,8 @@ func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*mod
} }
signupMethod := existingUser.SignupMethods signupMethod := existingUser.SignupMethods
if !strings.Contains(signupMethod, enum.MagicLink.String()) { if !strings.Contains(signupMethod, enum.MagicLinkLogin.String()) {
signupMethod = signupMethod + "," + enum.MagicLink.String() signupMethod = signupMethod + "," + enum.MagicLinkLogin.String()
} }
user.SignupMethods = signupMethod user.SignupMethods = signupMethod
@ -100,7 +100,7 @@ func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*mod
if !constants.DISABLE_EMAIL_VERIFICATION { if !constants.DISABLE_EMAIL_VERIFICATION {
// insert verification request // insert verification request
verificationType := enum.MagicLink.String() verificationType := enum.MagicLinkLogin.String()
token, err := utils.CreateVerificationToken(params.Email, verificationType) token, err := utils.CreateVerificationToken(params.Email, verificationType)
if err != nil { if err != nil {
log.Println(`error generating token`, err) log.Println(`error generating token`, err)

2
server/test/logout_test.go
View File

@ -19,7 +19,7 @@ func logoutTests(s TestSetup, t *testing.T) {
Email: email, Email: email,
}) })
verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.MagicLink.String()) verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.MagicLinkLogin.String())
verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{ verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
Token: verificationRequest.Token, Token: verificationRequest.Token,
}) })

2
server/test/magic_link_login_test.go
View File

@ -20,7 +20,7 @@ func magicLinkLoginTests(s TestSetup, t *testing.T) {
}) })
assert.Nil(t, err) assert.Nil(t, err)
verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.MagicLink.String()) verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.MagicLinkLogin.String())
verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{ verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
Token: verificationRequest.Token, Token: verificationRequest.Token,
}) })