Add optional show_mobile_otp_screen

lakhansamani · lakhansamani · commit 43fdc826c483 · 2023-07-23T11:23:24.000+05:30
diff --git a/server/graph/generated/generated.go b/server/graph/generated/generated.go
diff --git a/server/graph/model/models_gen.go b/server/graph/model/models_gen.go
diff --git a/server/graph/schema.graphqls b/server/graph/schema.graphqls
@@ -91,7 +91,8 @@ type Error {
 
 type AuthResponse {
   message: String!
-  should_show_otp_screen: Boolean
+  should_show_email_otp_screen: Boolean
+  should_show_mobile_otp_screen: Boolean
   access_token: String
   id_token: String
   refresh_token: String
diff --git a/server/resolvers/login.go b/server/resolvers/login.go
@@ -136,8 +136,8 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
 		}()
 
 		return &model.AuthResponse{
-			Message:             "Please check the OTP in your inbox",
-			ShouldShowOtpScreen: refs.NewBoolRef(true),
+			Message:                  "Please check the OTP in your inbox",
+			ShouldShowEmailOtpScreen: refs.NewBoolRef(true),
 		}, nil
 	}
 
diff --git a/server/resolvers/mobile_login.go b/server/resolvers/mobile_login.go
@@ -136,8 +136,8 @@ func MobileLoginResolver(ctx context.Context, params model.MobileLoginInput) (*m
 			smsproviders.SendSMS(params.PhoneNumber, smsBody.String())
 		}()
 		return &model.AuthResponse{
-			Message:             "Please check the OTP",
-			ShouldShowOtpScreen: refs.NewBoolRef(true),
+			Message:                   "Please check the OTP",
+			ShouldShowMobileOtpScreen: refs.NewBoolRef(true),
 		}, nil
 	}
 
diff --git a/server/resolvers/mobile_signup.go b/server/resolvers/mobile_signup.go
@@ -225,8 +225,8 @@ func MobileSignupResolver(ctx context.Context, params *model.MobileSignUpInput)
 			smsproviders.SendSMS(mobile, smsBody.String())
 		}()
 		return &model.AuthResponse{
-			Message:             "Please check the OTP in your inbox",
-			ShouldShowOtpScreen: refs.NewBoolRef(true),
+			Message:                   "Please check the OTP in your inbox",
+			ShouldShowMobileOtpScreen: refs.NewBoolRef(true),
 		}, nil
 	}
 
diff --git a/server/test/mobile_signup_test.go b/server/test/mobile_signup_test.go
@@ -74,7 +74,7 @@ func mobileSingupTest(t *testing.T, s TestSetup) {
 		})
 		assert.NoError(t, err)
 		assert.NotNil(t, res)
-		assert.True(t, *res.ShouldShowOtpScreen)
+		assert.True(t, *res.ShouldShowMobileOtpScreen)
 		// Verify with otp
 		otp, err := db.Provider.GetOTPByPhoneNumber(ctx, phoneNumber)
 		assert.Nil(t, err)

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes`
`136`	`136`	`}()`
`137`	`137`
`138`	`138`	`return &model.AuthResponse{`
`139`		`- Message: "Please check the OTP in your inbox",`
`140`		`- ShouldShowOtpScreen: refs.NewBoolRef(true),`
	`139`	`+ Message: "Please check the OTP in your inbox",`
	`140`	`+ ShouldShowEmailOtpScreen: refs.NewBoolRef(true),`
`141`	`141`	`}, nil`
`142`	`142`	`}`
`143`	`143`