vr-models 1.0.28 → 1.0.30

package/dist/models/eventLog.models.d.ts

@@ -1,6 +1,13 @@
 import { Model, InferAttributes, InferCreationAttributes, CreationOptional, NonAttribute, ModelStatic } from "vr-migrations";
 import type { User } from "./user.models";
 import { UserRole } from "./securityClearance.models";
+export interface SessionPayload {
+    sessionId: string;
+    startedAt: number;
+    expiresAt: number;
+    userId: string;
+    tokenVersion: number;
+}
 export declare const EVENT_ACTIONS: readonly ["USER_READ", "USER_CREATED", "USER_UPDATED", "USER_DELETED", "USER_SUSPENDED", "USER_BANNED", "USERS_LISTED", "ADMIN_FORGOT_PASSWORD", "ADMIN_LOGGED_IN", "ADMIN_LOGGED_OUT", "PASSENGER_ACCOUNT_DEACTIVATED", "PASSENGER_ACCOUNT_DELETED", "AGENT_CREATED_RIDER", "AGENT_UPDATED_RIDER", "ADMIN_CREATED_USER", "ADMIN_UPDATED_USER", "SUPER_ADMIN_PASSWORD_CHANGED", "SUPER_ADMIN_CHANGED_USER_ACCOUNT_STATUS", "SUPER_ADMIN_UPDATED_USER", "SUPER_ADMIN_CREATED_USER", "PRODUCT_CREATED", "PRODUCT_READ", "PRODUCT_UPDATED", "PRODUCT_DELETED", "PRODUCTS_LISTED", "PRODUCTS_ACTIVATED", "PRODUCTS_DEACTIVATED", "PRODUCTS_LISTED", "PRODUCT_STOCK_SET_MANUALLY", "PRODUCT_STOCK_INCREMENTED", "PRODUCT_STOCK_DECREMENTED", "PRICING_CREATED", "PRICING_READ", "PRICING_UPDATED", "PRICING_DELETED", "DEVICE_CREATED", "DEVICES_BULK_CREATED", "DEVICE_ASSIGNED", "DEVICE_READ", "DEVICE_UPDATED", "DEVICES_LISTED", "DEVICE_LOCKED", "DEVICE_UNLOCKED", "DEVICE_DISABLED", "DEVICE_REACTIVATED", "DEVICE_DELETED_PERMANENTLY", "DEVICE_REPOSSESSED", "DEVICE_PAYMENT_PLAN_CREATED", "DEVICE_PAYMENT_PLAN_READ", "DEVICE_PAYMENT_PLAN_UPDATED", "DEVICE_PAYMENT_PLAN_MARKED_DEFAULTED", "DEVICE_PAYMENT_PLAN_SOFT_DELETED", "DEVICE_PAYMENT_PLAN_DELETED_PERMANENTLY", "PAYMENT_RECORDED", "PAYMENT_READ", "PAYMENTS_LISTED", "TRANSACTION_READ", "TRANSACTIONS_LISTED", "EVENT_LOG_READ", "EVENT_LOGS_LISTED", "SECURITY_CLEARANCE_MANAGED", "DEVICE_LOCK_OVERRIDDEN"];
 export type EventAction = (typeof EVENT_ACTIONS)[number];
 export interface EventLogAttributes {
@@ -13,6 +20,7 @@ export interface EventLogAttributes {
     metadata: Record<string, any>;
     ipAddress: string | null;
     userAgent: string | null;
+    session: SessionPayload;
     createdAt: Date;
     actor?: User;
 }
@@ -31,6 +39,7 @@ export declare class EventLog extends Model<InferAttributes<EventLog>, InferCrea
     metadata: CreationOptional<Record<string, any>>;
     ipAddress: CreationOptional<string | null>;
     userAgent: CreationOptional<string | null>;
+    session: SessionPayload;
     readonly createdAt: CreationOptional<Date>;
     actor?: NonAttribute<User>;
     static initialize(sequelize: any): void;

package/dist/models/eventLog.models.js

@@ -110,6 +110,26 @@ class EventLog extends vr_migrations_1.Model {
                 type: vr_migrations_1.DataTypes.TEXT,
                 allowNull: true,
             },
+            session: {
+                type: vr_migrations_1.DataTypes.JSONB,
+                allowNull: true,
+                validate: {
+                    isValidSessionObject(value) {
+                        if (value === null || value === undefined)
+                            return;
+                        if (typeof value !== "object" || Array.isArray(value)) {
+                            throw new Error("Sessions must be a session object");
+                        }
+                        if (typeof value.sessionId !== "string" ||
+                            typeof value.startedAt !== "number" ||
+                            typeof value.expiresAt !== "number" ||
+                            typeof value.userId !== "string" ||
+                            typeof value.tokenVersion !== "number") {
+                            throw new Error("Invalid session object: must have a string sessionId and userId plus numeric startetAt ,expiresAt and tokenVersion");
+                        }
+                    },
+                },
+            },
             createdAt: {
                 type: vr_migrations_1.DataTypes.DATE,
                 defaultValue: vr_migrations_1.DataTypes.NOW,

package/dist/models/suspension.models.d.ts

@@ -18,6 +18,7 @@ export interface SuspensionAttributes {
     updatedAt?: Date;
     admin: NonAttribute<User>;
     user: NonAttribute<User>;
+    revokingAdmin?: User;
 }
 export declare class Suspension extends Model<InferAttributes<Suspension>, InferCreationAttributes<Suspension>> implements SuspensionAttributes {
     id: CreationOptional<string>;
@@ -37,6 +38,7 @@ export declare class Suspension extends Model<InferAttributes<Suspension>, Infer
     updatedAt: CreationOptional<Date | undefined>;
     admin: NonAttribute<User>;
     user: NonAttribute<User>;
+    revokingAdmin?: NonAttribute<User>;
     static initialize(sequelize: any): void;
     static associate(models: Record<string, ModelStatic<Model>>): void;
 }

package/dist/models/suspension.models.js

@@ -94,6 +94,12 @@ class Suspension extends vr_migrations_1.Model {
             onDelete: "CASCADE",
             onUpdate: "CASCADE",
         });
+        this.belongsTo(models.User, {
+            foreignKey: "revokedBy",
+            as: "revokingAdmin",
+            onDelete: "CASCADE",
+            onUpdate: "CASCADE",
+        });
     }
 }
 exports.Suspension = Suspension;

