@scryan7371/sdr-security 0.1.10 → 0.1.11

package/dist/nest/entities/password-reset-token.entity.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PasswordResetTokenEntity = void 0;
 const typeorm_1 = require("typeorm");
-const uuid_1 = require("uuid");
+const uuid_v7_1 = require("../uuid-v7");
 let PasswordResetTokenEntity = class PasswordResetTokenEntity {
     id;
     userId;
@@ -21,7 +21,7 @@ let PasswordResetTokenEntity = class PasswordResetTokenEntity {
     createdAt;
     ensureId() {
         if (!this.id) {
-            this.id = (0, uuid_1.v7)();
+            this.id = (0, uuid_v7_1.uuidv7)();
         }
     }
 };

package/dist/nest/entities/security-role.entity.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityRoleEntity = void 0;
-const uuid_1 = require("uuid");
+const uuid_v7_1 = require("../uuid-v7");
 const typeorm_1 = require("typeorm");
 let SecurityRoleEntity = class SecurityRoleEntity {
     id;
@@ -19,7 +19,7 @@ let SecurityRoleEntity = class SecurityRoleEntity {
     isSystem;
     ensureId() {
         if (!this.id) {
-            this.id = (0, uuid_1.v7)();
+            this.id = (0, uuid_v7_1.uuidv7)();
         }
     }
 };

package/dist/nest/entities/security-user-role.entity.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityUserRoleEntity = void 0;
-const uuid_1 = require("uuid");
+const uuid_v7_1 = require("../uuid-v7");
 const typeorm_1 = require("typeorm");
 let SecurityUserRoleEntity = class SecurityUserRoleEntity {
     id;
@@ -18,7 +18,7 @@ let SecurityUserRoleEntity = class SecurityUserRoleEntity {
     roleId;
     ensureId() {
         if (!this.id) {
-            this.id = (0, uuid_1.v7)();
+            this.id = (0, uuid_v7_1.uuidv7)();
         }
     }
 };

package/dist/nest/security-auth.service.js

@@ -17,7 +17,7 @@ const common_1 = require("@nestjs/common");
 const crypto_1 = require("crypto");
 const bcryptjs_1 = require("bcryptjs");
 const jsonwebtoken_1 = require("jsonwebtoken");
-const uuid_1 = require("uuid");
+const uuid_v7_1 = require("./uuid-v7");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const roles_1 = require("../api/roles");
@@ -59,7 +59,7 @@ let SecurityAuthService = class SecurityAuthService {
             throw new common_1.BadRequestException("Email already in use");
         }
         const appUser = await this.appUsersRepo.save(this.appUsersRepo.create({
-            id: (0, uuid_1.v7)(),
+            id: (0, uuid_v7_1.uuidv7)(),
             email,
         }));
         const securityUser = await this.securityUsersRepo.save(this.securityUsersRepo.create({
@@ -163,7 +163,7 @@ let SecurityAuthService = class SecurityAuthService {
         const expiresAt = new Date(Date.now() +
             (this.options.passwordResetTokenExpiresInMinutes ?? 30) * 60_000);
         await this.passwordResetRepo.save(this.passwordResetRepo.create({
-            id: (0, uuid_1.v7)(),
+            id: (0, uuid_v7_1.uuidv7)(),
             userId: appUser.id,
             token,
             expiresAt,
@@ -223,7 +223,7 @@ let SecurityAuthService = class SecurityAuthService {
         const refreshTokenExpiresAt = new Date(Date.now() +
             (this.options.refreshTokenExpiresInDays ?? 30) * 24 * 60 * 60 * 1000);
         await this.refreshTokenRepo.save(this.refreshTokenRepo.create({
-            id: (0, uuid_1.v7)(),
+            id: (0, uuid_v7_1.uuidv7)(),
             userId: appUser.id,
             tokenHash: refreshTokenHash,
             expiresAt: refreshTokenExpiresAt,

package/dist/nest/security-workflows.service.js

@@ -16,7 +16,7 @@ exports.SecurityWorkflowsService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
-const uuid_1 = require("uuid");
+const uuid_v7_1 = require("./uuid-v7");
 const contracts_1 = require("../api/contracts");
 const roles_1 = require("../api/roles");
 const app_user_entity_1 = require("./entities/app-user.entity");
@@ -95,7 +95,7 @@ let SecurityWorkflowsService = class SecurityWorkflowsService {
         let role = await this.rolesRepo.findOne({ where: { roleKey } });
         if (!role) {
             role = this.rolesRepo.create({
-                id: (0, uuid_1.v7)(),
+                id: (0, uuid_v7_1.uuidv7)(),
                 roleKey,
                 description: description?.trim() || null,
                 isSystem: roleKey === contracts_1.ADMIN_ROLE,
@@ -141,7 +141,7 @@ let SecurityWorkflowsService = class SecurityWorkflowsService {
         await this.userRolesRepo.delete({ userId });
         if (roles.length > 0) {
             await this.userRolesRepo.save(roles.map((role) => this.userRolesRepo.create({
-                id: (0, uuid_1.v7)(),
+                id: (0, uuid_v7_1.uuidv7)(),
                 userId,
                 roleId: role.id,
             })));
@@ -185,7 +185,7 @@ let SecurityWorkflowsService = class SecurityWorkflowsService {
             return;
         }
         await this.rolesRepo.save(missing.map((roleKey) => this.rolesRepo.create({
-            id: (0, uuid_1.v7)(),
+            id: (0, uuid_v7_1.uuidv7)(),
             roleKey,
             description: null,
             isSystem: roleKey === contracts_1.ADMIN_ROLE,

package/dist/nest/uuid-v7.d.ts

@@ -0,0 +1 @@
+export declare function uuidv7(): string;

package/dist/nest/uuid-v7.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uuidv7 = uuidv7;
+const crypto_1 = require("crypto");
+function bytesToHex(bytes) {
+    return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
+}
+function uuidv7() {
+    const bytes = (0, crypto_1.randomBytes)(16);
+    const timestamp = BigInt(Date.now());
+    bytes[0] = Number((timestamp >> 40n) & 0xffn);
+    bytes[1] = Number((timestamp >> 32n) & 0xffn);
+    bytes[2] = Number((timestamp >> 24n) & 0xffn);
+    bytes[3] = Number((timestamp >> 16n) & 0xffn);
+    bytes[4] = Number((timestamp >> 8n) & 0xffn);
+    bytes[5] = Number(timestamp & 0xffn);
+    bytes[6] = (bytes[6] & 0x0f) | 0x70;
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+    const hex = bytesToHex(bytes);
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scryan7371/sdr-security",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Reusable auth/security capability for API and app clients.",
   "main": "dist/index.js",
   "exports": {
@@ -45,8 +45,7 @@
   "dependencies": {
     "@babel/runtime": "7.29.2",
     "bcryptjs": "3.0.3",
-    "jsonwebtoken": "9.0.3",
-    "uuid": "13.0.0"
+    "jsonwebtoken": "9.0.3"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",

package/src/nest/entities/password-reset-token.entity.ts

@@ -5,7 +5,7 @@ import {
   Entity,
   PrimaryColumn,
 } from "typeorm";
-import { v7 as uuidv7 } from "uuid";
+import { uuidv7 } from "../uuid-v7";
 
 @Entity({ name: "security_password_reset_token" })
 export class PasswordResetTokenEntity {

package/src/nest/entities/security-role.entity.ts

@@ -1,4 +1,4 @@
-import { v7 as uuidv7 } from "uuid";
+import { uuidv7 } from "../uuid-v7";
 import { BeforeInsert, Column, Entity, PrimaryColumn } from "typeorm";
 
 @Entity({ name: "security_role" })

package/src/nest/entities/security-user-role.entity.ts

@@ -1,4 +1,4 @@
-import { v7 as uuidv7 } from "uuid";
+import { uuidv7 } from "../uuid-v7";
 import { BeforeInsert, Column, Entity, PrimaryColumn } from "typeorm";
 
 @Entity({ name: "security_user_role" })

package/src/nest/security-auth.service.ts

@@ -7,7 +7,7 @@ import {
 import { randomBytes } from "crypto";
 import { compare, hash } from "bcryptjs";
 import { sign, type SignOptions } from "jsonwebtoken";
-import { v7 as uuidv7 } from "uuid";
+import { uuidv7 } from "./uuid-v7";
 import { InjectRepository } from "@nestjs/typeorm";
 import { In, IsNull, Repository } from "typeorm";
 import { AuthResponse, RegisterResponse } from "../api/contracts";

package/src/nest/security-workflows.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, NotFoundException } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { In, Repository } from "typeorm";
-import { v7 as uuidv7 } from "uuid";
+import { uuidv7 } from "./uuid-v7";
 import { ADMIN_ROLE } from "../api/contracts";
 import { normalizeRoleName } from "../api/roles";
 import { AppUserEntity } from "./entities/app-user.entity";

package/src/nest/uuid-v7.ts

@@ -0,0 +1,23 @@
+import { randomBytes } from "crypto";
+
+function bytesToHex(bytes: Uint8Array) {
+  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
+}
+
+export function uuidv7(): string {
+  const bytes = randomBytes(16);
+  const timestamp = BigInt(Date.now());
+
+  bytes[0] = Number((timestamp >> 40n) & 0xffn);
+  bytes[1] = Number((timestamp >> 32n) & 0xffn);
+  bytes[2] = Number((timestamp >> 24n) & 0xffn);
+  bytes[3] = Number((timestamp >> 16n) & 0xffn);
+  bytes[4] = Number((timestamp >> 8n) & 0xffn);
+  bytes[5] = Number(timestamp & 0xffn);
+
+  bytes[6] = (bytes[6] & 0x0f) | 0x70;
+  bytes[8] = (bytes[8] & 0x3f) | 0x80;
+
+  const hex = bytesToHex(bytes);
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
+}