@rockcarver/frodo-lib 0.16.2-8 → 0.17.0

package/esm/api/BaseApi.mjs

@@ -1,34 +1,40 @@
-import Agent from 'agentkeepalive';
 import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+import Agent from 'agentkeepalive';
 import axiosRetry from 'axios-retry';
 import HttpsProxyAgent from 'https-proxy-agent';
 import url from 'url';
 import fs from 'fs';
-import storage from '../storage/SessionStorage';
+import * as state from '../shared/State';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { curlirizeMessage, printMessage } from '../ops/utils/Console';
 import _curlirize from '../ext/axios-curlirize/curlirize';
+import { randomUUID } from 'crypto';
+import { mockAll } from '../test/mocks/ForgeRockApiMockEngine';
 
+// this has to be the first statement after the imports for mocking to work
+export const FrodoMockAdapter = process.env.FRODO_MOCK || process.env.frodo_mock ? new MockAdapter(axios) : undefined;
+if (FrodoMockAdapter) mockAll(FrodoMockAdapter);
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
 const pkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../package.json'), 'utf8'));
 axiosRetry(axios, {
   retries: 3,
   shouldResetTimeout: true,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   retryCondition: _error => true // retry no matter what
+});
 
-}); // all agents
-
-const timeout = 30000; // agentkeepalive
+// all agents
+const timeout = 30000;
 
+// agentkeepalive
 const maxSockets = 100;
 const maxFreeSockets = 10;
 const freeSocketTimeout = 30000;
 const userAgent = `${pkg.name}/${pkg.version}`;
+const transactionId = `frodo-${randomUUID()}`;
 let httpAgent, httpsAgent;
