diff --git a/plugins/auth-backend/src/providers/factories.test.ts b/plugins/auth-backend/src/providers/factories.test.ts index ef9bb6256f..e2e8420c10 100644 --- a/plugins/auth-backend/src/providers/factories.test.ts +++ b/plugins/auth-backend/src/providers/factories.test.ts @@ -23,31 +23,19 @@ class MyAuthProvider implements AuthProvider, AuthProviderRouteHandlers { strategy(): passport.Strategy { return new passport.Strategy(); } - start( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + start(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('start'); resolve(); }); } - frameHandler( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + frameHandler(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('frameHandler'); resolve(); }); } - logout( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + logout(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('logout'); resolve(); diff --git a/plugins/auth-backend/src/providers/google/provider.test.ts b/plugins/auth-backend/src/providers/google/provider.test.ts index 4881b1dd93..845c46a4da 100644 --- a/plugins/auth-backend/src/providers/google/provider.test.ts +++ b/plugins/auth-backend/src/providers/google/provider.test.ts @@ -17,7 +17,6 @@ import { GoogleAuthProvider } from './provider'; import passport from 'passport'; import express from 'express'; -import * as passportGoogleAuth20 from 'passport-google-oauth20'; import * as utils from './../utils'; const googleAuthProviderConfig = { @@ -29,24 +28,6 @@ const googleAuthProviderConfig = { }, }; -const googleAuthProviderConfigFromEnv = { - provider: 'google', - options: { - clientID: process.env.AUTH_GOOGLE_CLIENT_ID, - clientSecret: process.env.AUTH_GOOGLE_CLIENT_SECRET, - callbackURL: 'c', - }, -}; - -const googleAuthProviderConfigMissingInEnv = { - provider: 'google', - options: { - clientID: process.env.MISSING_CLIENT_ID, - clientSecret: process.env.MISSING_CLIENT_SECRET, - callbackURL: 'c', - }, -}; - const googleAuthProviderConfigInvalidOptions = { provider: 'google', options: {}, diff --git a/plugins/auth-backend/src/providers/index.test.ts b/plugins/auth-backend/src/providers/index.test.ts index 97b40d07dd..c13b840948 100644 --- a/plugins/auth-backend/src/providers/index.test.ts +++ b/plugins/auth-backend/src/providers/index.test.ts @@ -22,6 +22,7 @@ import { AuthProviderRouteHandlers, AuthProviderConfig, } from './types'; +import * as passportGoogleOAuth20 from 'passport-google-oauth20'; import { ProviderFactories } from './factories'; class MyAuthProvider implements AuthProvider, AuthProviderRouteHandlers { @@ -31,33 +32,24 @@ class MyAuthProvider implements AuthProvider, AuthProviderRouteHandlers { } strategy(): passport.Strategy { - return new passport.Strategy(); + return new passportGoogleOAuth20.Strategy( + this.providerConfig.options, + () => {}, + ); } - start( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + start(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('start'); resolve(); }); } - frameHandler( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + frameHandler(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('frameHandler'); resolve(); }); } - logout( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + logout(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('logout'); resolve(); @@ -66,11 +58,7 @@ class MyAuthProvider implements AuthProvider, AuthProviderRouteHandlers { } class MyAuthProviderWithRefresh extends MyAuthProvider { - refresh( - req: express.Request, - res: express.Response, - next: express.NextFunction, - ): Promise { + refresh(_: express.Request, res: express.Response): Promise { return new Promise(resolve => { res.send('logout'); resolve(); @@ -81,14 +69,14 @@ class MyAuthProviderWithRefresh extends MyAuthProvider { const providerConfig = { provider: 'a', options: { - somekey: 'somevalue', + clientID: 'somevalue', }, }; const providerConfigInvalid = { provider: 'b', options: { - somekey: 'somevalue', + clientID: 'somevalue', }, };