@vizzly/api-client 0.0.23 → 0.0.25

package/dist/models/Api.js

@@ -25,7 +25,7 @@ class Api {
     execute(request) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const authHeaders = this.auth.buildAuthHeaders();
+            const authHeaders = this.auth.buildAuthHeaders(request.acceptedAuthParams);
             const customHeaders = Object.assign(Object.assign({}, (request.headers || {})), (this.extraHeaders() || {}));
             const path = `${this.host}${request.path}`;
             const timedFetch = Monitor_1.Monitor.timeRequest(request.method, path, isomorphic_fetch_1.default);
@@ -40,6 +40,9 @@ class Api {
             let body = ((_a = res.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('json')) ? yield res.json() : res.text();
             const queryEngineRequestId = res.headers.get('vizzly-query-engine-request-id') || '-';
             const vizzlyApiRequestId = res.headers.get('x-request-id') || '-';
+            if (res.status === 500) {
+                console.log(`[TRACING] QE; ${queryEngineRequestId} - API; ${vizzlyApiRequestId}`, authHeaders);
+            }
             VizzlyApiClientLogger_1.VizzlyApiClientLogger.debug(`[TRACING] QE; ${queryEngineRequestId} - API; ${vizzlyApiRequestId}`);
             return { body: body, status: res.status, headers: res.headers };
         });

package/dist/models/Authentication.d.ts

@@ -1,4 +1,4 @@
-import { AuthParams } from '../types';
+import { AuthParams, Request } from '../types';
 export declare class Authentication {
     private authParams;
     constructor(authParams: AuthParams);
@@ -11,7 +11,7 @@ export declare class Authentication {
     getDataAccessToken(): string;
     getProjectApiKey(): string;
     getProjectAccessToken(): string;
-    buildAuthHeaders(): {
+    buildAuthHeaders(acceptedAuthParams: Request<{}>['acceptedAuthParams']): {
         [key: string]: string;
     };
 }

package/dist/models/Authentication.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Authentication = void 0;
+const lodash_1 = require("lodash");
 const MissingAuthParameter_1 = require("../errors/MissingAuthParameter");
 class Authentication {
     constructor(authParams) {
@@ -43,28 +44,31 @@ class Authentication {
             throw new MissingAuthParameter_1.MissingAuthParameter('projectAccessToken');
         return this.authParams.projectAccessToken;
     }
-    buildAuthHeaders() {
-        if (this.authParams.dashboardAccessToken) {
+    buildAuthHeaders(acceptedAuthParams) {
+        let usableAuthParams = acceptedAuthParams ? (0, lodash_1.pick)(this.authParams, acceptedAuthParams) : this.authParams;
+        console.log('usableAuthParams', usableAuthParams);
+        // let usableAuthParams = this.authParams;
+        if (usableAuthParams.dashboardAccessToken) {
             return {
-                auth: `Bearer ${this.authParams.dashboardAccessToken}`,
+                auth: `Bearer ${usableAuthParams.dashboardAccessToken}`,
             };
         }
         // If a project access token has been set on the config, use that instead
         // of fetching one. This is most likely used on the managed query-engine where we
         // pass the project access token through in a request header.
-        if (this.authParams.projectAccessToken) {
+        if (usableAuthParams.projectAccessToken) {
             return {
-                auth: `Bearer ${this.authParams.projectAccessToken}`,
+                auth: `Bearer ${usableAuthParams.projectAccessToken}`,
             };
         }
-        if (this.authParams.projectApiKey) {
+        if (usableAuthParams.projectApiKey) {
             return {
-                auth: `Api-Key ${this.authParams.projectApiKey}`,
+                auth: `Api-Key ${usableAuthParams.projectApiKey}`,
             };
         }
-        if (this.authParams.appSessionToken) {
+        if (usableAuthParams.appSessionToken) {
             return {
-                auth: `Bearer ${this.authParams.appSessionToken}`,
+                auth: `Bearer ${usableAuthParams.appSessionToken}`,
             };
         }
         return {};

package/dist/models/DashboardRepository.js

@@ -47,6 +47,7 @@ class DashboardRepository {
                 throw new DashboardQuotaReached_1.DashboardQuotaReached(`Dashboard quota reached; ${JSON.stringify(builtDashboard.body)}`);
             }
             if (builtDashboard.status != 200) {
+                console.log();
                 throw new FailedToCreateDashboard_1.FailedToCreateDashboard(`Failed to create the dashboard from POST /api/v2/dashboard. Got ${builtDashboard.status}`);
             }
             throw new FailedToCreateDashboard_1.FailedToCreateDashboard(`Unknown failure. Got status ${builtDashboard.status}`);

package/dist/models/VizzlyApi.js

@@ -154,9 +154,6 @@ class VizzlyApi extends Api_1.Api {
         return {
             path: `/api/v2/projects`,
             method: 'get',
-            headers: {
-                auth: `Bearer ${this.auth.getAppSessionToken()}`,
-            },
             abortSignal: params === null || params === void 0 ? void 0 : params.abortSignal,
         };
     }
@@ -308,6 +305,7 @@ class VizzlyApi extends Api_1.Api {
             path: `/api/v3/project/${params.projectId}`,
             method: 'get',
             abortSignal: params.abortSignal,
+            acceptedAuthParams: ['projectApiKey', 'projectAccessToken'],
         };
     }
     getProjectAccessToken(params) {

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import { VizzlyQueryEngineApi } from './models/VizzlyQueryEngineApi';
 import { VizzlyApi } from './models/VizzlyApi';
 import { VizzlyAppApi } from './models/VizzlyAppApi';
 import { DashboardDefinition, DashboardFromAPI } from './types/dashboard';
+import { UserFromAPI } from './types/user';
 export * from './types/dashboard';
 export * from './types/project';
 export * from './types/team';
@@ -23,6 +24,7 @@ export type Request<T> = {
     headers?: {
         [key: string]: string;
     };
+    acceptedAuthParams?: Array<keyof AuthParams>;
 };
 export type UpdateGlobalLibraryParams = {
     globalLibrarySessionToken: string;
@@ -299,15 +301,7 @@ export type RawOrganisation = {
     };
 };
 export type GetSelfResponse = {
-    user: {
-        id: string;
-        is_email_verified: boolean;
-        email: string;
-        first_name: string;
-        last_name: string;
-        is_vizz: boolean;
-        department: 'product_management' | 'project_management' | 'sales' | 'marketing' | 'engineering' | 'analyst' | 'c-suite';
-    };
+    user: UserFromAPI;
     organisation: RawOrganisation;
     default_organisation: RawOrganisation;
     team_memberships: Array<RawTeamMember>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizzly/api-client",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "private": false,
   "license": "NONE",
   "source": "src/index.ts",