-
 function getHttpAgent() {
   if (httpAgent) return httpAgent;
   httpAgent = new Agent({
@@ -39,19 +45,17 @@ function getHttpAgent() {
   });
   return httpAgent;
 }
+
 /**
  * Helper method to create properly configured httpsAgent
  * @returns {any} appropriate httpsAgent
  */
-
-
 function getHttpsAgent() {
   if (httpsAgent) return httpsAgent;
   const options = {
-    rejectUnauthorized: !storage.session.getAllowInsecureConnection()
+    rejectUnauthorized: !state.getAllowInsecureConnection()
   };
   const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy;
-
   if (httpsProxy) {
     // https://github.com/axios/axios/issues/3459
     console.error(`Using proxy ${httpsProxy}`['yellow']);
@@ -59,12 +63,12 @@ function getHttpsAgent() {
     options['host'] = parsed.hostname;
     options['port'] = parsed.port;
     options['protocol'] = parsed.protocol;
-    options.rejectUnauthorized = !storage.session.getAllowInsecureConnection();
+    options.rejectUnauthorized = !state.getAllowInsecureConnection();
     httpsAgent = HttpsProxyAgent(options);
     return httpsAgent;
   }
-
-  httpsAgent = new Agent.HttpsAgent({ ...options,
+  httpsAgent = new Agent.HttpsAgent({
+    ...options,
     maxSockets,
     maxFreeSockets,
     timeout,
@@ -72,28 +76,25 @@ function getHttpsAgent() {
   });
   return httpsAgent;
 }
+
 /**
  * Get Proxy config
  * @returns {AxiosProxyConfig | false} axios proxy config or false
  */
-
-
 function getProxy() {
   if (process.env.HTTPS_PROXY || process.env.https_proxy) return false;
   return null;
 }
+
 /**
  * Customize curlirize output
  * @param request axios request object
  */
-
-
 function curlirize(request) {
   _curlirize(request, (result, err) => {
     const {
       command
     } = result;
-
     if (err) {
       printMessage(err, 'error');
     } else {
@@ -101,6 +102,7 @@ function curlirize(request) {
     }
   });
 }
+
 /**
  * Generates an AM Axios API instance
  * @param {object} resource Takes an object takes a resource object. example:
@@ -109,47 +111,51 @@ function curlirize(request) {
  *
  * @returns {AxiosInstance}
  */
-
-
 export function generateAmApi(resource, requestOverride = {}) {
   let headers = {
     'User-Agent': userAgent,
+    'X-ForgeRock-TransactionId': transactionId,
     'Content-Type': 'application/json',
     // only add API version if we have it
     ...(resource.apiVersion && {
       'Accept-API-Version': resource.apiVersion
     }),
-    // only send session cookie if we know its name and value
-    ...(storage.session.getCookieName() && storage.session.getCookieValue() && {
-      Cookie: `${storage.session.getCookieName()}=${storage.session.getCookieValue()}`
+    // only send session cookie if we know its name and value and we are not instructed to use the bearer token for AM APIs
+    ...(!state.getUseBearerTokenForAmApis() && state.getCookieName() && state.getCookieValue() && {
+      Cookie: `${state.getCookieName()}=${state.getCookieValue()}`
+    }),
+    // only add authorization header if we have a bearer token and are instructed to use it for AM APIs
+    ...(state.getUseBearerTokenForAmApis() && state.getBearerToken() && {
+      Authorization: `Bearer ${state.getBearerToken()}`
     })
   };
-
   if (requestOverride['headers']) {
-    headers = { ...headers,
+    headers = {
+      ...headers,
       ...requestOverride['headers']
     };
   }
-
   const requestDetails = {
     // baseURL: `${storage.session.getTenant()}/json`,
     timeout,
     ...requestOverride,
-    headers: { ...headers,
-      ...storage.session.getAuthenticationHeaderOverrides()
+    headers: {
+      ...headers,
+      ...state.getAuthenticationHeaderOverrides()
     },
     httpAgent: getHttpAgent(),
     httpsAgent: getHttpsAgent(),
     proxy: getProxy()
   };
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
+
 /**
  * Generates an OAuth2 Axios API instance
  * @param {object} resource Takes an object takes a resource object. example:
@@ -158,45 +164,50 @@ export function generateAmApi(resource, requestOverride = {}) {
  *
  * @returns {AxiosInstance}
  */
-
 export function generateOauth2Api(resource, requestOverride = {}) {
   let headers = {
     'User-Agent': userAgent,
+    'X-ForgeRock-TransactionId': transactionId,
     // only add API version if we have it
     ...(resource.apiVersion && {
       'Accept-API-Version': resource.apiVersion
     }),
-    // only send session cookie if we know its name and value
-    ...(storage.session.getCookieName() && storage.session.getCookieValue() && {
-      Cookie: `${storage.session.getCookieName()}=${storage.session.getCookieValue()}`
+    // only send session cookie if we know its name and value and we are not instructed to use the bearer token for AM APIs
+    ...(!state.getUseBearerTokenForAmApis() && state.getCookieName() && state.getCookieValue() && {
+      Cookie: `${state.getCookieName()}=${state.getCookieValue()}`
+    }),
+    // only add authorization header if we have a bearer token and are instructed to use it for AM APIs
+    ...(state.getUseBearerTokenForAmApis() && state.getBearerToken() && {
+      Authorization: `Bearer ${state.getBearerToken()}`
     })
   };
-
   if (requestOverride['headers']) {
-    headers = { ...headers,
+    headers = {
+      ...headers,
       ...requestOverride['headers']
     };
   }
-
   const requestDetails = {
     // baseURL: `${storage.session.getTenant()}/json${resource.path}`,
     timeout,
     ...requestOverride,
-    headers: { ...headers,
-      ...storage.session.getAuthenticationHeaderOverrides()
+    headers: {
+      ...headers,
+      ...state.getAuthenticationHeaderOverrides()
     },
     httpAgent: getHttpAgent(),
     httpsAgent: getHttpsAgent(),
     proxy: getProxy()
   };
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
+
 /**
  * Generates an IDM Axios API instance
  * @param {object} requestOverride Takes an object of AXIOS parameters that can be used to either add
@@ -204,14 +215,18 @@ export function generateOauth2Api(resource, requestOverride = {}) {
  *
  * @returns {AxiosInstance}
  */
-
 export function generateIdmApi(requestOverride = {}) {
   const requestDetails = {
     // baseURL: getTenantURL(storage.session.getTenant()),
     timeout,
     headers: {
       'User-Agent': userAgent,
-      'Content-Type': 'application/json'
+      'X-ForgeRock-TransactionId': transactionId,
+      'Content-Type': 'application/json',
+      // only add authorization header if we have a bearer token
+      ...(state.getBearerToken() && {
+        Authorization: `Bearer ${state.getBearerToken()}`
+      })
     },
     ...requestOverride,
     httpAgent: getHttpAgent(),
@@ -219,18 +234,21 @@ export function generateIdmApi(requestOverride = {}) {
     proxy: getProxy()
   };
 
-  if (storage.session.getBearerToken()) {
-    requestDetails.headers['Authorization'] = `Bearer ${storage.session.getBearerToken()}`;
-  }
+  // if (storage.session.getBearerToken()) {
+  //   requestDetails.headers[
+  //     'Authorization'
+  //   ] = `Bearer ${storage.session.getBearerToken()}`;
+  // }
 
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
+
 /**
  * Generates a LogKeys API Axios instance
  * @param {object} requestOverride Takes an object of AXIOS parameters that can be used to either add
@@ -238,11 +256,14 @@ export function generateIdmApi(requestOverride = {}) {
  *
  * @returns {AxiosInstance}
  */
-
 export function generateLogKeysApi(requestOverride = {}) {
   const headers = {
     'User-Agent': userAgent,
-    'Content-Type': 'application/json'
+    'Content-Type': 'application/json',
+    // only add authorization header if we have a bearer token
+    ...(state.getBearerToken() && {
+      Authorization: `Bearer ${state.getBearerToken()}`
+    })
   };
   const requestDetails = {
     // baseURL: getTenantURL(storage.session.getTenant()),
@@ -253,19 +274,15 @@ export function generateLogKeysApi(requestOverride = {}) {
     httpsAgent: getHttpsAgent(),
     proxy: getProxy()
   };
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getBearerToken()) {
-    requestDetails.headers['Authorization'] = `Bearer ${storage.session.getBearerToken()}`;
-  }
-
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
-
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
+
 /**
  * Generates a Log API Axios instance
  * @param {object} requestOverride Takes an object of AXIOS parameters that can be used to either add
@@ -273,12 +290,11 @@ export function generateLogKeysApi(requestOverride = {}) {
  *
  * @returns {AxiosInstance}
  */
-
 export function generateLogApi(requestOverride = {}) {
   const headers = {
     'User-Agent': userAgent,
-    'X-API-Key': storage.session.getLogApiKey(),
-    'X-API-Secret': storage.session.getLogApiSecret()
+    'X-API-Key': state.getLogApiKey(),
+    'X-API-Secret': state.getLogApiSecret()
   };
   const requestDetails = {
     // baseURL: getTenantURL(storage.session.getTenant()),
@@ -289,14 +305,15 @@ export function generateLogApi(requestOverride = {}) {
     httpsAgent: getHttpsAgent(),
     proxy: getProxy()
   };
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
+
 /**
  * Generates an ESV Axios API instance for Environment Secrets and Variables
  * @param {object} requestOverride Takes an object of AXIOS parameters that can be used to either add
@@ -304,7 +321,6 @@ export function generateLogApi(requestOverride = {}) {
  *
  * @returns {AxiosInstance}
  */
-
 export function generateESVApi(resource, requestOverride = {}) {
   const headers = {
     'User-Agent': userAgent,
@@ -312,6 +328,10 @@ export function generateESVApi(resource, requestOverride = {}) {
     // only add API version if we have it
     ...(resource.apiVersion && {
       'Accept-API-Version': resource.apiVersion
+    }),
+    // only add authorization header if we have a bearer token
+    ...(state.getBearerToken() && {
+      Authorization: `Bearer ${state.getBearerToken()}`
     })
   };
   const requestDetails = {
@@ -323,19 +343,15 @@ export function generateESVApi(resource, requestOverride = {}) {
     httpsAgent: getHttpsAgent(),
     proxy: getProxy()
   };
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getBearerToken()) {
-    requestDetails.headers['Authorization'] = `Bearer ${storage.session.getBearerToken()}`;
-  }
-
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
-
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
+
 /**
  * Generates a release (Github or Npm) Axios API instance
  * @param {object} requestOverride Takes an object of AXIOS parameters that can be used to either add
@@ -343,7 +359,6 @@ export function generateESVApi(resource, requestOverride = {}) {
  *
  * @returns {AxiosInstance}
  */
-
 export function generateReleaseApi(baseUrl, requestOverride = {}) {
   const requestDetails = {
     baseURL: baseUrl,
@@ -357,12 +372,12 @@ export function generateReleaseApi(baseUrl, requestOverride = {}) {
     httpsAgent: getHttpsAgent(),
     proxy: getProxy()
   };
-  const request = axios.create(requestDetails); // enable curlirizer output in debug mode
+  const request = axios.create(requestDetails);
 
-  if (storage.session.getCurlirize()) {
+  // enable curlirizer output in debug mode
+  if (state.getCurlirize()) {
     curlirize(request);
   }
-
   return request;
 }
 //# sourceMappingURL=BaseApi.js.map

package/esm/api/CirclesOfTrustApi.mjs

@@ -2,26 +2,24 @@ import util from 'util';
 import _ from 'lodash';
 import { generateAmApi } from './BaseApi';
 import { getCurrentRealmPath } from './utils/ApiUtils';
-import storage from '../storage/SessionStorage';
+import * as state from '../shared/State';
 const circleOfTrustByIdURLTemplate = '%s/json%s/realm-config/federation/circlesoftrust/%s';
 const createCircleOfTrustURLTemplate = '%s/json%s/realm-config/federation/circlesoftrust/?_action=create';
 const queryAllCirclesOfTrustURLTemplate = '%s/json%s/realm-config/federation/circlesoftrust?_queryFilter=true';
 const apiVersion = 'protocol=2.1,resource=1.0';
-
 const getApiConfig = () => {
   return {
     path: `/json${getCurrentRealmPath()}/realm-config/federation/circlesoftrust`,
     apiVersion
   };
 };
+
 /**
  * Get all SAML2 circles of trust
  * @returns {Promise} a promise that resolves to an array of circles of trust objects
  */
-
-
 export async function getCirclesOfTrust() {
-  const urlString = util.format(queryAllCirclesOfTrustURLTemplate, storage.session.getTenant(), getCurrentRealmPath());
+  const urlString = util.format(queryAllCirclesOfTrustURLTemplate, state.getHost(), getCurrentRealmPath());
   const {
     data
   } = await generateAmApi(getApiConfig()).get(urlString, {
@@ -29,14 +27,14 @@ export async function getCirclesOfTrust() {
   });
   return data;
 }
+
 /**
  * Get SAML2 circle of trust by id/name
  * @param {String} cotId Circle of trust id/name
  * @returns {Promise} a promise that resolves to a saml2 circle of trust object
  */
-
 export async function getCircleOfTrust(cotId) {
-  const urlString = util.format(circleOfTrustByIdURLTemplate, storage.session.getTenant(), getCurrentRealmPath(), cotId);
+  const urlString = util.format(circleOfTrustByIdURLTemplate, state.getHost(), getCurrentRealmPath(), cotId);
   const {
     data
   } = await generateAmApi(getApiConfig()).get(urlString, {
@@ -44,16 +42,15 @@ export async function getCircleOfTrust(cotId) {
   });
   return data;
 }
+
 /**
  * Create a SAML2 circle of trust
  * @param {Object} cotData Object representing a SAML circle of trust
  * @returns {Promise} a promise that resolves to a saml2 circle of trust object
  */
-
 export async function createCircleOfTrust(cotData) {
   const postData = _.cloneDeep(cotData);
-
-  const urlString = util.format(createCircleOfTrustURLTemplate, storage.session.getTenant(), getCurrentRealmPath());
+  const urlString = util.format(createCircleOfTrustURLTemplate, state.getHost(), getCurrentRealmPath());
   const {
     data
   } = await generateAmApi(getApiConfig()).post(urlString, postData, {
@@ -61,15 +58,15 @@ export async function createCircleOfTrust(cotData) {
   });
   return data;
 }
+
 /**
  * Update SAML2 circle of trust
  * @param {String} cotId Entity provider location (hosted or remote)
  * @param {Object} cotData Object representing a SAML2 circle of trust
  * @returns {Promise} a promise that resolves to a saml2 circle of trust object
  */
-
 export async function updateCircleOfTrust(cotId, cotData) {
-  const urlString = util.format(circleOfTrustByIdURLTemplate, storage.session.getTenant(), getCurrentRealmPath(), cotId);
+  const urlString = util.format(circleOfTrustByIdURLTemplate, state.getHost(), getCurrentRealmPath(), cotId);
   const {
     data
   } = await generateAmApi(getApiConfig()).put(urlString, cotData, {

package/esm/api/IdmConfigApi.mjs

@@ -1,59 +1,58 @@
 import util from 'util';
 import { generateIdmApi } from './BaseApi';
 import { getTenantURL } from './utils/ApiUtils';
-import storage from '../storage/SessionStorage';
+import * as state from '../shared/State';
 const idmAllConfigURLTemplate = '%s/openidm/config';
 const idmConfigURLTemplate = '%s/openidm/config/%s';
 const idmConfigEntityQueryTemplate = '%s/openidm/config?_queryFilter=%s';
 const idmManagedObjectURLTemplate = '%s/openidm/managed/%s?_queryFilter=true&_pageSize=10000';
+
 /**
  * Get all IDM config entities
  * @returns {Promise} a promise that resolves to all IDM config entities
  */
-
 export async function getAllConfigEntities() {
-  const urlString = util.format(idmAllConfigURLTemplate, getTenantURL(storage.session.getTenant()));
+  const urlString = util.format(idmAllConfigURLTemplate, getTenantURL(state.getHost()));
   const {
     data
   } = await generateIdmApi().get(urlString);
   return data;
 }
+
 /**
  * Get IDM config entities by type
  * @param {String} type the desired type of config entity
  * @returns {Promise} a promise that resolves to an object containing all IDM config entities of the desired type
  */
-
 export async function getConfigEntitiesByType(type) {
-  const urlString = util.format(idmConfigEntityQueryTemplate, getTenantURL(storage.session.getTenant()), encodeURIComponent(`_id sw '${type}'`));
+  const urlString = util.format(idmConfigEntityQueryTemplate, getTenantURL(state.getHost()), encodeURIComponent(`_id sw '${type}'`));
   const {
     data
   } = await generateIdmApi().get(urlString);
   return data;
 }
+
 /**
  * Get an IDM config entity
  * @param {string} entityId the desired config entity
  * @returns {Promise<unknown>} a promise that resolves to an IDM config entity
  */
-
 export async function getConfigEntity(entityId) {
-  const urlString = util.format(idmConfigURLTemplate, getTenantURL(storage.session.getTenant()), entityId);
+  const urlString = util.format(idmConfigURLTemplate, getTenantURL(state.getHost()), entityId);
   const {
     data
   } = await generateIdmApi().get(urlString);
   return data;
 }
+
 /**
  * Put IDM config entity
  * @param {string} entityId config entity id
  * @param {string} entityData config entity object
  * @returns {Promise<unknown>} a promise that resolves to an IDM config entity
  */
-
 export async function putConfigEntity(entityId, entityData) {
-  const urlString = util.format(idmConfigURLTemplate, getTenantURL(storage.session.getTenant()), entityId);
-
+  const urlString = util.format(idmConfigURLTemplate, getTenantURL(state.getHost()), entityId);
   try {
     const {
       data
@@ -63,6 +62,7 @@ export async function putConfigEntity(entityId, entityData) {
     throw Error(`Could not put config entity ${entityId}: ${error}`);
   }
 }
+
 /**
  * Query managed objects
  * @param {String} type managed object type
@@ -70,11 +70,10 @@ export async function putConfigEntity(entityId, entityData) {
  * @param {String} pageCookie paged results cookie
  * @returns {Promise<{result: any[]; resultCount: number; pagedResultsCookie: any; totalPagedResultsPolicy: string; totalPagedResults: number; remainingPagedResults: number;}>} a promise that resolves to managed objects of the desired type
  */
-
 export async function queryAllManagedObjectsByType(type, fields, pageCookie) {
   const fieldsParam = fields.length > 0 ? `&_fields=${fields.join(',')}` : '&_fields=_id';
   const urlTemplate = pageCookie ? `${idmManagedObjectURLTemplate}${fieldsParam}&_pagedResultsCookie=${encodeURIComponent(pageCookie)}` : `${idmManagedObjectURLTemplate}${fieldsParam}`;
-  const urlString = util.format(urlTemplate, getTenantURL(storage.session.getTenant()), type);
+  const urlString = util.format(urlTemplate, getTenantURL(state.getHost()), type);
   const {
     data
   } = await generateIdmApi().get(urlString);

package/esm/api/LogApi.mjs

@@ -1,42 +1,38 @@
 import util from 'util';
 import { generateLogApi, generateLogKeysApi } from './BaseApi';
 import { getTenantURL } from './utils/ApiUtils';
-import storage from '../storage/SessionStorage';
+import * as state from '../shared/State';
 const logsTailURLTemplate = '%s/monitoring/logs/tail?source=%s';
 const logsFetchURLTemplate = '%s/monitoring/logs?source=%s&beginTime=%s&endTime=%s';
 const logsSourcesURLTemplate = '%s/monitoring/logs/sources';
 const logsCreateAPIKeyAndSecretURLTemplate = '%s/keys?_action=create';
 const logsGetAPIKeysURLTemplate = '%s/keys';
 export async function tail(source, cookie) {
-  let urlString = util.format(logsTailURLTemplate, getTenantURL(storage.session.getTenant()), encodeURIComponent(source));
-
+  let urlString = util.format(logsTailURLTemplate, getTenantURL(state.getHost()), encodeURIComponent(source));
   if (cookie) {
     urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;
   }
-
   return generateLogApi().get(urlString);
 }
 export async function getAPIKeys() {
-  const urlString = util.format(logsGetAPIKeysURLTemplate, getTenantURL(storage.session.getTenant()));
+  const urlString = util.format(logsGetAPIKeysURLTemplate, getTenantURL(state.getHost()));
   return generateLogKeysApi().get(urlString);
 }
 export async function getSources() {
-  const urlString = util.format(logsSourcesURLTemplate, getTenantURL(storage.session.getTenant()));
+  const urlString = util.format(logsSourcesURLTemplate, getTenantURL(state.getHost()));
   return generateLogApi().get(urlString);
 }
 export async function createAPIKeyAndSecret(keyName) {
-  const urlString = util.format(logsCreateAPIKeyAndSecretURLTemplate, getTenantURL(storage.session.getTenant()));
+  const urlString = util.format(logsCreateAPIKeyAndSecretURLTemplate, getTenantURL(state.getHost()));
   return generateLogKeysApi().post(urlString, {
     name: keyName
   });
 }
 export async function fetch(source, startTs, endTs, cookie) {
-  let urlString = util.format(logsFetchURLTemplate, getTenantURL(storage.session.getTenant()), encodeURIComponent(source), startTs, endTs);
-
+  let urlString = util.format(logsFetchURLTemplate, getTenantURL(state.getHost()), encodeURIComponent(source), startTs, endTs);
   if (cookie) {
     urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;
   }
-
   return generateLogApi({
     timeout: 60000
   }).get(urlString);