perimeterx-js-core 0.21.6 → 0.22.0

package/lib/cjs/config/ConfigurationBase.js

@@ -29,7 +29,7 @@ var ConfigurationBase = /** @class */ (function () {
         Object.keys(defaultParams).forEach(function (k) {
             config[k] = _this.getValidConfigValue(params, defaultParams, k);
         });
-        this.internalLogger = this.createInternalLogger(config.px_logger_severity);
+        this.internalLogger = this.createInternalLogger(config);
         return config;
     };
     ConfigurationBase.prototype.throwIfMissingRequiredField = function (params) {
@@ -76,8 +76,8 @@ var ConfigurationBase = /** @class */ (function () {
                 return defaultParams[key];
         }
     };
-    ConfigurationBase.prototype.createInternalLogger = function (loggerSeverity) {
-        return new logger_1.DefaultLogger(loggerSeverity, false);
+    ConfigurationBase.prototype.createInternalLogger = function (params) {
+        return new logger_1.DefaultLogger(params.px_logger_severity, false);
     };
     ConfigurationBase.prototype.addRemoteConfig = function (remoteConfigParams) {
         this.remoteConfigParams = remoteConfigParams;

package/lib/cjs/config/defaults/DefaultConfigurationParams.js

@@ -4,6 +4,7 @@ exports.DEFAULT_CONFIGURATION_PARAMS = void 0;
 var logger_1 = require("../../logger");
 var utils_1 = require("../../utils");
 var products_1 = require("../../products");
+var risk_token_1 = require("../../risk_token");
 exports.DEFAULT_CONFIGURATION_PARAMS = {
     px_app_id: '',
     px_auth_token: '',
@@ -12,6 +13,7 @@ exports.DEFAULT_CONFIGURATION_PARAMS = {
     px_remote_config_auth_token: '',
     px_remote_config_enabled: true,
     px_remote_config_id: '',
+    px_token_version: risk_token_1.TokenVersion.V3,
     px_remote_config_version: 0,
     px_filter_by_route_regex: [],
     px_monitored_routes_regex: [],

package/lib/cjs/config/params/index.js

@@ -20,3 +20,5 @@ __exportStar(require("./StaticConfigurationParamsOnly"), exports);
 __exportStar(require("./StaticConfigurationParams"), exports);
 __exportStar(require("./RemoteConfigurationParams"), exports);
 __exportStar(require("./ConfigurationParams"), exports);
+__exportStar(require("./TokenV3ConfigurationParamsOnly"), exports);
+__exportStar(require("./BatchedActivitiesConfigParams"), exports);

package/lib/cjs/enforcer/index.js

@@ -16,5 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./IEnforcer"), exports);
 __exportStar(require("./EnforcerBase"), exports);
-__exportStar(require("./options"), exports);
+__exportStar(require("./EnforcerOptions"), exports);
 __exportStar(require("./utils"), exports);

package/lib/cjs/enforcer/utils.js

@@ -22,9 +22,19 @@ var risk_api_1 = require("../risk_api");
 var activities_1 = require("../activities");
 var logger_1 = require("../logger");
 var products_1 = require("../products");
+var utils_1 = require("../utils");
 var createEnforcerInitializationBlock = function (config, options) {
-    var tokenVersion = options.tokenVersion, httpClient = options.httpClient, base64Utils = options.base64Utils, hmacUtils = options.hmacUtils, hashUtils = options.hashUtils, urlUtils = options.urlUtils, ipRangeChecker = options.ipRangeChecker;
+    var tokenVersion = config.tokenVersion;
+    if (!(0, utils_1.isValidTokenVersion)(tokenVersion)) {
+        throw new utils_1.EnforcerError("error initializing enforcer: token version ".concat(tokenVersion, " is invalid (must be one of ").concat(Object.values(risk_token_1.TokenVersion)
+            .map(function (v) { return "\"".concat(v, "\""); })
+            .join(', '), ")"));
+    }
+    var httpClient = options.httpClient, base64Utils = options.base64Utils, hmacUtils = options.hmacUtils, hashUtils = options.hashUtils, urlUtils = options.urlUtils, ipRangeChecker = options.ipRangeChecker;
     var cipherUtils = tokenVersion === risk_token_1.TokenVersion.V2 ? null : options.cipherUtils;
+    if (tokenVersion === risk_token_1.TokenVersion.V3 && !cipherUtils) {
+        throw new utils_1.EnforcerError('error initializing enforcer: token v3 requires cipherUtils');
+    }
     var cors = options.cors || new cors_1.DefaultCors(config);
     var telemetry = options.telemetry || new telemetry_1.DefaultTelemetry(config, httpClient, base64Utils, hmacUtils);
     var dataEnrichment = options.dataEnrichment || new pxde_1.DefaultDataEnrichment(config, base64Utils, hmacUtils);
@@ -61,6 +71,7 @@ var createEnforcerInitializationBlock = function (config, options) {
         hashUtils: hashUtils,
         urlUtils: urlUtils,
         ipRangeChecker: ipRangeChecker,
+        cipherUtils: cipherUtils,
         cors: cors,
         telemetry: telemetry,
         dataEnrichment: dataEnrichment,

package/lib/cjs/utils/constants.js

@@ -14,4 +14,4 @@ exports.PUSH_DATA_FEATURE_HEADER_NAME = 'x-px-feature';
 exports.EMAIL_ADDRESS_REGEX = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/;
 exports.URL_REGEX = /^(https?\:)\/\/(([^@\s:]+):?([^@\s]*)@)?(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/;
 exports.REGEX_STRUCTURE = /^\/(.+?)\/([gimsuyvd]*)$/;
-exports.CORE_MODULE_VERSION = 'JS Core 0.21.6';
+exports.CORE_MODULE_VERSION = 'JS Core 0.22.0';

package/lib/cjs/utils/utils.js

@@ -36,11 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.telemetryConfigReplacer = exports.convertRegexStringToRegex = exports.algoToCryptoString = exports.algoToSubtleCryptoString = exports.sleep = exports.getPropertyFromObject = exports.rejectOnTimeout = exports.transferExistingProperties = exports.isRouteMatch = exports.isRouteInPatterns = exports.removeSensitiveHeaders = exports.redactSensitiveFields = exports.getExtension = exports.getAuthorizationHeader = exports.getCollectorDomain = exports.getScoreApiDomain = exports.isEmailAddress = exports.isValidUuid = exports.isValidEnumValue = void 0;
+exports.isValidTokenVersion = exports.telemetryConfigReplacer = exports.convertRegexStringToRegex = exports.algoToCryptoString = exports.algoToSubtleCryptoString = exports.sleep = exports.getPropertyFromObject = exports.rejectOnTimeout = exports.transferExistingProperties = exports.isRouteMatch = exports.isRouteInPatterns = exports.removeSensitiveHeaders = exports.redactSensitiveFields = exports.getExtension = exports.getAuthorizationHeader = exports.getCollectorDomain = exports.getScoreApiDomain = exports.isEmailAddress = exports.isValidUuid = exports.isValidEnumValue = void 0;
 var http_1 = require("../http");
 var error_1 = require("./error");
 var constants_1 = require("./constants");
 var Algorithm_1 = require("./Algorithm");
+var risk_token_1 = require("../risk_token");
 var isValidEnumValue = function (options, selection) {
     return Object.values(options).includes(selection);
 };
@@ -237,3 +238,7 @@ var telemetryConfigReplacer = function (key, value) {
         return value;
 };
 exports.telemetryConfigReplacer = telemetryConfigReplacer;
+var isValidTokenVersion = function (tokenVersion) {
+    return tokenVersion === risk_token_1.TokenVersion.V2 || tokenVersion === risk_token_1.TokenVersion.V3;
+};
+exports.isValidTokenVersion = isValidTokenVersion;

package/lib/esm/config/ConfigurationBase.js

@@ -19,7 +19,7 @@ export class ConfigurationBase {
         Object.keys(defaultParams).forEach((k) => {
             config[k] = this.getValidConfigValue(params, defaultParams, k);
         });
-        this.internalLogger = this.createInternalLogger(config.px_logger_severity);
+        this.internalLogger = this.createInternalLogger(config);
         return config;
     }
     throwIfMissingRequiredField(params) {
@@ -66,8 +66,8 @@ export class ConfigurationBase {
                 return defaultParams[key];
         }
     }
-    createInternalLogger(loggerSeverity) {
-        return new DefaultLogger(loggerSeverity, false);
+    createInternalLogger(params) {
+        return new DefaultLogger(params.px_logger_severity, false);
     }
     addRemoteConfig(remoteConfigParams) {
         this.remoteConfigParams = remoteConfigParams;

package/lib/esm/config/defaults/DefaultConfigurationParams.js

@@ -1,6 +1,7 @@
 import { LoggerSeverity } from '../../logger';
 import { ModuleMode } from '../../utils';
 import { CredentialIntelligenceVersion, DEFAULT_COMPROMISED_CREDENTIALS_HEADER_NAME, LoginSuccessfulReportingMethod, } from '../../products';
+import { TokenVersion } from '../../risk_token';
 export const DEFAULT_CONFIGURATION_PARAMS = {
     px_app_id: '',
     px_auth_token: '',
@@ -9,6 +10,7 @@ export const DEFAULT_CONFIGURATION_PARAMS = {
     px_remote_config_auth_token: '',
     px_remote_config_enabled: true,
     px_remote_config_id: '',
+    px_token_version: TokenVersion.V3,
     px_remote_config_version: 0,
     px_filter_by_route_regex: [],
     px_monitored_routes_regex: [],

package/lib/esm/config/params/index.js

@@ -4,3 +4,5 @@ export * from './StaticConfigurationParamsOnly';
 export * from './StaticConfigurationParams';
 export * from './RemoteConfigurationParams';
 export * from './ConfigurationParams';
+export * from './TokenV3ConfigurationParamsOnly';
+export * from './BatchedActivitiesConfigParams';

package/lib/esm/enforcer/index.js

@@ -1,4 +1,4 @@
 export * from './IEnforcer';
 export * from './EnforcerBase';
-export * from './options';
+export * from './EnforcerOptions';
 export * from './utils';

package/lib/esm/enforcer/utils.js

@@ -8,9 +8,19 @@ import { PostRiskApiClientV2, PostRiskApiClientV3 } from '../risk_api';
 import { HttpActivityClient, HttpBatchedActivityClient } from '../activities';
 import { HttpLogServiceClient } from '../logger';
 import { AccountDefender, BotDefender, CredentialIntelligence, HypeSaleChallenge, ProductName, } from '../products';
+import { EnforcerError, isValidTokenVersion } from '../utils';
 export const createEnforcerInitializationBlock = (config, options) => {
-    const { tokenVersion, httpClient, base64Utils, hmacUtils, hashUtils, urlUtils, ipRangeChecker } = options;
+    const tokenVersion = config.tokenVersion;
+    if (!isValidTokenVersion(tokenVersion)) {
+        throw new EnforcerError(`error initializing enforcer: token version ${tokenVersion} is invalid (must be one of ${Object.values(TokenVersion)
+            .map((v) => `"${v}"`)
+            .join(', ')})`);
+    }
+    const { httpClient, base64Utils, hmacUtils, hashUtils, urlUtils, ipRangeChecker } = options;
     const cipherUtils = tokenVersion === TokenVersion.V2 ? null : options.cipherUtils;
+    if (tokenVersion === TokenVersion.V3 && !cipherUtils) {
+        throw new EnforcerError('error initializing enforcer: token v3 requires cipherUtils');
+    }
     const cors = options.cors || new DefaultCors(config);
     const telemetry = options.telemetry || new DefaultTelemetry(config, httpClient, base64Utils, hmacUtils);
     const dataEnrichment = options.dataEnrichment || new DefaultDataEnrichment(config, base64Utils, hmacUtils);
@@ -47,6 +57,7 @@ export const createEnforcerInitializationBlock = (config, options) => {
         hashUtils,
         urlUtils,
         ipRangeChecker,
+        cipherUtils,
         cors,
         telemetry,
         dataEnrichment,

package/lib/esm/utils/constants.js

@@ -11,4 +11,4 @@ export const PUSH_DATA_FEATURE_HEADER_NAME = 'x-px-feature';
 export const EMAIL_ADDRESS_REGEX = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/;
 export const URL_REGEX = /^(https?\:)\/\/(([^@\s:]+):?([^@\s]*)@)?(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/;
 export const REGEX_STRUCTURE = /^\/(.+?)\/([gimsuyvd]*)$/;
-export const CORE_MODULE_VERSION = 'JS Core 0.21.6';
+export const CORE_MODULE_VERSION = 'JS Core 0.22.0';

package/lib/esm/utils/utils.js

@@ -2,6 +2,7 @@ import { toMutableHeaders } from '../http';
 import { EnforcerTimeoutError } from './error';
 import { EMAIL_ADDRESS_REGEX, REGEX_STRUCTURE } from './constants';
 import { Algorithm } from './Algorithm';
+import { TokenVersion } from '../risk_token';
 export const isValidEnumValue = (options, selection) => {
     return Object.values(options).includes(selection);
 };
@@ -166,3 +167,6 @@ export const telemetryConfigReplacer = (key, value) => {
     else
         return value;
 };
+export const isValidTokenVersion = (tokenVersion) => {
+    return tokenVersion === TokenVersion.V2 || tokenVersion === TokenVersion.V3;
+};

package/lib/types/config/ConfigurationBase.d.ts

@@ -8,20 +8,22 @@ import { ModuleMode } from '../utils';
 import { CredentialEndpointConfiguration, CredentialIntelligenceVersion, CustomLoginSuccessfulCallback, LoginSuccessfulReportingMethod } from '../products';
 import { CustomRequestFunction } from './CustomRequestFunction';
 import { ExtractGraphQLKeywordsFunction } from '../graphql';
+import { TokenVersion } from '../risk_token';
 export declare abstract class ConfigurationBase<Req, Res, ParamsType extends ConfigurationParams<Req, Res> = ConfigurationParams<Req, Res>> implements IConfiguration<Req, Res, ParamsType> {
     protected activeConfigParams: ParamsType;
     protected readonly staticConfigParams: StaticConfigurationParams<Req, Res, ParamsType>;
     protected remoteConfigParams: RemoteConfigurationParams<Req, Res>;
     protected readonly defaultConfigParams: ParamsType;
     private internalLogger;
+    abstract tokenVersion: TokenVersion;
     protected abstract getModuleVersion(): string;
-    constructor(params: StaticConfigurationParams<Req, Res, ParamsType>, defaultParams?: Partial<ParamsType>);
+    protected constructor(params: StaticConfigurationParams<Req, Res, ParamsType>, defaultParams?: Partial<ParamsType>);
     protected createActiveConfiguration(params: ParamsType, defaultParams: ParamsType): ParamsType;
     protected throwIfMissingRequiredField(params: ParamsType): void;
     protected getValidConfigValue<K extends keyof ParamsType, V extends ParamsType[K]>(params: ParamsType, defaultParams: ParamsType, key: K): V;
     protected isValidConfigValue(params: ParamsType, defaultParams: ParamsType, key: keyof ParamsType): boolean;
     protected getDefaultConfigurationValue<K extends keyof ParamsType, V extends ParamsType[K]>(params: ParamsType, defaultParams: ParamsType, key: K): V;
-    protected createInternalLogger(loggerSeverity: LoggerSeverity): ILogger;
+    protected createInternalLogger(params: ParamsType): ILogger;
     addRemoteConfig(remoteConfigParams: RemoteConfigurationParams<Req, Res>): void;
     getActiveConfig(): ParamsType;
     getStaticConfig(): StaticConfigurationParams<Req, Res, ParamsType>;

package/lib/types/config/IConfiguration.d.ts

@@ -7,6 +7,7 @@ import { CustomPreflightHandler, CustomBlockResponseHeadersHandler } from '../co
 import { CredentialEndpointConfiguration, CredentialIntelligenceVersion, CustomLoginSuccessfulCallback, LoginSuccessfulReportingMethod } from '../products';
 import { CustomRequestFunction } from './CustomRequestFunction';
 import { ExtractGraphQLKeywordsFunction } from '../graphql';
+import { TokenVersion } from '../risk_token';
 export interface IConfiguration<Req, Res, ParamsType extends ConfigurationParams<Req, Res> = ConfigurationParams<Req, Res>> {
     /**
      * The application ID.
@@ -373,6 +374,10 @@ export interface IConfiguration<Req, Res, ParamsType extends ConfigurationParams
      * Whether to include the request url in captcha block page
      */
     readonly enableBlockedUrlOnCaptchaBlockPage: boolean;
+    /**
+     * The version of the token the enforcer is able to parse.
+     */
+    readonly tokenVersion: TokenVersion;
     /**
      * Returns an object representation of the current configuration.
      */

package/lib/types/config/params/BatchedActivitiesConfigParams.d.ts

@@ -0,0 +1,4 @@
+export type BatchedActivitiesConfigParamsOnly = {
+    px_max_activity_batch_size?: number;
+    px_batch_activities_timeout_ms?: number;
+};

package/lib/types/config/params/CommonConfigurationParams.d.ts

@@ -6,21 +6,18 @@ import { AdditionalActivityHandler } from '../../additional_activity_handler';
 import { CustomParametersFunction } from '../../custom_parameters';
 import { CustomBlockResponseHeadersHandler, CustomPreflightHandler } from '../../cors';
 import { CustomRequestFunction } from '../CustomRequestFunction';
-export type CommonConfigurationParams<Req, Res> = {
+import { TokenV3ConfigurationParamsOnly } from './TokenV3ConfigurationParamsOnly';
+import { BatchedActivitiesConfigParamsOnly } from './BatchedActivitiesConfigParams';
+export type CommonConfigurationParams<Req, Res> = TokenV3ConfigurationParamsOnly & BatchedActivitiesConfigParamsOnly & {
     px_s2s_timeout?: number;
     px_backend_url?: string;
-    px_blocking_score?: number;
     px_user_agent_max_length?: number;
-    px_risk_cookie_max_length?: number;
-    px_risk_cookie_min_iterations?: number;
-    px_risk_cookie_max_iterations?: number;
     px_logger_severity?: 'debug' | 'error' | 'none' | LoggerSeverity;
     px_ip_headers?: string[];
     px_module_enabled?: boolean;
     px_module_mode?: 'monitor' | 'active_blocking' | ModuleMode;
     px_advanced_blocking_response_enabled?: boolean;
-    px_max_activity_batch_size?: number;
-    px_batch_activities_timeout_ms?: number;
+    px_risk_cookie_max_length?: number;
     px_bypass_monitor_header?: string;
     px_enforced_routes?: Array<string | RegExp>;
     px_first_party_enabled?: boolean;

package/lib/types/config/params/TokenV3ConfigurationParamsOnly.d.ts

@@ -0,0 +1,7 @@
+import { TokenVersion } from '../../risk_token';
+export type TokenV3ConfigurationParamsOnly = {
+    px_token_version?: '2' | '3' | TokenVersion;
+    px_blocking_score?: number;
+    px_risk_cookie_min_iterations?: number;
+    px_risk_cookie_max_iterations?: number;
+};

package/lib/types/config/params/index.d.ts

@@ -4,3 +4,5 @@ export * from './StaticConfigurationParamsOnly';
 export * from './StaticConfigurationParams';
 export * from './RemoteConfigurationParams';
 export * from './ConfigurationParams';
+export * from './TokenV3ConfigurationParamsOnly';
+export * from './BatchedActivitiesConfigParams';

package/lib/types/enforcer/EnforcerBase.d.ts

@@ -1,13 +1,12 @@
 import { AsyncOrSync } from 'ts-essentials';
 import { IConfiguration } from '../config';
 import { IContext } from '../context';
-import { TokenVersion } from '../risk_token';
 import { IMinimalResponse, IOutgoingResponse } from '../http';
 import { IPhase } from '../phase';
 import { IActivityClient } from '../activities';
 import { IEnforcer } from './IEnforcer';
-import { EnforcerBaseOptions, EnforcerOptionsType } from './options';
-export declare abstract class EnforcerBase<TokenV extends TokenVersion, Req, Res, EnforceArgs extends any[], PostEnforceArgs extends any[]> implements IEnforcer<EnforceArgs, PostEnforceArgs, Promise<null | Res>, Promise<void>> {
+import { EnforcerOptions } from './EnforcerOptions';
+export declare abstract class EnforcerBase<Req, Res, EnforceArgs extends any[], PostEnforceArgs extends any[]> implements IEnforcer<EnforceArgs, PostEnforceArgs, Promise<null | Res>, Promise<void>> {
     protected readonly config: IConfiguration<Req, Res>;
     protected readonly filterFlow: IPhase<Req, Res>;
     protected readonly enforceFlow: IPhase<Req, Res>;
@@ -57,11 +56,11 @@ export declare abstract class EnforcerBase<TokenV extends TokenVersion, Req, Res
      * @param options - An EnforcerOptions object that allows for overriding any functional building blocks in the enforcer.
      * @protected
      */
-    protected constructor(config: IConfiguration<Req, Res>, options: EnforcerOptionsType<TokenV, Req, Res>);
-    protected createFilterFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerBaseOptions<Req, Res>>): IPhase<Req, Res>;
-    protected createPostEnforceFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerBaseOptions<Req, Res>>): IPhase<Req, Res>;
-    protected createEnforceFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerBaseOptions<Req, Res>>): IPhase<Req, Res>;
-    protected createEndEnforcerFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerBaseOptions<Req, Res>>): IPhase<Req, Res>;
+    protected constructor(config: IConfiguration<Req, Res>, options: EnforcerOptions<Req, Res>);
+    protected createFilterFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerOptions<Req, Res>>): IPhase<Req, Res>;
+    protected createPostEnforceFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerOptions<Req, Res>>): IPhase<Req, Res>;
+    protected createEnforceFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerOptions<Req, Res>>): IPhase<Req, Res>;
+    protected createEndEnforcerFlow(config: IConfiguration<Req, Res>, initializationBlock: Required<EnforcerOptions<Req, Res>>): IPhase<Req, Res>;
     /**
      * The central function that triggers enforcement on the incoming request.
      * @param args - The EnforceArgs required to enforce the incoming request.

package/lib/types/enforcer/{options/EnforcerBaseOptions.d.ts → EnforcerOptions.d.ts}

@@ -1,21 +1,22 @@
-import { IDataEnrichment } from '../../pxde';
-import { ITokenParser } from '../../risk_token';
-import { IBase64Utils, IHashUtils, IHmacUtils, IIpRangeChecker, IUrlUtils } from '../../utils';
-import { ICors } from '../../cors';
-import { IHttpClient } from '../../http';
-import { ITelemetry } from '../../telemetry';
-import { IRiskApiClient } from '../../risk_api';
-import { IActivityClient } from '../../activities';
-import { Products } from '../../products';
-import { IGraphQLParser } from '../../graphql';
-import { ILogServiceClient } from '../../logger';
-import { IRemoteConfigStorageClient, IRemoteConfigServiceClient, IRemoteConfigUpdater } from '../../config';
-export type EnforcerBaseOptions<Req, Res> = {
+import { IDataEnrichment } from '../pxde';
+import { ITokenParser } from '../risk_token';
+import { IBase64Utils, ICipherUtils, IHashUtils, IHmacUtils, IIpRangeChecker, IUrlUtils } from '../utils';
+import { ICors } from '../cors';
+import { IHttpClient } from '../http';
+import { ITelemetry } from '../telemetry';
+import { IRiskApiClient } from '../risk_api';
+import { IActivityClient } from '../activities';
+import { Products } from '../products';
+import { IGraphQLParser } from '../graphql';
+import { ILogServiceClient } from '../logger';
+import { IRemoteConfigStorageClient, IRemoteConfigServiceClient, IRemoteConfigUpdater } from '../config';
+export type EnforcerOptions<Req, Res> = {
     httpClient: IHttpClient;
     base64Utils: IBase64Utils;
     hmacUtils: IHmacUtils;
     hashUtils: IHashUtils;
     urlUtils: IUrlUtils;
+    cipherUtils?: ICipherUtils;
     ipRangeChecker: IIpRangeChecker;
     products?: Products<Req, Res>;
     dataEnrichment?: IDataEnrichment<Req, Res>;

package/lib/types/enforcer/index.d.ts

@@ -1,4 +1,4 @@
 export * from './IEnforcer';
 export * from './EnforcerBase';
-export * from './options';
+export * from './EnforcerOptions';
 export * from './utils';

package/lib/types/enforcer/utils.d.ts

@@ -1,7 +1,6 @@
-import { TokenVersion } from '../risk_token';
 import { IConfiguration } from '../config';
-import { EnforcerBaseOptions, EnforcerOptionsType } from './options';
+import { EnforcerOptions } from './EnforcerOptions';
 import { Products } from '../products';
 import { IBase64Utils, IHashUtils, IIpRangeChecker, IUrlUtils } from '../utils';
-export declare const createEnforcerInitializationBlock: <Req, Res, TokenV extends TokenVersion>(config: IConfiguration<Req, Res, import("../config").ConfigurationParams<Req, Res>>, options: EnforcerOptionsType<TokenV, Req, Res>) => Required<EnforcerBaseOptions<Req, Res>>;
+export declare const createEnforcerInitializationBlock: <Req, Res>(config: IConfiguration<Req, Res, import("../config").ConfigurationParams<Req, Res>>, options: EnforcerOptions<Req, Res>) => Required<EnforcerOptions<Req, Res>>;
 export declare const createEnforcerProducts: <Req, Res>(config: IConfiguration<Req, Res, import("../config").ConfigurationParams<Req, Res>>, products: Products<Req, Res>, base64Utils: IBase64Utils, hashUtils: IHashUtils, urlUtils: IUrlUtils, ipRangeChecker: IIpRangeChecker) => Required<Products<Req, Res>>;

package/lib/types/phase/flow/EndEnforcerFlow.d.ts

@@ -1,6 +1,6 @@
 import { IConfiguration } from '../../config';
 import { CompositePhase } from '../impl';
-import { EnforcerBaseOptions } from '../../enforcer';
+import { EnforcerOptions } from '../../enforcer';
 export declare class EndEnforcerFlow<Req, Res> extends CompositePhase<Req, Res> {
-    constructor(config: IConfiguration<Req, Res>, { logServiceClient }: Pick<Required<EnforcerBaseOptions<Req, Res>>, 'logServiceClient'>);
+    constructor(config: IConfiguration<Req, Res>, { logServiceClient }: Pick<Required<EnforcerOptions<Req, Res>>, 'logServiceClient'>);
 }

package/lib/types/phase/flow/EnforceFlow.d.ts

@@ -1,8 +1,8 @@
 import { IConfiguration } from '../../config';
-import { EnforcerBaseOptions } from '../../enforcer';
+import { EnforcerOptions } from '../../enforcer';
 import { CompositePhase } from '../impl';
 type RequiredEnforceFlowOptions = 'dataEnrichment' | 'tokenParser' | 'riskApiClient' | 'activityClient' | 'cors' | 'products' | 'graphQLParser';
 export declare class EnforceFlow<Req, Res> extends CompositePhase<Req, Res> {
-    constructor(config: IConfiguration<Req, Res>, { dataEnrichment, tokenParser, riskApiClient, activityClient, cors, products, graphQLParser, }: Pick<Required<EnforcerBaseOptions<Req, Res>>, RequiredEnforceFlowOptions>);
+    constructor(config: IConfiguration<Req, Res>, { dataEnrichment, tokenParser, riskApiClient, activityClient, cors, products, graphQLParser, }: Pick<Required<EnforcerOptions<Req, Res>>, RequiredEnforceFlowOptions>);
 }
 export {};

package/lib/types/phase/flow/FilterFlow.d.ts

@@ -1,6 +1,6 @@
 import { IConfiguration } from '../../config';
-import { EnforcerBaseOptions } from '../../enforcer';
+import { EnforcerOptions } from '../../enforcer';
 import { CompositePhase } from '../impl';
 export declare class FilterFlow<Req, Res> extends CompositePhase<Req, Res> {
-    constructor(config: IConfiguration<Req, Res>, { httpClient, products, cors, telemetry, remoteConfigUpdater }: Required<EnforcerBaseOptions<Req, Res>>);
+    constructor(config: IConfiguration<Req, Res>, { httpClient, products, cors, telemetry, remoteConfigUpdater }: Required<EnforcerOptions<Req, Res>>);
 }

package/lib/types/phase/flow/PostEnforceFlow.d.ts

@@ -1,6 +1,6 @@
 import { IConfiguration } from '../../config';
-import { EnforcerBaseOptions } from '../../enforcer';
+import { EnforcerOptions } from '../../enforcer';
 import { CompositePhase } from '../impl';
 export declare class PostEnforceFlow<Req, Res> extends CompositePhase<Req, Res> {
-    constructor(config: IConfiguration<Req, Res>, { products, activityClient }: Pick<Required<EnforcerBaseOptions<Req, Res>>, 'products' | 'activityClient'>);
+    constructor(config: IConfiguration<Req, Res>, { products, activityClient }: Pick<Required<EnforcerOptions<Req, Res>>, 'products' | 'activityClient'>);
 }

package/lib/types/utils/constants.d.ts

@@ -11,4 +11,4 @@ export declare const PUSH_DATA_FEATURE_HEADER_NAME = "x-px-feature";
 export declare const EMAIL_ADDRESS_REGEX: RegExp;
 export declare const URL_REGEX: RegExp;
 export declare const REGEX_STRUCTURE: RegExp;
-export declare const CORE_MODULE_VERSION = "JS Core 0.21.6";
+export declare const CORE_MODULE_VERSION = "JS Core 0.22.0";

package/lib/types/utils/utils.d.ts

@@ -23,3 +23,4 @@ export declare const algoToSubtleCryptoString: (algo: Algorithm) => string;
 export declare const algoToCryptoString: (algo: Algorithm) => string;
 export declare const convertRegexStringToRegex: (regexString: string, logger?: ILogger) => RegExp;
 export declare const telemetryConfigReplacer: (key: string, value: any) => string;
+export declare const isValidTokenVersion: (tokenVersion: any) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perimeterx-js-core",
-  "version": "0.21.6",
+  "version": "0.22.0",
   "description": "",
   "type": "module",
   "typesVersions": {

package/lib/cjs/enforcer/options/EnforcerV3Options.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/enforcer/options/index.js

@@ -1,20 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./EnforcerBaseOptions"), exports);
-__exportStar(require("./EnforcerV2Options"), exports);
-__exportStar(require("./EnforcerV3Options"), exports);
-__exportStar(require("./EnforcerOptionsType"), exports);

package/lib/esm/enforcer/options/EnforcerV3Options.js

@@ -1 +0,0 @@
-export {};

package/lib/esm/enforcer/options/index.js

@@ -1,4 +0,0 @@
-export * from './EnforcerBaseOptions';
-export * from './EnforcerV2Options';
-export * from './EnforcerV3Options';
-export * from './EnforcerOptionsType';

package/lib/types/enforcer/options/EnforcerOptionsType.d.ts

@@ -1,4 +0,0 @@
-import { TokenVersion } from '../../risk_token';
-import { EnforcerV2Options } from './EnforcerV2Options';
-import { EnforcerV3Options } from './EnforcerV3Options';
-export type EnforcerOptionsType<TokenV extends TokenVersion, Req, Res> = TokenV extends TokenVersion.V2 ? EnforcerV2Options<Req, Res> : TokenV extends TokenVersion.V3 ? EnforcerV3Options<Req, Res> : never;

package/lib/types/enforcer/options/EnforcerV2Options.d.ts

@@ -1,5 +0,0 @@
-import { TokenVersion } from '../../risk_token';
-import { EnforcerBaseOptions } from './EnforcerBaseOptions';
-export type EnforcerV2Options<Req, Res> = {
-    tokenVersion: TokenVersion.V2;
-} & EnforcerBaseOptions<Req, Res>;

package/lib/types/enforcer/options/EnforcerV3Options.d.ts

@@ -1,7 +0,0 @@
-import { TokenVersion } from '../../risk_token';
-import { ICipherUtils } from '../../utils';
-import { EnforcerBaseOptions } from './EnforcerBaseOptions';
-export type EnforcerV3Options<Req, Res> = {
-    tokenVersion: TokenVersion.V3;
-    cipherUtils: ICipherUtils;
-} & EnforcerBaseOptions<Req, Res>;

package/lib/types/enforcer/options/index.d.ts

@@ -1,4 +0,0 @@
-export * from './EnforcerBaseOptions';
-export * from './EnforcerV2Options';
-export * from './EnforcerV3Options';
-export * from './EnforcerOptionsType';