From 3f4bd136d68153d617332ad686df9c8d6d18bb10 Mon Sep 17 00:00:00 2001
From: Raghunandan <soapraj@gmail.com>
Date: Sat, 23 May 2020 10:20:02 +0200
Subject: [PATCH] fix pr review

---
 .../src/providers/factories.test.ts           | 21 ++++----------
 .../auth-backend/src/providers/factories.ts   |  6 ++--
 .../src/providers/google/provider.ts          |  7 ++---
 .../auth-backend/src/providers/index.test.ts  | 28 ++++++-------------
 plugins/auth-backend/src/providers/types.ts   |  8 ++++--
 5 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/plugins/auth-backend/src/providers/factories.test.ts b/plugins/auth-backend/src/providers/factories.test.ts
index e2e8420c10..1647f62682 100644
--- a/plugins/auth-backend/src/providers/factories.test.ts
+++ b/plugins/auth-backend/src/providers/factories.test.ts
@@ -23,23 +23,14 @@ class MyAuthProvider implements AuthProvider, AuthProviderRouteHandlers {
   strategy(): passport.Strategy {
     return new passport.Strategy();
   }
-  start(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('start');
-      resolve();
-    });
+  async start(_: express.Request, res: express.Response): Promise<any> {
+    res.send('start');
   }
-  frameHandler(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('frameHandler');
-      resolve();
-    });
+  async frameHandler(_: express.Request, res: express.Response): Promise<any> {
+    res.send('frameHandler');
   }
-  logout(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('logout');
-      resolve();
-    });
+  async logout(_: express.Request, res: express.Response): Promise<any> {
+    res.send('logout');
   }
 }
 
diff --git a/plugins/auth-backend/src/providers/factories.ts b/plugins/auth-backend/src/providers/factories.ts
index 6947f0ebd2..077d45076e 100644
--- a/plugins/auth-backend/src/providers/factories.ts
+++ b/plugins/auth-backend/src/providers/factories.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { AuthProviderFactories } from './types';
+import { AuthProviderFactories, AuthProviderFactory } from './types';
 import { GoogleAuthProvider } from './google/provider';
 
 export class ProviderFactories {
@@ -22,8 +22,8 @@ export class ProviderFactories {
     google: GoogleAuthProvider,
   };
 
-  public static getProviderFactory(providerId: string) {
-    const ProviderImpl = ProviderFactories.providerFactories.providerId;
+  public static getProviderFactory(providerId: string): AuthProviderFactory {
+    const ProviderImpl = ProviderFactories.providerFactories[providerId];
     if (!ProviderImpl) {
       throw Error(
         `Provider Implementation missing for : ${providerId} auth provider`,
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index 7f3ae85089..0ef7e19d3e 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -61,11 +61,8 @@ export class GoogleAuthProvider
     })(req, res, next);
   }
 
-  logout(_req: express.Request, res: express.Response) {
-    return new Promise(resolve => {
-      res.send('logout!');
-      resolve();
-    });
+  async logout(_req: express.Request, res: express.Response) {
+    res.send('logout!');
   }
 
   strategy(): passport.Strategy {
diff --git a/plugins/auth-backend/src/providers/index.test.ts b/plugins/auth-backend/src/providers/index.test.ts
index c13b840948..e42cd32edc 100644
--- a/plugins/auth-backend/src/providers/index.test.ts
+++ b/plugins/auth-backend/src/providers/index.test.ts
@@ -37,32 +37,20 @@ class MyAuthProvider implements AuthProvider, AuthProviderRouteHandlers {
       () => {},
     );
   }
-  start(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('start');
-      resolve();
-    });
+  async start(_: express.Request, res: express.Response): Promise<any> {
+    res.send('start');
   }
-  frameHandler(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('frameHandler');
-      resolve();
-    });
+  async frameHandler(_: express.Request, res: express.Response): Promise<any> {
+    res.send('frameHandler');
   }
-  logout(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('logout');
-      resolve();
-    });
+  async logout(_: express.Request, res: express.Response): Promise<any> {
+    res.send('logout');
   }
 }
 
 class MyAuthProviderWithRefresh extends MyAuthProvider {
-  refresh(_: express.Request, res: express.Response): Promise<any> {
-    return new Promise(resolve => {
-      res.send('logout');
-      resolve();
-    });
+  async refresh(_: express.Request, res: express.Response): Promise<any> {
+    res.send('logout');
   }
 }
 
diff --git a/plugins/auth-backend/src/providers/types.ts b/plugins/auth-backend/src/providers/types.ts
index eaff539c04..4350f36200 100644
--- a/plugins/auth-backend/src/providers/types.ts
+++ b/plugins/auth-backend/src/providers/types.ts
@@ -51,9 +51,11 @@ export interface AuthProviderRouteHandlers {
 }
 
 export type AuthProviderFactories = {
-  [key: string]: {
-    new (providerConfig: any): AuthProvider & AuthProviderRouteHandlers;
-  };
+  [key: string]: AuthProviderFactory;
+};
+
+export type AuthProviderFactory = {
+  new (providerConfig: any): AuthProvider & AuthProviderRouteHandlers;
 };
 
 export type AuthInfo = {