@cryptexlabs/codex-nodejs-common 0.11.3 → 0.12.1

package/lib/src/dto/user.dto.js

@@ -0,0 +1,26 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserDto = void 0;
+const class_validator_1 = require("class-validator");
+const decorator_1 = require("../decorator");
+class UserDto {
+}
+exports.UserDto = UserDto;
+__decorate([
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], UserDto.prototype, "username", void 0);
+__decorate([
+    (0, decorator_1.IsValidUtcTimezone)(),
+    __metadata("design:type", String)
+], UserDto.prototype, "timezone", void 0);
+//# sourceMappingURL=user.dto.js.map

package/lib/src/dto/user.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../src/dto/user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qDAA2C;AAE3C,4CAAkD;AAElD,MAAa,OAAO;CAQnB;AARD,0BAQC;AANC;IADC,IAAA,0BAAQ,GAAE;;yCACM;AAKjB;IADC,IAAA,8BAAkB,GAAE;;yCACC"}

package/lib/src/index.d.ts

@@ -3,6 +3,7 @@ export * from "./client";
 export * from "./config";
 export * from "./context";
 export * from "./decorator";
+export * from "./dto";
 export * from "./event";
 export * from "./filter";
 export * from "./logger";

package/lib/src/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./client"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./context"), exports);
 __exportStar(require("./decorator"), exports);
+__exportStar(require("./dto"), exports);
 __exportStar(require("./event"), exports);
 __exportStar(require("./filter"), exports);
 __exportStar(require("./logger"), exports);

package/lib/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,8CAA4B;AAC5B,4CAA0B;AAC1B,4CAA0B;AAC1B,yCAAuB;AACvB,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,8CAA4B;AAC5B,wCAAsB;AACtB,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,8CAA4B;AAC5B,4CAA0B;AAC1B,4CAA0B;AAC1B,yCAAuB;AACvB,+CAA6B"}

package/lib/src/locales/{eng-US.json → en-US.json}

@@ -1,9 +1,9 @@
 {
+    "an-error-occurred": "An error occurred",
+    "language-not-supported": "Language not supported",
     "unknown-error": "Unknown Error",
     "i-am-healthy": "I'm healthy",
     "invalid-request": "Invalid request",
     "success": "Success",
-    "pong": "Pong",
-    "an-error-occurred": "An error occurred",
-    "language-not-supported": "Your language is not supported"
+    "pong": "Pong"
 }

package/lib/src/locales/index.d.ts

@@ -1,2 +1,2 @@
-import * as eng_US from "./eng-US.json";
-export { eng_US };
+import * as en_US from "./en-US.json";
+export { en_US };

package/lib/src/locales/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eng_US = void 0;
-const eng_US = require("./eng-US.json");
-exports.eng_US = eng_US;
+exports.en_US = void 0;
+const en_US = require("./en-US.json");
+exports.en_US = en_US;
 //# sourceMappingURL=index.js.map

package/lib/src/locales/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/locales/index.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAE/B,wBAAM"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/locales/index.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AAE7B,sBAAK"}

package/lib/src/locales/locales.d.ts

@@ -1,2 +1,4 @@
+import { I18n } from "i18n";
 declare const i18nData: i18nAPI;
-export { i18nData };
+declare const i18nInstance: I18n;
+export { i18nData, i18nInstance as i18n };

package/lib/src/locales/locales.js

@@ -1,14 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.i18nData = void 0;
-const { I18n } = require("i18n");
+exports.i18n = exports.i18nData = void 0;
+const i18n_1 = require("i18n");
 const packageJSON = require("../../package.json");
+const index_1 = require("./index");
 const i18nData = {};
 exports.i18nData = i18nData;
-const i18nInstance = new I18n();
+const i18nInstance = new i18n_1.I18n();
+exports.i18n = i18nInstance;
 i18nInstance.configure({
     locales: packageJSON.i18n.languages,
-    directory: __dirname,
+    defaultLocale: "en-US",
     register: i18nData,
+    updateFiles: false,
+    objectNotation: true,
+    autoReload: false,
+    syncFiles: false,
+    extension: ".json",
+    staticCatalog: {
+        "en-US": index_1.en_US,
+    },
 });
 //# sourceMappingURL=locales.js.map

package/lib/src/locales/locales.js.map

