run prettier formatting

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

plugins/auth-backend/src/identity/TokenFactory.ts

@@ -150,7 +150,7 @@ export class TokenFactory implements TokenIssuer {
       //       the new one. This also needs to be implemented cross-service though, meaning new services
       //       that boot up need to be able to grab an existing key to use for signing.
       this.logger.info(`Created new signing key ${key.kid}`);
-      await this.keyStore.addKey((key.toJWK(false) as unknown) as AnyJWK);
+      await this.keyStore.addKey(key.toJWK(false) as unknown as AnyJWK);
 
       // At this point we are allowed to start using the new key
       return key as JSONWebKey;

plugins/auth-backend/src/lib/flow/authFlowHelpers.test.ts

@@ -32,10 +32,10 @@ describe('oauth helpers', () => {
   describe('postMessageResponse', () => {
     const appOrigin = 'http://localhost:3000';
     it('should post a message back with payload success', () => {
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn().mockReturnThis(),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -64,10 +64,10 @@ describe('oauth helpers', () => {
     });
 
     it('should post a message back with payload error', () => {
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn().mockReturnThis(),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -84,13 +84,13 @@ describe('oauth helpers', () => {
     it('should call postMessage twice but only one of them with target *', () => {
       let responseBody = '';
 
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn(body => {
           responseBody = body;
           return this;
         }),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -128,10 +128,10 @@ describe('oauth helpers', () => {
     });
 
     it('handles single quotes and unicode chars safely', () => {
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn().mockReturnThis(),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -164,23 +164,23 @@ describe('oauth helpers', () => {
 
   describe('ensuresXRequestedWith', () => {
     it('should return false if no header present', () => {
-      const mockRequest = ({
+      const mockRequest = {
         header: () => jest.fn(),
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(ensuresXRequestedWith(mockRequest)).toBe(false);
     });
 
     it('should return false if header present with incorrect value', () => {
-      const mockRequest = ({
+      const mockRequest = {
         header: () => 'INVALID',
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(ensuresXRequestedWith(mockRequest)).toBe(false);
     });
 
     it('should return true if header present with correct value', () => {
-      const mockRequest = ({
+      const mockRequest = {
         header: () => 'XMLHttpRequest',
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(ensuresXRequestedWith(mockRequest)).toBe(true);
     });
   });

plugins/auth-backend/src/lib/oauth/OAuthAdapter.test.ts

@@ -71,19 +71,19 @@ describe('OAuthAdapter', () => {
       providerInstance,
       oAuthProviderOptions,
     );
-    const mockRequest = ({
+    const mockRequest = {
       query: {
         scope: 'user',
         env: 'development',
       },
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       end: jest.fn().mockReturnThis(),
       setHeader: jest.fn().mockReturnThis(),
       statusCode: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.start(mockRequest, mockResponse);
     // nonce cookie checks
@@ -108,20 +108,20 @@ describe('OAuthAdapter', () => {
     });
 
     const state = { nonce: 'nonce', env: 'development' };
-    const mockRequest = ({
+    const mockRequest = {
       cookies: {
         'test-provider-nonce': 'nonce',
       },
       query: {
         state: encodeState(state),
       },
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       setHeader: jest.fn().mockReturnThis(),
       end: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.frameHandler(mockRequest, mockResponse);
     expect(mockResponse.cookie).toHaveBeenCalledTimes(1);
@@ -141,20 +141,20 @@ describe('OAuthAdapter', () => {
       disableRefresh: true,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       cookies: {
         'test-provider-nonce': 'nonce',
       },
       query: {
         state: 'nonce',
       },
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       setHeader: jest.fn().mockReturnThis(),
       end: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.frameHandler(mockRequest, mockResponse);
     expect(mockResponse.cookie).toHaveBeenCalledTimes(0);
@@ -166,15 +166,15 @@ describe('OAuthAdapter', () => {
       disableRefresh: false,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       header: () => 'XMLHttpRequest',
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       send: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.logout(mockRequest, mockResponse);
     expect(mockResponse.cookie).toHaveBeenCalledTimes(1);
@@ -192,18 +192,18 @@ describe('OAuthAdapter', () => {
       disableRefresh: false,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       header: () => 'XMLHttpRequest',
       cookies: {
         'test-provider-refresh-token': 'token',
       },
       query: {},
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       json: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.refresh(mockRequest, mockResponse);
     expect(mockResponse.json).toHaveBeenCalledTimes(1);
@@ -222,18 +222,18 @@ describe('OAuthAdapter', () => {
       disableRefresh: true,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       header: () => 'XMLHttpRequest',
       cookies: {
         'test-provider-refresh-token': 'token',
       },
       query: {},
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       send: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.refresh(mockRequest, mockResponse);
     expect(mockResponse.send).toHaveBeenCalledTimes(1);

plugins/auth-backend/src/lib/oauth/helpers.test.ts

@@ -21,24 +21,24 @@ describe('OAuthProvider Utils', () => {
   describe('verifyNonce', () => {
     it('should throw error if cookie nonce missing', () => {
       const state = { nonce: 'NONCE', env: 'development' };
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {},
         query: {
           state: encodeState(state),
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).toThrowError('Auth response is missing cookie nonce');
     });
 
     it('should throw error if state nonce missing', () => {
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {
           'providera-nonce': 'NONCE',
         },
         query: {},
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).toThrowError('Invalid state passed via request');
@@ -46,14 +46,14 @@ describe('OAuthProvider Utils', () => {
 
     it('should throw error if nonce mismatch', () => {
       const state = { nonce: 'NONCEB', env: 'development' };
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {
           'providera-nonce': 'NONCEA',
         },
         query: {
           state: encodeState(state),
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).toThrowError('Invalid nonce');
@@ -61,14 +61,14 @@ describe('OAuthProvider Utils', () => {
 
     it('should not throw any error if nonce matches', () => {
       const state = { nonce: 'NONCE', env: 'development' };
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {
           'providera-nonce': 'NONCE',
         },
         query: {
           state: encodeState(state),
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).not.toThrow();

plugins/auth-backend/src/lib/oauth/types.ts

@@ -106,9 +106,7 @@ export interface OAuthHandlers {
    * Handles the redirect from the auth provider when the user has signed in.
    * @param {express.Request} req
    */
-  handler(
-    req: express.Request,
-  ): Promise<{
+  handler(req: express.Request): Promise<{
     response: AuthResponse<OAuthProviderInfo>;
     refreshToken?: string;
   }>;

plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts

@@ -23,7 +23,7 @@ import {
   executeRefreshTokenStrategy,
 } from './PassportStrategyHelper';
 
-const mockRequest = ({} as unknown) as express.Request;
+const mockRequest = {} as unknown as express.Request;
 
 describe('PassportStrategyHelper', () => {
   class MyCustomRedirectStrategy extends passport.Strategy {

plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts

@@ -195,7 +195,7 @@ export const executeFetchUserProfileStrategy = async (
   accessToken: string,
 ): Promise<passport.Profile> => {
   return new Promise((resolve, reject) => {
-    const anyStrategy = (providerStrategy as unknown) as ProviderStrategy;
+    const anyStrategy = providerStrategy as unknown as ProviderStrategy;
     anyStrategy.userProfile(
       accessToken,
       (error: Error, rawProfile: passport.Profile) => {

plugins/auth-backend/src/providers/aws-alb/provider.test.ts

@@ -79,22 +79,22 @@ describe('AwsALBAuthProvider', () => {
     getEntityByName: jest.fn(),
   };
 
-  const mockRequest = ({
+  const mockRequest = {
     header: jest.fn(() => {
       return 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImZvbyIsImlzcyI6ImZvbyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.T2BNS4G-6RoiFnXc8Q8TiwdWzTpNitY8jcsGM3N3-Yo';
     }),
-  } as unknown) as express.Request;
-  const mockRequestWithoutJwt = ({
+  } as unknown as express.Request;
+  const mockRequestWithoutJwt = {
     header: jest.fn(() => {
       return undefined;
     }),
-  } as unknown) as express.Request;
-  const mockResponse = ({
+  } as unknown as express.Request;
+  const mockResponse = {
     end: jest.fn(),
     header: () => jest.fn(),
     json: jest.fn().mockReturnThis(),
     status: jest.fn(),
-  } as unknown) as express.Response;
+  } as unknown as express.Response;
 
   describe('should transform to type OAuthResponse', () => {
     it('when JWT is valid and identity is resolved successfully', async () => {

plugins/auth-backend/src/providers/github/provider.test.ts

@@ -19,10 +19,10 @@ import { GithubAuthProvider } from './provider';
 import * as helpers from '../../lib/passport/PassportStrategyHelper';
 import { OAuthResult } from '../../lib/oauth';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{
     result: Omit<OAuthResult, 'params'> & { params: { scope: string } };
   }>
@@ -87,7 +87,7 @@ describe('GithubAuthProvider', () => {
 
     it('when "email" is missing, it should be able to create the profile without it', async () => {
       const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = ({
+      const fullProfile = {
         id: 'uid-123',
         username: 'jimmymarkum',
         provider: 'github',
@@ -99,7 +99,7 @@ describe('GithubAuthProvider', () => {
               'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
           },
         ],
-      } as unknown) as PassportProfile;
+      } as unknown as PassportProfile;
 
       const params = {
         scope: 'read:scope',
@@ -131,7 +131,7 @@ describe('GithubAuthProvider', () => {
 
     it('when "displayName" is missing, it should be able to create the profile and map "displayName" with "username"', async () => {
       const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = ({
+      const fullProfile = {
         id: 'uid-123',
         username: 'jimmymarkum',
         provider: 'github',
@@ -143,7 +143,7 @@ describe('GithubAuthProvider', () => {
               'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
           },
         ],
-      } as unknown) as PassportProfile;
+      } as unknown as PassportProfile;
 
       const params = {
         scope: 'read:scope',

plugins/auth-backend/src/providers/gitlab/provider.test.ts

@@ -18,10 +18,10 @@ import { GitlabAuthProvider } from './provider';
 import * as helpers from '../../lib/passport/PassportStrategyHelper';
 import { OAuthResult } from '../../lib/oauth';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<() => Promise<{ result: OAuthResult }>>;
+) as unknown as jest.MockedFunction<() => Promise<{ result: OAuthResult }>>;
 
 describe('GitlabAuthProvider', () => {
   it('should transform to type OAuthResponse', async () => {

plugins/auth-backend/src/providers/google/provider.test.ts

@@ -21,10 +21,10 @@ import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity/types';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{ result: OAuthResult; privateInfo: any }>
 >;
 
@@ -40,8 +40,9 @@ describe('createGoogleProvider', () => {
 
     const provider = new GoogleAuthProvider({
       logger: getVoidLogger(),
-      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
-      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
       authHandler: async ({ fullProfile }) => ({
         profile: {
           email: fullProfile.emails![0]!.value,

plugins/auth-backend/src/providers/microsoft/provider.test.ts

@@ -21,10 +21,10 @@ import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity/types';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{ result: OAuthResult; privateInfo: any }>
 >;
 
@@ -40,8 +40,9 @@ describe('createMicrosoftProvider', () => {
 
     const provider = new MicrosoftAuthProvider({
       logger: getVoidLogger(),
-      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
-      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
       authHandler: async ({ fullProfile }) => ({
         profile: {
           email: fullProfile.emails![0]!.value,

plugins/auth-backend/src/providers/microsoft/provider.ts

@@ -220,24 +220,22 @@ export const microsoftEmailSignInResolver: SignInResolver<OAuthResult> = async (
   return { id: entity.metadata.name, entity, token };
 };
 
-export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> = async (
-  info,
-  ctx,
-) => {
-  const { profile } = info;
+export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> =
+  async (info, ctx) => {
+    const { profile } = info;
 
-  if (!profile.email) {
-    throw new Error('Profile contained no email');
-  }
+    if (!profile.email) {
+      throw new Error('Profile contained no email');
+    }
 
-  const userId = profile.email.split('@')[0];
+    const userId = profile.email.split('@')[0];
 
-  const token = await ctx.tokenIssuer.issueToken({
-    claims: { sub: userId, ent: [`user:default/${userId}`] },
-  });
+    const token = await ctx.tokenIssuer.issueToken({
+      claims: { sub: userId, ent: [`user:default/${userId}`] },
+    });
 
-  return { id: userId, token };
-};
+    return { id: userId, token };
+  };
 
 export type MicrosoftProviderOptions = {
   /**

plugins/auth-backend/src/providers/oidc/provider.test.ts

@@ -70,7 +70,7 @@ describe('OidcAuthProvider', () => {
       rest.get('https://oidc.test/.well-known/openid-configuration', handler),
     );
     const provider = new OidcAuthProvider(clientMetadata);
-    const { strategy } = ((await (provider as any).implementation) as any) as {
+    const { strategy } = (await (provider as any).implementation) as any as {
       strategy: {
         _client: ClientMetadata;
         _issuer: IssuerMetadata;
@@ -138,7 +138,7 @@ describe('OidcAuthProvider', () => {
     const req = {
       method: 'GET',
       url: 'https://oidc.test/?code=test2',
-      session: ({ 'oidc:oidc.test': 'test' } as any) as Session,
+      session: { 'oidc:oidc.test': 'test' } as any as Session,
     } as express.Request;
     await provider.handler(req);
     expect(requestSequence).toEqual([0, 1, 2].map(i => requests[i].url));