Merge pull request #13237 from tylerd-canva/cfaccess-jwt-pass

Auth Backend: Add JWT to CloudflareAccessResult

plugins/auth-backend/src/providers/cloudflare-access/provider.test.ts

@@ -138,12 +138,28 @@ describe('CloudflareAccessAuthProvider', () => {
   const provider = new CloudflareAccessAuthProvider({
     teamName: 'foobar',
     resolverContext: {} as AuthResolverContext,
-    authHandler: async ({ claims }) => ({
-      profile: {
-        email: claims.email,
-      },
-    }),
-    signInResolver: async () => {
+    authHandler: async result => {
+      expect(result).toEqual(
+        expect.objectContaining({
+          claims: mockClaims,
+          cfIdentity: mockCfIdentity,
+          token: mockJwt,
+        }),
+      );
+      return {
+        profile: {
+          email: result.claims.email,
+        },
+      };
+    },
+    signInResolver: async ({ result }) => {
+      expect(result).toEqual(
+        expect.objectContaining({
+          claims: mockClaims,
+          cfIdentity: mockCfIdentity,
+          token: mockJwt,
+        }),
+      );
       return {
         token:
           'eyblob.eyJzdWIiOiJ1c2VyOmRlZmF1bHQvamltbXltYXJrdW0iLCJlbnQiOlsidXNlcjpkZWZhdWx0L2ppbW15bWFya3VtIl19.eyblob',

plugins/auth-backend/src/providers/cloudflare-access/provider.ts

@@ -153,6 +153,7 @@ export type CloudflareAccessResult = {
   claims: CloudflareAccessClaims;
   cfIdentity: CloudflareAccessIdentityProfile;
   expiresInSeconds?: number;
+  token: string;
 };
 
 /**
@@ -262,7 +263,11 @@ export class CloudflareAccessAuthProvider implements AuthProviderRouteHandlers {
     const sub = verifyResult.payload.sub;
     const cfAccessResultStr = await this.cache?.get(`${CACHE_PREFIX}/${sub}`);
     if (typeof cfAccessResultStr === 'string') {
-      return JSON.parse(cfAccessResultStr) as CloudflareAccessResult;
+      const result = JSON.parse(cfAccessResultStr) as CloudflareAccessResult;
+      return {
+        ...result,
+        token: jwt,
+      };
     }
     const claims = verifyResult.payload as CloudflareAccessClaims;
     // Builds a passport profile from JWT claims first
@@ -273,13 +278,16 @@ export class CloudflareAccessAuthProvider implements AuthProviderRouteHandlers {
       const cfIdentity = await this.getIdentityProfile(jwt);
       // Stores a stringified JSON object in cfaccess provider cache only when
       // we complete all steps
-      const cfAccessResult: CloudflareAccessResult = {
+      const cfAccessResult = {
         claims,
         cfIdentity,
         expiresInSeconds: claims.exp - claims.iat,
       };
       this.cache?.set(`${CACHE_PREFIX}/${sub}`, JSON.stringify(cfAccessResult));
-      return cfAccessResult;
+      return {
+        ...cfAccessResult,
+        token: jwt,
+      };
     } catch (err) {
       throw new ForwardedError(
         'Failed to populate access identity information',