diff --git a/plugins/auth-backend-module-vmware-cloud-provider/api-report.md b/plugins/auth-backend-module-vmware-cloud-provider/api-report.md index 2254b02491..ff9e82dd45 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/api-report.md +++ b/plugins/auth-backend-module-vmware-cloud-provider/api-report.md @@ -17,12 +17,12 @@ export default authModuleVmwareCloudProvider; // @public export const vmwareCloudAuthenticator: OAuthAuthenticator< - vmwareCloudAuthenticatorContext, - vmwarePassportProfile + VMwareCloudAuthenticatorContext, + VMwarePassportProfile >; // @public (undocumented) -export interface vmwareCloudAuthenticatorContext { +export interface VMwareCloudAuthenticatorContext { // (undocumented) helper: PassportOAuthAuthenticatorHelper; // (undocumented) @@ -40,7 +40,7 @@ export namespace vmwareCloudSignInResolvers { } // @public (undocumented) -export type vmwarePassportProfile = PassportProfile & { +export type VMwarePassportProfile = PassportProfile & { organizationId?: string; }; ``` diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.test.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.test.ts index c569cf1a9b..f38ceeb462 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.test.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.test.ts @@ -30,7 +30,7 @@ import { setupServer } from 'msw/node'; import { vmwareCloudAuthenticator, - vmwareCloudAuthenticatorContext, + VMwareCloudAuthenticatorContext, } from './authenticator'; jest.mock('uid2', () => jest.fn().mockReturnValue('sessionid')); @@ -60,7 +60,7 @@ describe('vmwareCloudAuthenticator', () => { }; let fakeSession: Record; - let authenticatorCtx: vmwareCloudAuthenticatorContext; + let authenticatorCtx: VMwareCloudAuthenticatorContext; beforeAll(async () => { idToken = await new SignJWT(signInInfo) diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.ts index 811a34dd58..abac9cf2b6 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.ts @@ -31,14 +31,14 @@ import { } from 'passport-oauth2'; /** @public */ -export interface vmwareCloudAuthenticatorContext { +export interface VMwareCloudAuthenticatorContext { organizationId?: string; providerStrategy: OAuth2Strategy; helper: PassportOAuthAuthenticatorHelper; } /** @public */ -export type vmwarePassportProfile = PassportProfile & { +export type VMwarePassportProfile = PassportProfile & { organizationId?: string; }; @@ -48,8 +48,8 @@ export type vmwarePassportProfile = PassportProfile & { * @public */ export const vmwareCloudAuthenticator = createOAuthAuthenticator< - vmwareCloudAuthenticatorContext, - vmwarePassportProfile + VMwareCloudAuthenticatorContext, + VMwarePassportProfile >({ defaultProfileTransform: async input => { if (!input.session.idToken) { @@ -201,7 +201,7 @@ export const vmwareCloudAuthenticator = createOAuthAuthenticator< fullProfile: { ...result.fullProfile, organizationId: ctx.organizationId, - } as vmwarePassportProfile, + } as VMwarePassportProfile, })); }, @@ -211,7 +211,7 @@ export const vmwareCloudAuthenticator = createOAuthAuthenticator< fullProfile: { ...result.fullProfile, organizationId: ctx.organizationId, - } as vmwarePassportProfile, + } as VMwarePassportProfile, })); }, }); diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts index 13795e2d97..1d7bb14b63 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts @@ -22,8 +22,8 @@ export { vmwareCloudAuthenticator, - type vmwareCloudAuthenticatorContext, - type vmwarePassportProfile, + type VMwareCloudAuthenticatorContext, + type VMwarePassportProfile, } from './authenticator'; export { authModuleVmwareCloudProvider as default } from './module'; export { vmwareCloudSignInResolvers } from './resolvers'; diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts index 8863376ca6..4c55b59f17 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts @@ -60,7 +60,7 @@ export namespace vmwareCloudSignInResolvers { }, }); } catch (e) { - if (!(e instanceof NotFoundError)) { + if (e.name !== NotFoundError.name) { throw e; } return ctx.issueToken({