From 7ee4715af28c73443515cb2408b55aa7944f6d18 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Fri, 24 Dec 2021 07:20:22 +0530 Subject: [PATCH] fix: rename magic_link_login enum --- server/enum/signup_methods.go | 4 ++-- server/resolvers/magic_link_login.go | 8 ++++---- server/test/logout_test.go | 2 +- server/test/magic_link_login_test.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/enum/signup_methods.go b/server/enum/signup_methods.go index acc8540..1c82704 100644 --- a/server/enum/signup_methods.go +++ b/server/enum/signup_methods.go @@ -4,7 +4,7 @@ type SignupMethod int const ( BasicAuth SignupMethod = iota - MagicLink + MagicLinkLogin Google Github Facebook @@ -13,7 +13,7 @@ const ( func (d SignupMethod) String() string { return [...]string{ "basic_auth", - "magic_link", + "magic_link_login", "google", "github", "facebook", diff --git a/server/resolvers/magic_link_login.go b/server/resolvers/magic_link_login.go index 57e2690..2bb3d9d 100644 --- a/server/resolvers/magic_link_login.go +++ b/server/resolvers/magic_link_login.go @@ -37,7 +37,7 @@ func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*mod existingUser, err := db.Mgr.GetUserByEmail(params.Email) if err != nil { - user.SignupMethods = enum.MagicLink.String() + user.SignupMethods = enum.MagicLinkLogin.String() // define roles for new user if len(params.Roles) > 0 { // check if roles exists @@ -87,8 +87,8 @@ func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*mod } signupMethod := existingUser.SignupMethods - if !strings.Contains(signupMethod, enum.MagicLink.String()) { - signupMethod = signupMethod + "," + enum.MagicLink.String() + if !strings.Contains(signupMethod, enum.MagicLinkLogin.String()) { + signupMethod = signupMethod + "," + enum.MagicLinkLogin.String() } user.SignupMethods = signupMethod @@ -100,7 +100,7 @@ func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*mod if !constants.DISABLE_EMAIL_VERIFICATION { // insert verification request - verificationType := enum.MagicLink.String() + verificationType := enum.MagicLinkLogin.String() token, err := utils.CreateVerificationToken(params.Email, verificationType) if err != nil { log.Println(`error generating token`, err) diff --git a/server/test/logout_test.go b/server/test/logout_test.go index 8ff892e..634e036 100644 --- a/server/test/logout_test.go +++ b/server/test/logout_test.go @@ -19,7 +19,7 @@ func logoutTests(s TestSetup, t *testing.T) { 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{ Token: verificationRequest.Token, }) diff --git a/server/test/magic_link_login_test.go b/server/test/magic_link_login_test.go index 6d025c0..c1771cf 100644 --- a/server/test/magic_link_login_test.go +++ b/server/test/magic_link_login_test.go @@ -20,7 +20,7 @@ func magicLinkLoginTests(s TestSetup, t *testing.T) { }) 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{ Token: verificationRequest.Token, })