refactor: added addContactInfo to AuthorizedUserTestContext template

dereekb · Sep 19, 2022 · 03d06ed · 03d06ed
1 parent 5778d95
commit 03d06ed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/firebase-server/test/src/lib/firebase/firebase.admin.auth.ts b/packages/firebase-server/test/src/lib/firebase/firebase.admin.auth.ts
@@ -21,6 +21,7 @@ export interface AuthorizedUserTestContext {
   readonly uid: FirebaseAuthUserId;
   loadUserRecord(): Promise<UserRecord>;
   loadIdToken(): Promise<string>;
+  loadUserEmailAndPhone(): Promise<{ email: EmailAddress; phone?: E164PhoneNumber }>;
   loadDecodedIdToken(): Promise<DecodedIdToken>;
   makeContextOptions(): Promise<ContextOptions>;
   callCloudFunction<F extends CallCloudFunction, O = unknown>(fn: F, params: CallCloudFunctionParams<F>): Promise<O>;
@@ -36,6 +37,10 @@ export class AuthorizedUserTestContextFixture<PI extends FirebaseAdminTestContex
     return this.instance.loadUserRecord();
   }
 
+  loadUserEmailAndPhone() {
+    return this.instance.loadUserEmailAndPhone();
+  }
+
   loadIdToken(): Promise<string> {
     return this.instance.loadIdToken();
   }
@@ -103,6 +108,12 @@ export interface AuthorizedUserTestContextDetailsTemplate {
    * Custom claims object to add to a user's tokens.
    */
   claims?: object;
+  /**
+   * Whether or not to add contact info. Is false by default.
+   *
+   * Any generated contact info will be overwritten by the input template.
+   */
+  addContactInfo?: boolean;
 }
 
 /**
@@ -174,14 +185,15 @@ export function authorizedUserContextFactory<PI extends FirebaseAdminTestContext
   const makeUid = uidGetter ? asGetter(uidGetter) : testUidFactory;
 
   return (params: C, buildTests: (u: F) => void) => {
-    const { f, user: inputUser, addContactInfo } = params;
+    const { f, user: inputUser, addContactInfo: inputAddContactInfo } = params;
 
     return useJestContextFixture<F, I>({
       fixture: makeFixture(f) as F,
       buildTests,
       initInstance: async () => {
         const uid = inputUser?.uid || makeUid();
-        const { details, claims } = { ...makeUserDetails(uid, params), ...params.template };
+        const { details, claims, addContactInfo: userDetailsAddContactInfo } = { ...makeUserDetails(uid, params), ...params.template };
+        const addContactInfo = inputAddContactInfo || userDetailsAddContactInfo;
         const auth = f.instance.auth;
 
         let email: EmailAddress | undefined;

diff --git a/packages/nestjs/mailgun/src/lib/mailgun.ts b/packages/nestjs/mailgun/src/lib/mailgun.ts
@@ -43,7 +43,7 @@ export interface MailgunTemplateEmailParameters {
   /**
    * Overrides the global configuration for sending test emails to force sending. Useful when debugging specific tests.
    */
-  sendTestEmails?: true;
+  sendTestEmails?: true | undefined;
 }
 
 export interface MailgunTemplateEmailRequest extends MailgunEmailRequest, MailgunTemplateEmailParameters {