Remove GetOobCodeRequestType in favor of Operation

Author: avolkovi

packages-exp/auth-exp/src/api/authentication/email_and_password.test.ts

@@ -25,14 +25,14 @@ import * as mockFetch from '../../../test/mock_fetch';
 import { ServerError } from '../errors';
 import {
   EmailSignInRequest,
-  GetOobCodeRequestType,
   PasswordResetRequest,
   sendEmailVerification,
   sendPasswordResetEmail,
   sendSignInLinkToEmail,
   signInWithPassword,
   VerifyEmailRequest
 } from './email_and_password';
+import { Operation } from '../../model/action_code_info';
 
 use(chaiAsPromised);
 
@@ -91,7 +91,7 @@ describe('signInWithPassword', () => {
 describe('sendOobCode', () => {
   context('VERIFY_EMAIL', () => {
     const request: VerifyEmailRequest = {
-      requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+      requestType: Operation.VERIFY_EMAIL,
       idToken: 'my-token'
     };
 
@@ -140,7 +140,7 @@ describe('sendOobCode', () => {
 
   context('PASSWORD_RESET', () => {
     const request: PasswordResetRequest = {
-      requestType: GetOobCodeRequestType.PASSWORD_RESET,
+      requestType: Operation.PASSWORD_RESET,
       email: '[email protected]'
     };
 
@@ -191,7 +191,7 @@ describe('sendOobCode', () => {
 
   context('EMAIL_SIGNIN', () => {
     const request: EmailSignInRequest = {
-      requestType: GetOobCodeRequestType.EMAIL_SIGNIN,
+      requestType: Operation.EMAIL_SIGNIN,
       email: '[email protected]'
     };
 

packages-exp/auth-exp/src/api/authentication/email_and_password.ts

@@ -23,6 +23,7 @@ import {
 } from '..';
 import { Auth } from '../../model/auth';
 import { IdToken, IdTokenResponse } from '../../model/id_token';
+import { Operation } from '../../model/action_code_info';
 
 export interface SignInWithPasswordRequest {
   returnSecureToken?: boolean;
@@ -45,13 +46,6 @@ export async function signInWithPassword(
   >(auth, HttpMethod.POST, Endpoint.SIGN_IN_WITH_PASSWORD, request);
 }
 
-export enum GetOobCodeRequestType {
-  PASSWORD_RESET = 'PASSWORD_RESET',
-  EMAIL_SIGNIN = 'EMAIL_SIGNIN',
-  VERIFY_EMAIL = 'VERIFY_EMAIL',
-  VERIFY_AND_CHANGE_EMAIL = 'VERIFY_AND_CHANGE_EMAIL'
-}
-
 export interface GetOobCodeRequest {
   email?: string; // Everything except VERIFY_AND_CHANGE_EMAIL
   continueUrl?: string;
@@ -67,19 +61,19 @@ export interface GetOobCodeRequest {
 }
 
 export interface VerifyEmailRequest extends GetOobCodeRequest {
-  requestType: GetOobCodeRequestType.VERIFY_EMAIL;
+  requestType: Operation.VERIFY_EMAIL;
   idToken: IdToken;
 }
 
 export interface PasswordResetRequest extends GetOobCodeRequest {
-  requestType: GetOobCodeRequestType.PASSWORD_RESET;
+  requestType: Operation.PASSWORD_RESET;
   email: string;
   captchaResp?: string;
   userIp?: string;
 }
 
 export interface EmailSignInRequest extends GetOobCodeRequest {
-  requestType: GetOobCodeRequestType.EMAIL_SIGNIN;
+  requestType: Operation.EMAIL_SIGNIN;
   email: string;
 }
 

packages-exp/auth-exp/src/core/strategies/email.test.ts

@@ -24,11 +24,11 @@ import { mockEndpoint } from '../../../test/api/helper';
 import { mockAuth, testUser } from '../../../test/mock_auth';
 import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
-import { GetOobCodeRequestType } from '../../api/authentication/email_and_password';
 import { ServerError } from '../../api/errors';
 import { ProviderId } from '../providers';
 import * as location from '../util/location';
 import { fetchSignInMethodsForEmail, sendEmailVerification } from './email';
+import { Operation } from '../../model/action_code_info';
 
 use(chaiAsPromised);
 use(sinonChai);
@@ -119,38 +119,38 @@ describe('sendEmailVerification', () => {
 
   it('should send the email verification', async () => {
     const mock = mockEndpoint(Endpoint.SEND_OOB_CODE, {
-      requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+      requestType: Operation.VERIFY_EMAIL,
       email
     });
 
     await sendEmailVerification(mockAuth, user);
 
     expect(reloadStub).to.not.have.been.called;
     expect(mock.calls[0].request).to.eql({
-      requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+      requestType: Operation.VERIFY_EMAIL,
       idToken
     });
   });
 
   it('should reload the user if the API returns a different email', async () => {
     const mock = mockEndpoint(Endpoint.SEND_OOB_CODE, {
-      requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+      requestType: Operation.VERIFY_EMAIL,
       email: '[email protected]'
     });
 
     await sendEmailVerification(mockAuth, user);
 
     expect(reloadStub).to.have.been.calledOnce;
     expect(mock.calls[0].request).to.eql({
-      requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+      requestType: Operation.VERIFY_EMAIL,
       idToken
     });
   });
 
   context('on iOS', () => {
     it('should pass action code parameters', async () => {
       const mock = mockEndpoint(Endpoint.SEND_OOB_CODE, {
-        requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+        requestType: Operation.VERIFY_EMAIL,
         email
       });
       await sendEmailVerification(mockAuth, user, {
@@ -164,7 +164,7 @@ describe('sendEmailVerification', () => {
       });
 
       expect(mock.calls[0].request).to.eql({
-        requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+        requestType: Operation.VERIFY_EMAIL,
         idToken,
         continueUrl: 'my-url',
         dynamicLinkDomain: 'fdl-domain',
@@ -178,7 +178,7 @@ describe('sendEmailVerification', () => {
   context('on Android', () => {
     it('should pass action code parameters', async () => {
       const mock = mockEndpoint(Endpoint.SEND_OOB_CODE, {
-        requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+        requestType: Operation.VERIFY_EMAIL,
         email
       });
       await sendEmailVerification(mockAuth, user, {
@@ -192,7 +192,7 @@ describe('sendEmailVerification', () => {
         dynamicLinkDomain: 'fdl-domain'
       });
       expect(mock.calls[0].request).to.eql({
-        requestType: GetOobCodeRequestType.VERIFY_EMAIL,
+        requestType: Operation.VERIFY_EMAIL,
         idToken,
         continueUrl: 'my-url',
         dynamicLinkDomain: 'fdl-domain',

packages-exp/auth-exp/src/core/strategies/email.ts

@@ -15,15 +15,10 @@
  * limitations under the License.
  */
 
-import {
-  createAuthUri,
-  CreateAuthUriRequest
-} from '../../api/authentication/create_auth_uri';
+import { createAuthUri, CreateAuthUriRequest } from '../../api/authentication/create_auth_uri';
 import * as api from '../../api/authentication/email_and_password';
-import {
-  ActionCodeSettings,
-  setActionCodeSettingsOnRequest
-} from '../../model/action_code_settings';
+import { Operation } from '../../model/action_code_info';
+import { ActionCodeSettings, setActionCodeSettingsOnRequest } from '../../model/action_code_settings';
 import { Auth } from '../../model/auth';
 import { User } from '../../model/user';
 import { getCurrentUrl, isHttpOrHttps } from '../util/location';
@@ -53,7 +48,7 @@ export async function sendEmailVerification(
 ): Promise<void> {
   const idToken = await user.getIdToken();
   const request: api.VerifyEmailRequest = {
-    requestType: api.GetOobCodeRequestType.VERIFY_EMAIL,
+    requestType: Operation.VERIFY_EMAIL,
     idToken
   };
   if (actionCodeSettings) {

packages-exp/auth-exp/src/model/action_code_info.d.ts renamed to packages-exp/auth-exp/src/model/action_code_info.ts

@@ -19,7 +19,8 @@ export enum Operation {
   PASSWORD_RESET = 'PASSWORD_RESET',
   RECOVER_EMAIL = 'RECOVER_EMAIL',
   EMAIL_SIGNIN = 'EMAIL_SIGNIN',
-  VERIFY_EMAIL = 'VERIFY_EMAIL'
+  VERIFY_EMAIL = 'VERIFY_EMAIL',
+  VERIFY_AND_CHANGE_EMAIL = 'VERIFY_AND_CHANGE_EMAIL'
 }
 
 export interface ActionCodeInfo {