minor fixes

plugins/auth-backend/src/providers/OAuthProvider.ts

@@ -199,7 +199,6 @@ export class OAuthProvider implements AuthProviderRouteHandlers {
   }
 
   async logout(req: express.Request, res: express.Response): Promise<any> {
-    //TODO(soapraj): Logout doesnt work yet
     if (!ensuresXRequestedWith(req)) {
       return res.status(401).send('Invalid X-Requested-With header');
     }
@@ -234,7 +233,6 @@ export class OAuthProvider implements AuthProviderRouteHandlers {
 
       // get new access_token
       const refreshInfo = await this.providerHandlers.refresh(
-        this.provider,
         refreshToken,
         scope,
       );

plugins/auth-backend/src/providers/PassportStrategyHelper.test.ts

@@ -143,6 +143,14 @@ describe('PassportStrategyHelper', () => {
       class MyCustomRefreshTokenSuccess extends passport.Strategy {
         // @ts-ignore
         private _oauth2 = new MyCustomOAuth2Success();
+        userProfile(_accessToken: string, callback: Function) {
+          callback(null, {
+            provider: 'a',
+            email: 'b',
+            name: 'c',
+            picture: 'd',
+          });
+        }
       }
 
       const mockStrategy = new MyCustomRefreshTokenSuccess();

plugins/auth-backend/src/providers/PassportStrategyHelper.ts

@@ -137,9 +137,9 @@ export const executeRefreshTokenStrategy = async (
 
         anyStrategy.userProfile(
           accessToken,
-          (err: Error, passportProfile: passport.Profile) => {
-            if (err) {
-              reject(err);
+          (error: Error, passportProfile: passport.Profile) => {
+            if (error) {
+              reject(error);
             }
 
             const profile = makeProfileInfo(passportProfile, params);

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

@@ -20,6 +20,7 @@ import {
   executeFrameHandlerStrategy,
   executeRedirectStrategy,
   executeRefreshTokenStrategy,
+  makeProfileInfo,
 } from '../PassportStrategyHelper';
 import {
   OAuthProviderHandlers,
@@ -30,6 +31,7 @@ import {
   AuthInfoWithProfile,
 } from '../types';
 import { OAuthProvider } from '../OAuthProvider';
+import passport from 'passport';
 
 export class GoogleAuthProvider implements OAuthProviderHandlers {
   private readonly providerConfig: AuthProviderConfig;
@@ -44,14 +46,14 @@ export class GoogleAuthProvider implements OAuthProviderHandlers {
         accessToken: any,
         refreshToken: any,
         params: any,
-        profile: any,
+        profile: passport.Profile,
         done: any,
       ) => {
+        const profileInfo = makeProfileInfo(profile, params);
         done(
           undefined,
           {
-            //TODO(soapraj): extract ProfileInfo from passport.Profile and send only that
-            profile,
+            profile: profileInfo,
             idToken: params.id_token,
             accessToken,
             scope: params.scope,