@codiac.io/codiac-cli 1.3.82 → 1.3.84

package/dist/apis/codiac-api/common/token-utils.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenUtils = void 0;
+const tslib_1 = require("tslib");
+const codiac_common_1 = require("@codiac.io/codiac-common");
+const contracts_1 = require("@codiac.io/codiac-common/contracts");
+const jwt_lib_1 = require("@codiac.io/jwt-lib");
+const inversify_1 = require("inversify");
+let TokenUtils = class TokenUtils {
+    constructor(logger) {
+        this.logger = logger;
+    }
+    /** Determines whether the given token is expired.
+     * @param throwOnError throws any encountered errors, including token parsing errors.
+     */
+    isExpired(token, throwOnError = false) {
+        try {
+            const exp = this.extractTokenExpiration(token);
+            return (exp == undefined) || !(0, codiac_common_1.isFuture)(exp);
+        }
+        catch (err) {
+            let newErr = new contracts_1.CodiacError(`Error determining expiry status: ${err.message || ""}`, err);
+            this.logger.detail(newErr.message);
+            if (throwOnError) {
+                throw newErr;
+            }
+            else {
+                return true;
+            }
+        }
+    }
+    extractTokenExpiration(token) {
+        let exp;
+        try {
+            const encoder = new jwt_lib_1.JwtEncoder();
+            const tokenObj = encoder.tryDecode(token);
+            const CLAIM_KEY_FOR_EXPIRATION = "exp"; // this is just a standard claim so it ought to come from the jwt lib
+            const rawExp = tokenObj === null || tokenObj === void 0 ? void 0 : tokenObj.payload[CLAIM_KEY_FOR_EXPIRATION];
+            if (rawExp) {
+                try {
+                    exp = new Date(rawExp);
+                    this.logger.trace(`Exracted token expiration (utc): ${(exp === null || exp === void 0 ? void 0 : exp.toUTCString()) || "undefined"}`);
+                }
+                catch (_a) {
+                    this.logger.trace(`Invalid date format in token expiration: [${rawExp}]`);
+                }
+            }
+            return exp;
+        }
+        catch (err) {
+            throw new Error(`Error parsing expiration from token: ${err.message}`);
+        }
+    }
+    extractRoles(token) {
+        var _a;
+        let roles;
+        try {
+            const encoder = new jwt_lib_1.JwtEncoder();
+            const tokenObj = encoder.tryDecode(token);
+            const CLAIM_KEY_FOR_ROLES = "roles"; // this is just a standard claim so it ought to come from the jwt lib
+            const rawValue = tokenObj === null || tokenObj === void 0 ? void 0 : tokenObj.payload[CLAIM_KEY_FOR_ROLES];
+            if (rawValue) {
+                try {
+                    roles = rawValue.split(",");
+                    this.logger.trace(`Extracted roles: ${rawValue || "undefined"}`);
+                }
+                catch (err) {
+                    this.logger.trace(`Error parsing roles from claim: [${(_a = err.message) !== null && _a !== void 0 ? _a : "no details available"}]`);
+                }
+            }
+            return roles;
+        }
+        catch (err) {
+            throw new Error(`Error parsing expiration from token: ${err.message}`);
+        }
+    }
+};
+TokenUtils = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__param(0, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
+    tslib_1.__metadata("design:paramtypes", [Object])
+], TokenUtils);
+exports.TokenUtils = TokenUtils;
+//# sourceMappingURL=token-utils.js.map

