fix unit tests

Author: blidd-google

spec/v2/providers/identity.spec.ts

@@ -207,31 +207,30 @@ describe("identity", () => {
         },
       ]);
     });
-  });
 
-  it("should accept options and a handler", () => {
-    const fn = identity.beforeEmailSent(opts, () => Promise.resolve());
-
-    expect(fn.__endpoint).to.deep.equal({
-      ...MINIMAL_V2_ENDPOINT,
-      platform: "gcfv2",
-      labels: {},
-      minInstances: 1,
-      region: [REGION],
-      blockingTrigger: {
-        ...BEFORE_EMAIL_TRIGGER,
-        options: {
-          ...BEFORE_EMAIL_TRIGGER.options,
-          accessToken: true,
+    it("should accept options and a handler", () => {
+      const fn = identity.beforeEmailSent(
+        { region: opts.region, minInstances: opts.minInstances },
+        () => Promise.resolve()
+      );
+
+      expect(fn.__endpoint).to.deep.equal({
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        labels: {},
+        minInstances: 1,
+        region: [REGION],
+        blockingTrigger: {
+          ...BEFORE_EMAIL_TRIGGER,
         },
-      },
+      });
+      expect(fn.__requiredAPIs).to.deep.equal([
+        {
+          api: IDENTITY_TOOLKIT_API,
+          reason: "Needed for auth blocking functions",
+        },
+      ]);
     });
-    expect(fn.__requiredAPIs).to.deep.equal([
-      {
-        api: IDENTITY_TOOLKIT_API,
-        reason: "Needed for auth blocking functions",
-      },
-    ]);
   });
 
   describe("beforeOperation", () => {
@@ -347,10 +346,6 @@ describe("identity", () => {
         region: [REGION],
         blockingTrigger: {
           ...BEFORE_EMAIL_TRIGGER,
-          options: {
-            ...BEFORE_EMAIL_TRIGGER.options,
-            accessToken: true,
-          },
         },
       });
       expect(fn.__requiredAPIs).to.deep.equal([

src/v2/providers/identity.ts

@@ -273,11 +273,11 @@ export function beforeOperation(
   if (!handler || typeof optsOrHandler === "function") {
     handler = optsOrHandler as (
       event: AuthBlockingEvent
-    ) => BeforeEmailResponse | void | Promise<BeforeEmailResponse> | Promise<void>;
+    ) => MaybeAsync<BeforeCreateResponse | BeforeSignInResponse | BeforeEmailResponse | void>;
     optsOrHandler = {};
   }
 
-  const { opts, accessToken, idToken, refreshToken } = getOpts(optsOrHandler);
+  const { opts, ...blockingOptions } = getOpts(optsOrHandler);
 
   // Create our own function that just calls the provided function so we know for sure that
   // handler takes one argument. This is something common/providers/identity depends on.
@@ -302,9 +302,7 @@ export function beforeOperation(
     blockingTrigger: {
       eventType: legacyEventType,
       options: {
-        accessToken,
-        idToken,
-        refreshToken,
+        ...((eventType === "beforeCreate" || eventType === "beforeSignIn") && blockingOptions),
       },
     },
   };