feat: expose projectId on login.status()

cognitedata · Sep 10, 2019 · 00ab757 · 00ab757
1 parent 1b4a0f4
commit 00ab757
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/src/__tests__/resources/login.integration.spec.ts b/src/__tests__/resources/login.integration.spec.ts
@@ -15,6 +15,7 @@ describe('Login-api integration test', () => {
       expect(status).toBeDefined();
       expect(status!.project).toBeDefined();
       expect(status!.user).toBeDefined();
+      expect(typeof status!.projectId).toBe('number');
     });
 
     test('not logged in', async () => {

diff --git a/src/__tests__/resources/login.spec.ts b/src/__tests__/resources/login.spec.ts
@@ -17,6 +17,7 @@ import {
   mockBaseUrl,
   notLoggedInResponse,
   project,
+  projectId,
 } from '../testUtils';
 
 describe('Login', () => {
@@ -123,12 +124,12 @@ describe('Login', () => {
   describe('getIdInfo', () => {
     const idInfo = {
       project,
+      projectId,
       user: 'user@example.com',
     };
     const successResponse = {
       data: {
         loggedIn: true,
-        projectId: 1,
         ...idInfo,
       },
     };

diff --git a/src/resources/login.ts b/src/resources/login.ts
@@ -25,6 +25,7 @@ const LOGIN_IFRAME_NAME = 'cognite-js-sdk-auth-iframe';
 const LOGIN_POPUP_NAME = 'cognite-js-sdk-auth-popup';
 
 export interface IdInfo {
+  projectId: number;
   project: string;
   user: string;
 }
@@ -124,13 +125,14 @@ export async function getIdInfo(
 ): Promise<null | IdInfo> {
   try {
     const response = await httpClient.get<any>('/login/status', { headers });
-    const { loggedIn, user, project } = response.data.data;
+    const { loggedIn, user, project, projectId } = response.data.data;
     if (!loggedIn) {
       return null;
     }
     return {
       user,
       project,
+      projectId,
     };
   } catch (err) {
     if (err.status === 401) {

diff --git a/src/utils/http/cdfHttpClient.ts b/src/utils/http/cdfHttpClient.ts
@@ -86,25 +86,6 @@ export class CDFHttpClient extends RetryableHttpClient {
     this.setDefaultHeader(AUTHORIZATION_HEADER, bearerString(token));
   }
 
-  public async getIdInfo(headers: HttpHeaders): Promise<null | IdInfo> {
-    try {
-      const response = await this.get<any>('/login/status', { headers });
-      const { loggedIn, user, project } = response.data.data;
-      if (!loggedIn) {
-        return null;
-      }
-      return {
-        user,
-        project,
-      };
-    } catch (err) {
-      if (err.status === 401) {
-        return null;
-      }
-      throw err;
-    }
-  }
-
   public set401ResponseHandler(handler: Response401Handler) {
     this.response401Handler = handler;
   }
@@ -168,11 +149,6 @@ export class CDFHttpClient extends RetryableHttpClient {
   }
 }
 
-export interface IdInfo {
-  project: string;
-  user: string;
-}
-
 type Response401Handler = (
   err: HttpError,
   retry: () => void,