From 42efbc232b2c071d469dbcea97e726d25833cd34 Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 8 Feb 2024 18:54:44 +0300 Subject: [PATCH] check-not-basic --- server/resolvers/is_registered.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/server/resolvers/is_registered.go b/server/resolvers/is_registered.go index bd42c39..973261b 100644 --- a/server/resolvers/is_registered.go +++ b/server/resolvers/is_registered.go @@ -33,18 +33,21 @@ func IsRegisteredResolver(ctx context.Context, email string) (*model.Response, e } else { log.Debug("Found user by email: ", existingUser) if existingUser != nil { - if strings.Contains(existingUser.SignupMethods, "magic") { - res.Message = "registered" - if existingUser.EmailVerifiedAt != nil { - res.Message = "verified" - log.Debug("Email is already verified and signed up.") - return res, nil - } else if existingUser.ID != "" && existingUser.EmailVerifiedAt == nil { - res.Message = "not verified" - log.Debug("Email is already signed up. Verification pending...") - return res, nil - } - } + if strings.Contains(existingUser.SignupMethods, "magic") && !strings.Contains(existingUser.SignupMethods, "basic") { + res.Message = "registered" + } else if existingUser.EmailVerifiedAt != nil { + res.Message = "verified" + log.Debug("Email is already verified and signed up.") + return res, nil + } else if existingUser.ID != "" && existingUser.EmailVerifiedAt == nil { + res.Message = "not verified" + log.Debug("Email is already signed up. Verification pending...") + return res, nil + } else { + res.Message = "unknown" + log.Debug("Unknown signup method.") + return res, nil + } } }