@@ -1 +1 @@
-{"version":3,"file":"locales.js","sourceRoot":"","sources":["../../../src/locales/locales.ts"],"names":[],"mappings":";;;AAEA,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,kDAAkD;AAElD,MAAM,QAAQ,GAAG,EAAa,CAAC;AAUtB,4BAAQ;AARjB,MAAM,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;AAEhC,YAAY,CAAC,SAAS,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,SAAS;IACnC,SAAS,EAAE,SAAS;IACpB,QAAQ,EAAE,QAAQ;CACnB,CAAC,CAAC"}
+{"version":3,"file":"locales.js","sourceRoot":"","sources":["../../../src/locales/locales.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,kDAAkD;AAClD,mCAAgC;AAEhC,MAAM,QAAQ,GAAG,EAAa,CAAC;AAkBtB,4BAAQ;AAhBjB,MAAM,YAAY,GAAG,IAAI,WAAI,EAAE,CAAC;AAgBG,4BAAI;AAdvC,YAAY,CAAC,SAAS,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,SAAS;IACnC,aAAa,EAAE,OAAO;IACtB,QAAQ,EAAE,QAAQ;IAClB,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,IAAI;IACpB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,OAAO;IAClB,aAAa,EAAE;QACb,OAAO,EAAE,aAAK;KACf;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cryptexlabs/codex-nodejs-common",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "description": "Common code for Codex framework",
   "main": "lib/src/index.js",
   "type": "commonjs",
@@ -110,7 +110,7 @@
   },
   "i18n": {
     "languages": [
-      "eng-US"
+      "en-US"
     ]
   }
 }

package/src/auth/authf.guard.ts

