From a739f2da583f5f6d88f58a6b954940699aff45df Mon Sep 17 00:00:00 2001
From: Raghunandan <soapraj@gmail.com>
Date: Mon, 25 May 2020 16:51:50 +0200
Subject: [PATCH] Fixes in response format in frontend and backend apis

---
 packages/backend/src/index.ts                               | 6 +++++-
 .../src/api/apis/implementations/auth/google/GoogleAuth.ts  | 4 ++--
 .../lib/AuthConnector/DefaultAuthConnector.ts               | 2 +-
 plugins/auth-backend/src/providers/google/provider.ts       | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 7af6e631a8..5b1fc54330 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -58,9 +58,13 @@ function createEnv(plugin: string): PluginEnvironment {
 
 async function main() {
   const app = express();
+  const corsOptions: cors.CorsOptions = {
+    origin: 'http://localhost:3000',
+    credentials: true,
+  };
 
   app.use(helmet());
-  app.use(cors());
+  app.use(cors(corsOptions));
   app.use(compression());
   app.use(express.json());
   app.use(requestLoggingHandler());
diff --git a/packages/core/src/api/apis/implementations/auth/google/GoogleAuth.ts b/packages/core/src/api/apis/implementations/auth/google/GoogleAuth.ts
index d1d5da1a02..9f3bcec762 100644
--- a/packages/core/src/api/apis/implementations/auth/google/GoogleAuth.ts
+++ b/packages/core/src/api/apis/implementations/auth/google/GoogleAuth.ts
@@ -40,7 +40,7 @@ type CreateOptions = {
 export type GoogleAuthResponse = {
   accessToken: string;
   idToken: string;
-  scopes: string;
+  scope: string;
   expiresInSeconds: number;
 };
 
@@ -70,7 +70,7 @@ class GoogleAuth implements OAuthApi, OpenIdConnectApi {
         return {
           idToken: res.idToken,
           accessToken: res.accessToken,
-          scopes: GoogleAuth.normalizeScopes(res.scopes),
+          scopes: GoogleAuth.normalizeScopes(res.scope),
           expiresAt: new Date(Date.now() + res.expiresInSeconds * 1000),
         };
       },
diff --git a/packages/core/src/api/apis/implementations/lib/AuthConnector/DefaultAuthConnector.ts b/packages/core/src/api/apis/implementations/lib/AuthConnector/DefaultAuthConnector.ts
index 161015b1a8..ca8a9cd2ae 100644
--- a/packages/core/src/api/apis/implementations/lib/AuthConnector/DefaultAuthConnector.ts
+++ b/packages/core/src/api/apis/implementations/lib/AuthConnector/DefaultAuthConnector.ts
@@ -99,7 +99,7 @@ export class DefaultAuthConnector<AuthSession>
   }
 
   async refreshSession(): Promise<any> {
-    const res = await fetch(this.buildUrl('/token', { optional: true }), {
+    const res = await fetch(this.buildUrl('/refresh', { optional: true }), {
       headers: {
         'x-requested-with': 'XMLHttpRequest',
       },
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index d567e363bc..2bfb606495 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -63,7 +63,8 @@ export class GoogleAuthProvider
         maxAge: THOUSAND_DAYS_MS,
         secure: false,
         sameSite: 'none',
-        path: 'localhost:3000/auth/google',
+        domain: 'localhost',
+        path: '/auth/google',
         httpOnly: true,
       };
 
@@ -123,6 +124,7 @@ export class GoogleAuthProvider
           accessToken,
           refreshToken,
           scope: params.scope,
+          expiresInSeconds: params.expires_in,
         });
       },
     );