package/dist/apis/codiac-api/common/token-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-utils.js","sourceRoot":"","sources":["../../../../src/apis/codiac-api/common/token-utils.ts"],"names":[],"mappings":";;;;AAAA,4DAA+E;AAC/E,kEAAiE;AACjE,gDAAgD;AAChD,yCAA+C;AAGxC,IAAM,UAAU,GAAhB,MAAM,UAAU;IAErB,YAAsD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAE3E,CAAC;IAID;;OAEG;IACI,SAAS,CAAC,KAAa,EAAE,eAAwB,KAAK;QAC3D,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC/C,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,IAAA,wBAAQ,EAAC,GAAG,CAAC,CAAC;SAC7C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,MAAM,GAAG,IAAI,uBAAW,CAAC,oCAAoC,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;YAC1F,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,YAAY,EAAE;gBAChB,MAAM,MAAM,CAAC;aACd;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;SACF;IACH,CAAC;IAGM,sBAAsB,CAAC,KAAa;QACzC,IAAI,GAAqB,CAAC;QAC1B,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,oBAAU,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,wBAAwB,GAAG,KAAK,CAAC,CAAE,qEAAqE;YAC9G,MAAM,MAAM,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC;YAC3D,IAAI,MAAM,EAAE;gBACV,IAAI;oBACF,GAAG,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;oBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,EAAE,KAAI,WAAW,EAAE,CAAC,CAAC;iBAC5F;gBAAC,WAAM;oBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,MAAM,GAAG,CAAC,CAAC;iBAC3E;aACF;YACD,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;IAGM,YAAY,CAAC,KAAa;;QAC/B,IAAI,KAA2B,CAAC;QAChC,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,oBAAU,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,mBAAmB,GAAG,OAAO,CAAC,CAAE,qEAAqE;YAC3G,MAAM,QAAQ,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACxD,IAAI,QAAQ,EAAE;gBACZ,IAAI;oBACF,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;iBAClE;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,MAAA,GAAG,CAAC,OAAO,mCAAI,sBAAsB,GAAG,CAAC,CAAC;iBACjG;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CAEF,CAAA;AAtEY,UAAU;IADtB,IAAA,sBAAU,GAAE;IAGE,mBAAA,IAAA,kBAAM,EAAC,0BAAU,CAAC,aAAa,CAAC,CAAA;;GAFlC,UAAU,CAsEtB;AAtEY,gCAAU"}

package/dist/apis/codiac-api/gen/client-config.d.ts

@@ -1,10 +1,10 @@
 /** The in-memory representation of the api client config file.
  */