@@ -119,6 +119,7 @@ export class AuthfGuard implements CanActivate {
   private async _updateBlacklist(context: Context) {
     const headers = this._getApiHeaders(context);
 
+    context.logger.verbose(`Fetching blacklist`);
     const subjectBlacklistResponse = await axios.get(
       `/api/v1/blacklisted-subjects`,
       {
@@ -126,15 +127,26 @@ export class AuthfGuard implements CanActivate {
         headers,
       }
     );
+    context.logger.verbose(`Blacklist response`, subjectBlacklistResponse.data);
 
     if (
       subjectBlacklistResponse.data?.data !== undefined &&
       Array.isArray(subjectBlacklistResponse.data?.data)
     ) {
-      this._blacklistedSubjects = subjectBlacklistResponse.data?.data;
-      if (this._blacklistedSubjects.length > 0) {
-        context.logger.verbose(`Got blacklist`, this._blacklistedSubjects);
+      if (
+        this._blacklistedSubjects.length !== subjectBlacklistResponse.data?.data
+      ) {
+        context.logger.debug(`Got change in blacklist`, {
+          old: this._blacklistedSubjects,
+          new: subjectBlacklistResponse.data?.data,
+        });
+      } else if (this._blacklistedSubjects.length > 0) {
+        context.logger.verbose(
+          `Got blacklist`,
+          subjectBlacklistResponse.data?.data
+        );
       }
+      this._blacklistedSubjects = subjectBlacklistResponse.data?.data;
     }
   }
 }

package/src/context/context.builder.ts

@@ -26,7 +26,7 @@ export class ContextBuilder {
     private readonly config: DefaultConfig,
     public client: ClientInterface,
     private readonly messageContext: MessageContextInterface,
-    private i18nDir?: string
+    private i18nData?: i18nAPI
   ) {}
 
   public build() {
@@ -43,12 +43,12 @@ export class ContextBuilder {
         category: this.messageContext.category,
         id: this.messageContext.id,
       },
-      this.i18nDir
+      this.i18nData
     );
   }
 
-  public setI18nDir(i18nDir: string) {
-    this.i18nDir = i18nDir;
+  public setI18nData(i18nData: i18nAPI) {
+    this.i18nData = i18nData;
     return this;
   }
 
@@ -136,7 +136,7 @@ export class ContextBuilder {
     const local = this._getLocale();
     i18nInstance.configure({
       locales: [local.i18n],
-      directory: this.i18nDir,
+      staticCatalog: this.i18nData.getCatalog(),
       defaultLocale: local.i18n,
     });
 

package/src/decorator/index.ts

@@ -1,3 +1,6 @@
 export * from "./api-meta-headers";
 export * from "./api-pagination";
 export * from "./api-query-options";
+export * from "./is-valid-email-type";
+export * from "./is-valid-phone-type";
+export * from "./is-valid-utc-timezone";

package/src/decorator/is-valid-email-type.ts

@@ -0,0 +1,34 @@
+import {
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+  ValidationArguments,
+  registerDecorator,
+  ValidationOptions,
+} from "class-validator";
+import { EmailTypeEnum } from "@cryptexlabs/authf-data-model";
+
+@ValidatorConstraint({ name: "IsValidEmailType", async: false })
+export class IsValidEmailTypeConstraint
+  implements ValidatorConstraintInterface {
+  private readonly EMAIL_TYPES: string[] = Object.values(EmailTypeEnum);
+
+  validate(timezone: any, args: ValidationArguments): boolean {
+    return this.EMAIL_TYPES.includes(timezone);
+  }
+
+  defaultMessage(args: ValidationArguments): string {
+    return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+  }
+}
+
+export function IsValidEmailType(validationOptions?: ValidationOptions) {
+  return (object: any, propertyName: string) => {
+    registerDecorator({
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      constraints: [],
+      validator: IsValidEmailTypeConstraint,
+    });
+  };
+}

package/src/decorator/is-valid-phone-type.ts

@@ -0,0 +1,34 @@
+import {
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+  ValidationArguments,
+  registerDecorator,
+  ValidationOptions,
+} from "class-validator";
+import { EmailTypeEnum, PhoneTypeEnum } from "@cryptexlabs/authf-data-model";
+
+@ValidatorConstraint({ name: "IsValidPhoneType", async: false })
+export class IsValidPhoneTypeConstraint
+  implements ValidatorConstraintInterface {
+  private readonly PHONE_TYPES: string[] = Object.values(PhoneTypeEnum);
+
+  validate(timezone: any, args: ValidationArguments): boolean {
+    return this.PHONE_TYPES.includes(timezone);
+  }
+
+  defaultMessage(args: ValidationArguments): string {
+    return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+  }
+}
+
+export function IsValidPhoneType(validationOptions?: ValidationOptions) {
+  return (object: any, propertyName: string) => {
+    registerDecorator({
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      constraints: [],
+      validator: IsValidPhoneTypeConstraint,
+    });
+  };
+}

package/src/decorator/is-valid-utc-timezone.ts

@@ -0,0 +1,76 @@
+import {
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+  ValidationArguments,
+  registerDecorator,
+  ValidationOptions,
+} from "class-validator";
+
+// Step 1: Define the custom validator
+@ValidatorConstraint({ name: "IsValidUtcTimezone", async: false })
+export class IsValidUtcTimezoneConstraint
+  implements ValidatorConstraintInterface {
+  private readonly TIMEZONES: string[] = [
+    "-12:00",
+    "-11:00",
+    "-10:30",
+    "-10:00",
+    "-09:30",
+    "-09:00",
+    "-08:00",
+    "-07:00",
+    "-06:00",
+    "-05:00",
+    "-04:00",
+    "-04:30",
+    "-03:30",
+    "-03:00",
+    "-02:00",
+    "-01:00",
+    "-00:00",
+    "+00:00",
+    "+01:00",
+    "+02:00",
+    "+03:00",
+    "+03:30",
+    "+04:00",
+    "+04:30",
+    "+05:00",
+    "+05:30",
+    "+05:45",
+    "+06:00",
+    "+06:30",
+    "+07:00",
+    "+08:00",
+    "+08:45",
+    "+09:00",
+    "+09:30",
+    "+10:00",
+    "+10:30",
+    "+11:00",
+    "+12:00",
+    "+12:45",
+    "+13:00",
+    "+14:00",
+  ];
+
+  validate(timezone: any, args: ValidationArguments): boolean {
+    return this.TIMEZONES.includes(timezone);
+  }
+
+  defaultMessage(args: ValidationArguments): string {
+    return `"${args.value}" is not a valid UTC timezone. Choose one of the allowed timezones.`;
+  }
+}
+
+export function IsValidUtcTimezone(validationOptions?: ValidationOptions) {
+  return (object: any, propertyName: string) => {
+    registerDecorator({
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      constraints: [],
+      validator: IsValidUtcTimezoneConstraint,
+    });
+  };
+}

package/src/dto/email.dto.ts

@@ -0,0 +1,13 @@
+import { EmailInterface, EmailTypeEnum } from "@cryptexlabs/authf-data-model";
+import { IsEmail, IsOptional } from "class-validator";
+import { IsValidEmailType } from "../decorator";
+
+export class EmailDto implements EmailInterface {
+  @IsOptional()
+  @IsEmail()
+  value: string | null;
+
+  @IsOptional()
+  @IsValidEmailType()
+  type: EmailTypeEnum;
+}

package/src/dto/index.ts

@@ -0,0 +1,6 @@
+export * from "./email.dto";
+export * from "./name.dto";
+export * from "./phone.dto";
+export * from "./photo.dto";
+export * from "./profile.dto";
+export * from "./user.dto";

package/src/dto/name.dto.ts

@@ -0,0 +1,20 @@
+import { NameInterface } from "@cryptexlabs/authf-data-model";
+import { IsOptional, IsString } from "class-validator";
+
+export class NameDto implements NameInterface {
+  @IsOptional()
+  @IsString()
+  first: string;
+
+  @IsOptional()
+  @IsString()
+  middle: string;
+
+  @IsOptional()
+  @IsString()
+  last: string;
+
+  @IsOptional()
+  @IsString()
+  display: string;
+}

package/src/dto/phone.dto.ts

@@ -0,0 +1,13 @@
+import { PhoneInterface, PhoneTypeEnum } from "@cryptexlabs/authf-data-model";
+import { IsOptional, IsString } from "class-validator";
+import { IsValidPhoneType } from "../decorator";
+
+export class PhoneDto implements PhoneInterface {
+  @IsOptional()
+  @IsString()
+  value: string;
+
+  @IsOptional()
+  @IsValidPhoneType()
+  type: PhoneTypeEnum;
+}

package/src/dto/photo.dto.ts

@@ -0,0 +1,8 @@
+import { PhotoInterface } from "@cryptexlabs/authf-data-model";
+import { IsOptional, IsUrl } from "class-validator";
+
+export class PhotoDto implements PhotoInterface {
+  @IsOptional()
+  @IsUrl()
+  url: string;
+}

package/src/dto/profile.dto.ts

@@ -0,0 +1,30 @@
+import {
+  EmailInterface,
+  NameInterface,
+  PhoneInterface,
+  PhotoInterface,
+  ProfileInterface,
+} from "@cryptexlabs/authf-data-model";
+import { EmailDto } from "./email.dto";
+import { PhoneDto } from "./phone.dto";
+import { PhotoDto } from "./photo.dto";
+import { NameDto } from "./name.dto";
+
+export class ProfileDto implements ProfileInterface {
+  email: {
+    primary: EmailDto | null;
+    other: EmailDto[];
+  };
+
+  phone: {
+    primary: PhoneDto | null;
+    other: PhoneDto[];
+  };
+
+  photo: {
+    primary: PhotoDto | null;
+    other: PhotoDto[];
+  };
+
+  name: NameDto;
+}

package/src/dto/user.dto.ts

@@ -0,0 +1,14 @@
+import { UserInterface, UtcTimezone } from "@cryptexlabs/authf-data-model";
+import { IsString } from "class-validator";
+import { ProfileDto } from "./profile.dto";
+import { IsValidUtcTimezone } from "../decorator";
+
+export class UserDto implements UserInterface {
+  @IsString()
+  username: string;
+
+  profile: ProfileDto;
+
+  @IsValidUtcTimezone()
+  timezone: UtcTimezone;
+}

package/src/index.ts

@@ -3,6 +3,7 @@ export * from "./client";
 export * from "./config";
 export * from "./context";
 export * from "./decorator";
+export * from "./dto";
 export * from "./event";
 export * from "./filter";
 export * from "./logger";

package/src/locales/en-US.json

@@ -1,4 +1,9 @@
 {
-	"an-error-occurred": "an-error-occurred",
-	"language-not-supported": "language-not-supported"
+	"an-error-occurred": "An error occurred",
+	"language-not-supported": "Language not supported",
+	"unknown-error": "Unknown Error",
+	"i-am-healthy": "I'm healthy",
+	"invalid-request": "Invalid request",
+	"success": "Success",
+	"pong": "Pong"
 }

package/src/locales/index.ts

@@ -1,3 +1,3 @@
-import * as eng_US from "./eng-US.json";
+import * as en_US from "./en-US.json";
 
-export { eng_US };
+export { en_US };

package/src/locales/locales.ts

@@ -1,7 +1,6 @@
-// TODO remove https://github.com/DefinitelyTyped/DefinitelyTyped/issues/46871
-// tslint:disable-next-line:no-var-requires
-const { I18n } = require("i18n");
+import { I18n } from "i18n";
 import * as packageJSON from "../../package.json";
+import { en_US } from "./index";
 
 const i18nData = {} as i18nAPI;
 
@@ -9,8 +8,16 @@ const i18nInstance = new I18n();
 
 i18nInstance.configure({
   locales: packageJSON.i18n.languages,
-  directory: __dirname,
+  defaultLocale: "en-US",
   register: i18nData,
+  updateFiles: false,
+  objectNotation: true,
+  autoReload: false,
+  syncFiles: false,
+  extension: ".json",
+  staticCatalog: {
+    "en-US": en_US,
+  },
 });
 
-export { i18nData };
+export { i18nData, i18nInstance as i18n };

package/src/locales/eng-US.json

@@ -1,9 +0,0 @@
-{
-    "unknown-error": "Unknown Error",
-    "i-am-healthy": "I'm healthy",
-    "invalid-request": "Invalid request",
-    "success": "Success",
-    "pong": "Pong",
-    "an-error-occurred": "An error occurred",
-    "language-not-supported": "Your language is not supported"
-}