From 951660e8a6508604bfe6d97c076d08c7233e6527 Mon Sep 17 00:00:00 2001
From: thorwebdev <thor@supabase.io>
Date: Sat, 19 Mar 2022 15:21:33 +0100
Subject: [PATCH] chore: refactor

---
 src/GoTrueApi.ts       | 25 +++++++++----------------
 src/GoTrueClient.ts    |  4 ++--
 src/lib/types.ts       | 24 +++++++++++++-----------
 test/GoTrueApi.test.ts | 19 ++++++++-----------
 4 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/GoTrueApi.ts b/src/GoTrueApi.ts
index a0eff3f0..0bec4087 100644
--- a/src/GoTrueApi.ts
+++ b/src/GoTrueApi.ts
@@ -7,7 +7,7 @@ import {
   CookieOptions,
   User,
   OpenIDConnectCredentials,
-  VerifyOTPParams
+  VerifyOTPParams,
 } from './lib/types'
 import { COOKIE_OPTIONS } from './lib/constants'
 import { setCookies, getCookieString } from './lib/cookies'
@@ -337,7 +337,7 @@ export default class GoTrueApi {
   }
 
   /**
-   * @deprecated Send User supplied Mobile OTP to be verified
+   * @deprecated Use `verifyOTP` instead!
    * @param phone The user's phone number WITH international prefix
    * @param token token that user was sent to their mobile phone
    * @param redirectTo A URL or mobile address to send the user to after they are confirmed.
@@ -374,26 +374,19 @@ export default class GoTrueApi {
    * @param redirectTo A URL or mobile address to send the user to after they are confirmed.
    */
   async verifyOTP(
-    { email, phone, token, type }: VerifyOTPParams,
+    { email, phone, token, type = 'sms' }: VerifyOTPParams,
     options: {
       redirectTo?: string
     } = {}
   ): Promise<{ data: Session | User | null; error: ApiError | null }> {
     try {
       const headers = { ...this.headers }
-      const data = (email && type) 
-        ? await post(
-          this.fetch,
-          `${this.url}/verify`,
-          { email, token, type: type, redirect_to: options.redirectTo },
-          { headers }
-        )
-        : await post(
-          this.fetch,
-          `${this.url}/verify`,
-          { phone, token, type: 'sms', redirect_to: options.redirectTo },
-          { headers }
-        )
+      const data = await post(
+        this.fetch,
+        `${this.url}/verify`,
+        { email, phone, token, type, redirect_to: options.redirectTo },
+        { headers }
+      )
       const session = { ...data }
       if (session.expires_in) session.expires_at = expiresAt(data.expires_in)
       return { data: session, error: null }
diff --git a/src/GoTrueClient.ts b/src/GoTrueClient.ts
index 5acfe7c4..3491a3c5 100644
--- a/src/GoTrueClient.ts
+++ b/src/GoTrueClient.ts
@@ -265,7 +265,7 @@ export default class GoTrueClient {
    * @param redirectTo A URL or mobile address to send the user to after they are confirmed.
    */
   async verifyOTP(
-    { email, phone, token, type = 'sms' }: VerifyOTPParams,
+    params: VerifyOTPParams,
     options: {
       redirectTo?: string
     } = {}
@@ -277,7 +277,7 @@ export default class GoTrueClient {
     try {
       this._removeSession()
 
-      const { data, error } = await this.api.verifyOTP({ email, phone, token, type }, options)
+      const { data, error } = await this.api.verifyOTP(params, options)
 
       if (error) {
         throw error
diff --git a/src/lib/types.ts b/src/lib/types.ts
index dacf33d6..04692d1b 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -185,19 +185,21 @@ export interface UserCredentials {
   oidc?: OpenIDConnectCredentials
 }
 
-export interface VerifyOTPParams {
-  email?: string
-  phone?: string
+export type VerifyOTPParams = VerifyMobileOTPParams | VerifyEmailOTPParams
+export interface VerifyMobileOTPParams {
+  email?: undefined
+  phone: string
+  token: string
+  type?: MobileOTPType
+}
+export interface VerifyEmailOTPParams {
+  email: string
+  phone?: undefined
   token: string
-  type?: OTPType
+  type: EmailOTPType
 }
-export type OTPType = 
-  | 'signup' 
-  | 'invite' 
-  | 'magiclink' 
-  | 'recover' 
-  | 'email_change' 
-  | 'sms'
+export type MobileOTPType = 'sms'
+export type EmailOTPType = 'signup' | 'invite' | 'magiclink' | 'recover' | 'email_change'
 
 export interface OpenIDConnectCredentials {
   id_token: string
diff --git a/test/GoTrueApi.test.ts b/test/GoTrueApi.test.ts
index 47b33df7..c42f58df 100644
--- a/test/GoTrueApi.test.ts
+++ b/test/GoTrueApi.test.ts
@@ -4,7 +4,6 @@ import {
   clientApiAutoConfirmOffSignupsEnabledClient,
   serviceRoleApiClient,
   serviceRoleApiClientWithSms,
-  authClient,
   clientApiAutoConfirmDisabledClient,
 } from './lib/clients'
 
@@ -531,30 +530,28 @@ describe('GoTrueApi', () => {
       test('verifyOTP() with invalid email', async () => {
         const { email } = mockUserCredentials()
         const otp = mockVerificationOTP()
-        const { data, error } = await serviceRoleApiClientWithSms.verifyOTP({ 
-          email: `${email}-@invalid`, 
-          token: otp, 
-          type: 'signup' 
+        const { data, error } = await serviceRoleApiClientWithSms.verifyOTP({
+          email: `${email}-@invalid`,
+          token: otp,
+          type: 'signup',
         })
 
         expect(data).toBeNull()
         expect(error?.status).toEqual(422)
         expect(error?.message).toEqual('Invalid email format')
-        
       })
       test('verifyOTP() with invalid phone', async () => {
         const { phone } = mockUserCredentials()
         const otp = mockVerificationOTP()
-        const { data, error } = await serviceRoleApiClientWithSms.verifyOTP({ 
-          phone: `${phone}-invalid`, 
-          token: otp, 
-          type: 'sms' 
+        const { data, error } = await serviceRoleApiClientWithSms.verifyOTP({
+          phone: `${phone}-invalid`,
+          token: otp,
+          type: 'sms',
         })
 
         expect(data).toBeNull()
         expect(error?.status).toEqual(422)
         expect(error?.message).toEqual('Invalid phone number format')
-        
       })
     })
   })