-export declare class CodiacClientConfig {
+export declare class CodiacRestClientConfig {
     static readonly CONFIG_PATH: string;
     static readonly CONFIG_FILENAME = "config.json";
     private static loader;
-    static load(): CodiacClientConfig | undefined;
+    static load(): CodiacRestClientConfig | undefined;
     constructor();
     apiBaseUrl: string | undefined;
 }

package/dist/apis/codiac-api/gen/client-config.js

@@ -1,7 +1,7 @@
 "use strict";
-var CodiacClientConfig_1;
+var CodiacRestClientConfig_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodiacClientConfig = void 0;
+exports.CodiacRestClientConfig = void 0;
 const tslib_1 = require("tslib");
 const os = require("os");
 const path = require("path");
@@ -9,7 +9,7 @@ const inversify_1 = require("inversify");
 const config_loader_1 = require("../common/config-loader");
 /** The in-memory representation of the api client config file.
  */
-let CodiacClientConfig = CodiacClientConfig_1 = class CodiacClientConfig {
+let CodiacRestClientConfig = CodiacRestClientConfig_1 = class CodiacRestClientConfig {
     static load() {
         const os = require('os');
         let cfg = this.loader.load(); // yeah this is real helpful - maybe we should just accept the .loader.load() syntax and expose the loader itself?
@@ -18,12 +18,12 @@ let CodiacClientConfig = CodiacClientConfig_1 = class CodiacClientConfig {
     constructor() {
     }
 };
-CodiacClientConfig.CONFIG_PATH = path.posix.join(os.homedir(), `.config`, `codiac-api-client`);
-CodiacClientConfig.CONFIG_FILENAME = "config.json";
-CodiacClientConfig.loader = new config_loader_1.ConfigLoader(CodiacClientConfig_1.CONFIG_PATH, CodiacClientConfig_1.CONFIG_FILENAME);
-CodiacClientConfig = CodiacClientConfig_1 = tslib_1.__decorate([
+CodiacRestClientConfig.CONFIG_PATH = path.posix.join(os.homedir(), `.config`, `codiac-api-client`);
+CodiacRestClientConfig.CONFIG_FILENAME = "config.json";
+CodiacRestClientConfig.loader = new config_loader_1.ConfigLoader(CodiacRestClientConfig_1.CONFIG_PATH, CodiacRestClientConfig_1.CONFIG_FILENAME);
+CodiacRestClientConfig = CodiacRestClientConfig_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__metadata("design:paramtypes", [])
-], CodiacClientConfig);
-exports.CodiacClientConfig = CodiacClientConfig;
+], CodiacRestClientConfig);
+exports.CodiacRestClientConfig = CodiacRestClientConfig;
 //# sourceMappingURL=client-config.js.map

package/dist/apis/codiac-api/gen/client-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-config.js","sourceRoot":"","sources":["../../../../src/apis/codiac-api/gen/client-config.ts"],"names":[],"mappings":";;;;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,yCAAuC;AACvC,2DAAuD;AAGvD;GACG;AAEI,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAK7B,MAAM,CAAC,IAAI;QACT,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAE,kHAAkH;QACjJ,OAAO,GAAG,CAAC;IACb,CAAC;IAED;IAEA,CAAC;;AAbsB,8BAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAC5E,kCAAe,GAAG,aAAa,CAAC;AACxC,yBAAM,GAAG,IAAI,4BAAY,CAAqB,oBAAkB,CAAC,WAAW,EAAE,oBAAkB,CAAC,eAAe,CAAC,CAAA;AAHrH,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;;GACA,kBAAkB,CAgB9B;AAhBY,gDAAkB"}
+{"version":3,"file":"client-config.js","sourceRoot":"","sources":["../../../../src/apis/codiac-api/gen/client-config.ts"],"names":[],"mappings":";;;;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,yCAAuC;AACvC,2DAAuD;AAGvD;GACG;AAEI,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAKjC,MAAM,CAAC,IAAI;QACT,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAE,kHAAkH;QACjJ,OAAO,GAAG,CAAC;IACb,CAAC;IAED;IAEA,CAAC;;AAbsB,kCAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAC5E,sCAAe,GAAG,aAAa,CAAC;AACxC,6BAAM,GAAG,IAAI,4BAAY,CAAyB,wBAAsB,CAAC,WAAW,EAAE,wBAAsB,CAAC,eAAe,CAAC,CAAA;AAHjI,sBAAsB;IADlC,IAAA,sBAAU,GAAE;;GACA,sBAAsB,CAgBlC;AAhBY,wDAAsB"}

package/dist/apis/codiac-api/gen/client.d.ts

@@ -1,15 +1,18 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { interfaces } from "inversify";
 import { IRepoOptions, IBetterLogger } from "@codiac.io/codiac-common";
-import { Result, ListResult, BatchResult, SingleResult, PatchSpecForOne, PatchSpecForMany, UpdatePartialWhereRequest, IdSpecFor } from "@codiac.io/codiac-common/contracts";
+import { ListResult, BatchResult, SingleResult, PatchSpecForOne, PatchSpecForMany, UpdatePartialWhereRequest, IdSpecFor } from "@codiac.io/codiac-common/contracts";
 import { ApiClientBase } from "../common/api-client-base";
 import { ApiCrudClientBase } from "../common/api-crud-client-base";
 import { ApiUserCreds } from "../common/api-user-creds";
-import { CodiacClientConfig } from "./client-config";
-import { ApiAuthMethodsLegacy } from "../common/security/api-auth-methods-legacy";
+import { CodiacRestClientConfig } from "./client-config";
+import { ICodiacClient } from "../i-client";
 export interface IThrowingRepoOptions extends IRepoOptions {
     throwNotFound?: boolean;
 }
-export declare class CodiacClient extends ApiCrudClientBase {
-    static bootstrap(logger?: IBetterLogger): void;
+export declare class CodiacRestClient extends ApiCrudClientBase implements ICodiacClient {
+    static bootstrap(ioc: interfaces.Container, logger?: IBetterLogger): void;
     /** Version of the remote api from which this client was generated */
     static apiVersion: string;
     static DEFAULT_API_URL: string;
@@ -17,14 +20,13 @@ export declare class CodiacClient extends ApiCrudClientBase {
      * TODO: Get this from a config that is copied from the server proiject to the client project on build.
      */
     /** This factory method is just for convenience and hasty backward compatibility with consumers not using ioc. */
-    static create(logger: IBetterLogger, apiRootUrl?: string, authToken?: string): CodiacClient;
+    static create(logger: IBetterLogger, apiRootUrl?: string, authToken?: string): CodiacRestClient;
     /** Local interface for the remote api.
      * @param settings (optional) configuration (ie: apiRootUrl) to use for the client.  If not provided settings will be loaded from the config file on the local machine.
      *
      */
-    constructor(logger: IBetterLogger, settings?: CodiacClientConfig, credentials?: ApiUserCreds);
+    constructor(logger: IBetterLogger, settings?: CodiacRestClientConfig, credentials?: ApiUserCreds);
     protected GetDefaultRootUrl(): string;
-    AuthLegacy: ApiAuthMethodsLegacy;
     Auth: AuthOperations;
     Call: OtherOperations;
     ActivityBase: ActivityBaseCruds;
@@ -145,13 +147,12 @@ declare class AuthOperations {
     SwitchTenant(request: SwitchTenantRequest, options?: IRepoOptions): Promise<SingleResult<TenantUser>>;
     TenantRegistration(request: TenantRegistrationRequest, options?: IRepoOptions): Promise<SingleResult<AuthTenant>>;
     TokenRefresh(request: RefreshTokenRequest, options?: IRepoOptions): Promise<SingleResult<TenantUser>>;
-    WhoAmI(request: WhoAmIRequest, options?: IRepoOptions): Promise<Result>;
+    WhoAmI(request: WhoAmIRequest, options?: IRepoOptions): Promise<SingleResult<TenantUser>>;
     /** Determines whether the given token is expired.
      * @param throwOnError throws any encountered errors, including token parsing errors.
      */
     isExpired(token: string, throwOnError?: boolean): boolean;
     extractTokenExpiration(token: string): Date | undefined;
-    extractRoles(token: string): string[] | undefined;
 }
 import { ActivityBase, ActivityCriteriaBase } from "../contracts";
 declare class ActivityBaseCruds {
@@ -2560,7 +2561,7 @@ declare class ZombiePeriodCruds {
     tryUpsertMany(request: Array<ZombiePeriod>, options?: IRepoOptions): Promise<BatchResult<ZombiePeriod>>;
     upsertMany(request: Array<ZombiePeriod>, options?: IThrowingRepoOptions): Promise<ZombiePeriod[]>;
 }
-import { ApiReadyState, AssetIdentifier, Buffer, CabinetAssetVersion, CabinetConfigState, CabinetConfigStateRequest, CabinetHostNameConfig, CabinetHostNameConfigCriteria, CabinetScopesCriteria, ClusterAttachRequest, ClusterDetachRequest, ConfigDef, ConfigDefCriteria, ConfigDoc, ConfigDocSpecForOne, EnterpriseScope, EnterpriseState, EnterpriseStateRequest, FileRequest, ReadyStateRequest, RootMap, RootMapCriteria, ScopedConfig, ScopedConfigCriteria, VersionGetsertRequest } from "../contracts";
+import { ApiReadyState, AssetWhereRequest, CabinetAssetVersion, CabinetConfigState, CabinetConfigStateRequest, CabinetHostNameConfig, CabinetHostNameConfigCriteria, CabinetScopesCriteria, ClusterAttachRequest, ClusterDetachRequest, ConfigDef, ConfigDefCriteria, ConfigDoc, ConfigDocSpecForOne, EnterpriseScope, EnterpriseState, EnterpriseStateRequest, FileRequest, HeartbeatRecord, ReadyStateRequest, RootMap, RootMapCriteria, ScopedConfig, ScopedConfigCriteria, VersionGetsertRequest } from "../contracts";
 declare class OtherOperations {
     private core;
     constructor(core: ApiCrudClientBase);
@@ -2571,7 +2572,7 @@ declare class OtherOperations {
     /** Assembles (via smashMerge) the host naming strategy configuration for each applicable cabinet. Allows deeper filtering on domain names and types of host name strategies. */
     GetCabinetHostNameConfig(request: CabinetHostNameConfigCriteria, options?: IRepoOptions): Promise<ListResult<CabinetHostNameConfig>>;
     /** Shows the cabinets to which the given asset is currently deployed and which version is where. */
-    assetWhere(request: AssetIdentifier, options?: IRepoOptions): Promise<ListResult<CabinetAssetVersion>>;
+    assetWhere(request: AssetWhereRequest, options?: IRepoOptions): Promise<ListResult<CabinetAssetVersion>>;
     /** Retrieves the enterprise configuration currently in play in a single given cabinet,
         in terms of versions of the enterprise and its assets.
         This is a composite/hybrid object made up of a Cabinet, EnterpriseVersionConfig and an EnterpriseRunState.
@@ -2593,6 +2594,10 @@ declare class OtherOperations {
     getSwaggerUiPath(request: FileRequest, options?: IRepoOptions): Promise<Buffer>;
     /** Assembles an enterprise version configuration by overlaying the given assets onto an optional existing enterprise version, and either creates a new version record for it or retrieves one if that configuration already exists.  Assets are automatically placed within their respective products if applicable. */
     getsertVersion(request: VersionGetsertRequest, options?: IRepoOptions): Promise<SingleResult<EnterpriseVersionConfig>>;
+    /** Lightweight endpoint returning the last heartbeat as a UTC standard format date string (retrieves from ENV variable: HEARTBEAT_LAST). */
+    heartbeat(request: Object, options?: IRepoOptions): Promise<void>;
+    /** Lightweight endpoint returning the last heartbeat object as a JSON string (retrieves from ENV variable: HEARTBEAT_JSON). */
+    heartbeatJson(request: Object, options?: IRepoOptions): Promise<HeartbeatRecord>;
     readyState(request: ReadyStateRequest, options?: IRepoOptions): Promise<ApiReadyState>;
     /** File serve for the relay service. */
     relayResources(request: FileRequest, options?: IRepoOptions): Promise<Buffer>;

package/dist/apis/codiac-api/gen/client.js

@@ -1,7 +1,7 @@
 "use strict";
-var CodiacClient_1;
+var CodiacRestClient_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodiacClient = void 0;
+exports.CodiacRestClient = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
 const codiac_common_1 = require("@codiac.io/codiac-common");
@@ -9,7 +9,6 @@ const contracts_1 = require("@codiac.io/codiac-common/contracts");
 const api_crud_client_base_1 = require("../common/api-crud-client-base");
 const api_user_creds_1 = require("../common/api-user-creds");
 const client_config_1 = require("./client-config");
-const api_auth_methods_legacy_1 = require("../common/security/api-auth-methods-legacy");
 function headersFrom(options, existingHeaders) {
     let output;
     // FROM the api base...
@@ -24,25 +23,32 @@ function headersFrom(options, existingHeaders) {
     }
     return output;
 }
-let CodiacClient = CodiacClient_1 = class CodiacClient extends api_crud_client_base_1.ApiCrudClientBase {
-    static bootstrap(logger) {
+let CodiacRestClient = CodiacRestClient_1 = class CodiacRestClient extends api_crud_client_base_1.ApiCrudClientBase {
+    static bootstrap(ioc, logger) {
         super.bootstrap_base([], logger);
+        // // Unfortunately, we cant set this binding in the cli, 
+        // // because the dependencies need to be drawn from 
+        // // lazy-loaded properties on the command object 
+        // // (or we will end up with multiple instances of them).
+        // // TODO: Consider binding all as singletons in the cli (or adding an "asSingleton" flag to all the bootstrap methods).  eg: logger, ApiClient, NatsClient, UserContext, TenantContextualizer...
+        // ioc.bind(CodiacRestClient).toSelf();  
     }
     /** Hardcoded to match the current setting on the server.
      * TODO: Get this from a config that is copied from the server proiject to the client project on build.
      */
     /** This factory method is just for convenience and hasty backward compatibility with consumers not using ioc. */
     static create(logger, apiRootUrl, authToken) {
-        return new CodiacClient_1(logger, { apiBaseUrl: apiRootUrl }, (authToken) ? { apiToken: authToken } : undefined);
+        const creds = (authToken) ? { apiToken: authToken } : undefined;
+        return new CodiacRestClient_1(logger, { apiBaseUrl: apiRootUrl }, creds);
     }
     /** Local interface for the remote api.
      * @param settings (optional) configuration (ie: apiRootUrl) to use for the client.  If not provided settings will be loaded from the config file on the local machine.
      *
      */
     constructor(logger, settings, credentials) {
-        let ultimateSettings = settings !== null && settings !== void 0 ? settings : client_config_1.CodiacClientConfig.load(); // load up default settings if not specified 
+        let ultimateSettings = settings !== null && settings !== void 0 ? settings : client_config_1.CodiacRestClientConfig.load(); // load up default settings if not specified 
         super(logger, ultimateSettings === null || ultimateSettings === void 0 ? void 0 : ultimateSettings.apiBaseUrl, credentials === null || credentials === void 0 ? void 0 : credentials.apiToken);
-        this.AuthLegacy = new api_auth_methods_legacy_1.ApiAuthMethodsLegacy(this, this.logger);
+        // public AuthLegacy = new ApiAuthMethodsLegacy(this, this.logger);
         this.Auth = new AuthOperations(this, this.logger);
         this.Call = new OtherOperations(this);
         // ====================================================================================================
@@ -99,31 +105,21 @@ let CodiacClient = CodiacClient_1 = class CodiacClient extends api_crud_client_b
         this.ZombiePeriod = new ZombiePeriodCruds(this);
     }
     GetDefaultRootUrl() {
-        return CodiacClient_1.DEFAULT_API_URL;
+        return CodiacRestClient_1.DEFAULT_API_URL;
     }
-}; // end class CodiacClient
+}; // end class CodiacRestClient
 /** Version of the remote api from which this client was generated */
-CodiacClient.apiVersion = "version";
-CodiacClient.DEFAULT_API_URL = "https://api.codiac.io";
-CodiacClient = CodiacClient_1 = tslib_1.__decorate([
+CodiacRestClient.apiVersion = "version";
+CodiacRestClient.DEFAULT_API_URL = "https://api.codiac.io";
+CodiacRestClient = CodiacRestClient_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__param(0, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
-    tslib_1.__param(1, (0, inversify_1.inject)(client_config_1.CodiacClientConfig)),
+    tslib_1.__param(1, (0, inversify_1.inject)(client_config_1.CodiacRestClientConfig)),
     tslib_1.__param(2, (0, inversify_1.inject)(api_user_creds_1.ApiUserCreds)),
-    tslib_1.__metadata("design:paramtypes", [Object, client_config_1.CodiacClientConfig,
+    tslib_1.__metadata("design:paramtypes", [Object, client_config_1.CodiacRestClientConfig,
         api_user_creds_1.ApiUserCreds])
-], CodiacClient);
-exports.CodiacClient = CodiacClient;
-//  // EXAMPLE
-//  let client = new CodiacClient(new BetterConsoleLogger());
-//  let wf: WorkFlowStrategy = { 
-//    name: "setup", 
-//    created: new Date(), 
-//    createdBy: "", 
-//    modified: new Date(), 
-//    modifiedBy: "" 
-//  };
-//  let res = await client.WorkFlowStrategy.trycreate(wf);
+], CodiacRestClient);
+exports.CodiacRestClient = CodiacRestClient;
 // ====================================================================================================
 // AUTH ENDPOINT CLASS 
 // ====================================================================================================
@@ -1007,29 +1003,6 @@ class AuthOperations {
             throw new Error(`Error parsing expiration from token: ${err.message}`);
         }
     }
-    extractRoles(token) {
-        var _a;
-        let roles;
-        try {
-            const encoder = new jwt_lib_1.JwtEncoder();
-            const tokenObj = encoder.tryDecode(token);
-            const CLAIM_KEY_FOR_ROLES = "roles"; // this is just a standard claim so it ought to come from the jwt lib
-            const rawValue = tokenObj === null || tokenObj === void 0 ? void 0 : tokenObj.payload[CLAIM_KEY_FOR_ROLES];
-            if (rawValue) {
-                try {
-                    roles = rawValue.split(",");
-                    this.logger.trace(`Extracted roles: ${rawValue || "undefined"}`);
-                }
-                catch (err) {
-                    this.logger.trace(`Error parsing roles from claim: [${(_a = err.message) !== null && _a !== void 0 ? _a : "no details available"}]`);
-                }
-            }
-            return roles;
-        }
-        catch (err) {
-            throw new Error(`Error parsing expiration from token: ${err.message}`);
-        }
-    }
 }
 class ActivityBaseCruds {
     constructor(core) {
@@ -16092,7 +16065,7 @@ class OtherOperations {
     /** Retrieves all available enterprises, environments, cabinets, and clusters for the given tenant. */
     getCabinetScopes(request, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.core.makeAnyRestCall({ entityTypeName: "", isMany: false, op: "getCabinetScopes", route: "/scopes", verb: codiac_common_1.httpRestVerb.GET }, request, options);
+            return yield this.core.makeAnyRestCall({ entityTypeName: "", isMany: false, op: "getCabinetScopes", route: "/scopes(/)", verb: codiac_common_1.httpRestVerb.GET }, request, options);
         });
     }
     /** Retrieves the list of currently declared config files for the given enterprise asset. */
@@ -16136,6 +16109,18 @@ class OtherOperations {
             return yield this.core.makeAnyRestCall({ entityTypeName: "", isMany: false, op: "getsertVersion", route: "/version-factory", verb: codiac_common_1.httpRestVerb.POST }, request, options);
         });
     }
+    /** Lightweight endpoint returning the last heartbeat as a UTC standard format date string (retrieves from ENV variable: HEARTBEAT_LAST). */
+    heartbeat(request, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return yield this.core.makeAnyRestCall({ entityTypeName: "", isMany: false, op: "heartbeat", route: "/heartbeat", verb: codiac_common_1.httpRestVerb.GET }, request, options);
+        });
+    }
+    /** Lightweight endpoint returning the last heartbeat object as a JSON string (retrieves from ENV variable: HEARTBEAT_JSON). */
+    heartbeatJson(request, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return yield this.core.makeAnyRestCall({ entityTypeName: "", isMany: false, op: "heartbeatJson", route: "/heartbeat-json", verb: codiac_common_1.httpRestVerb.GET }, request, options);
+        });
+    }
     readyState(request, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return yield this.core.makeAnyRestCall({ entityTypeName: "", isMany: false, op: "readyState", route: "/ready-state", verb: codiac_common_1.httpRestVerb.GET }, request, options);
@@ -16148,38 +16133,4 @@ class OtherOperations {
         });
     }
 }
-//    // ===================================================================================
-//    // THROWING REPO
-//    // ===================================================================================
-//
-//
-//    import { IRepoOptions, IDomainEntity, classDef } from "@codiac.io/codiac-common";
-//    import * as contracts from "@codiac.io/codiac-common/contracts";
-//
-//
-//    export interface IThrowingRepoOptions extends IRepoOptions {
-//      throwNotFound?: boolean;
-//    }
-//
-//
-//    /** HACK:  This class exists ONLY because the client does not implement IRepo, so we cannot use ThrowingRepoWrapper.
-//     * because the client needs criteriaType argument on tryReadMany, tryPatchWhere, and tryDeleteWhere.
-//     *
-//     * Wraps repo methods to throw on error or when unsuccessful.
-//     * EXCEPT read, which can return undefined when none found
-//     * and readMany which can return an empty array when none found.
-//     */
-//    @injectable()
-//    export class ThrowingCodiacClient /* implements IThrowingRepo */ {
-//      constructor(@inject(CodiacClient) public repo: CodiacClient) {
-//      }
-//
-//      // startTransaction(): Promise<void> { return this.repo.startTransaction(); }
-//      // commit(): Promise<void> { return this.repo.commit(); }
-//      // rollback(): Promise<void> { return this.repo.rollback(); }
-//
-//
-//
-//
-//    }
 //# sourceMappingURL=client.js.map