package/dist/models/user.models.d.ts

@@ -23,6 +23,8 @@ export interface UserAttributes {
     nationalId: string;
     isActive: boolean;
     forgotPassword: boolean;
+    verified: boolean;
+    verifiedAt: Date | null;
     otp: string | null;
     otpExpiresAt: Date | null;
     isDeactivated: boolean;
@@ -63,6 +65,8 @@ export declare class User extends Model<InferAttributes<User>, InferCreationAttr
     suspendedAt: CreationOptional<Date | null>;
     suspensionReason: CreationOptional<string | null>;
     forgotPassword: CreationOptional<boolean>;
+    verified: CreationOptional<boolean>;
+    verifiedAt: CreationOptional<Date | null>;
     otp: CreationOptional<string | null>;
     otpExpiresAt: CreationOptional<Date | null>;
     isDeactivated: CreationOptional<boolean>;

package/dist/models/user.models.js

@@ -89,6 +89,15 @@ class User extends vr_migrations_1.Model {
                 type: vr_migrations_1.DataTypes.BOOLEAN,
                 defaultValue: false,
             },
+            verified: {
+                type: vr_migrations_1.DataTypes.BOOLEAN,
+                allowNull: false,
+                defaultValue: false,
+            },
+            verifiedAt: {
+                type: vr_migrations_1.DataTypes.DATE,
+                allowNull: true,
+            },
             otp: {
                 type: vr_migrations_1.DataTypes.STRING(50),
                 allowNull: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-models",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "Shared database models package for VR applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",