@scryan7371/sdr-security 0.1.6 → 0.1.9

package/dist/api/contracts.d.ts

@@ -3,6 +3,8 @@ export type UserRole = string;
 export type SafeUser = {
     id: string;
     email: string;
+    firstName: string | null;
+    lastName: string | null;
     phone: string | null;
     roles: UserRole[];
     emailVerifiedAt: string | Date | null;
@@ -27,6 +29,8 @@ export type AuthResponse = {
     accessTokenExpiresIn: string;
     refreshToken: string;
     refreshTokenExpiresAt: string | Date;
+    userId: string;
+    roles: UserRole[];
     user: SafeUser;
 };
 export type RegisterResponse = {

package/dist/api/migrations/1739490000000-create-app-user.js

@@ -8,7 +8,9 @@ class CreateAppUser1739490000000 {
         await queryRunner.query(`
       CREATE TABLE IF NOT EXISTS ${userTableRef} (
         "id" uuid PRIMARY KEY NOT NULL,
-        "email" varchar NOT NULL
+        "email" varchar NOT NULL,
+        "first_name" varchar,
+        "last_name" varchar
       )
     `);
     }

package/dist/nest/entities/app-user.entity.d.ts

@@ -1,4 +1,6 @@
 export declare class AppUserEntity {
     id: string;
     email: string;
+    firstName: string | null;
+    lastName: string | null;
 }

package/dist/nest/entities/app-user.entity.js

@@ -14,6 +14,8 @@ const typeorm_1 = require("typeorm");
 let AppUserEntity = class AppUserEntity {
     id;
     email;
+    firstName;
+    lastName;
 };
 exports.AppUserEntity = AppUserEntity;
 __decorate([
@@ -24,6 +26,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar" }),
     __metadata("design:type", String)
 ], AppUserEntity.prototype, "email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true, name: "first_name" }),
+    __metadata("design:type", Object)
+], AppUserEntity.prototype, "firstName", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true, name: "last_name" }),
+    __metadata("design:type", Object)
+], AppUserEntity.prototype, "lastName", void 0);
 exports.AppUserEntity = AppUserEntity = __decorate([
     (0, typeorm_1.Entity)({ name: "app_user" })
 ], AppUserEntity);

package/dist/nest/security-auth.controller.d.ts

@@ -43,9 +43,5 @@ export declare class SecurityAuthController {
     verifyEmail(token?: string): Promise<{
         success: true;
     }>;
-    getMyRoles(request: AuthedRequest): Promise<{
-        userId: string;
-        roles: string[];
-    }>;
 }
 export {};

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

@@ -78,9 +78,6 @@ let SecurityAuthController = class SecurityAuthController {
         }
         return this.authService.verifyEmailByToken(token);
     }
-    async getMyRoles(request) {
-        return this.authService.getMyRoles(request.user.sub);
-    }
 };
 exports.SecurityAuthController = SecurityAuthController;
 __decorate([
@@ -160,16 +157,6 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], SecurityAuthController.prototype, "verifyEmail", null);
-__decorate([
-    (0, common_1.UseGuards)(security_jwt_guard_1.SecurityJwtGuard),
-    (0, common_1.Get)("me/roles"),
-    (0, swagger_1.ApiOperation)({ summary: "Get roles for authenticated user" }),
-    (0, swagger_1.ApiBearerAuth)(),
-    __param(0, (0, common_1.Req)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SecurityAuthController.prototype, "getMyRoles", null);
 exports.SecurityAuthController = SecurityAuthController = __decorate([
     (0, common_1.Controller)("security/auth"),
     (0, swagger_1.ApiTags)("security-auth"),

package/dist/nest/security-auth.controller.test.js

@@ -12,7 +12,6 @@ const makeAuthService = () => ({
     requestForgotPassword: vitest_1.vi.fn(),
     resetPassword: vitest_1.vi.fn(),
     verifyEmailByToken: vitest_1.vi.fn(),
-    getMyRoles: vitest_1.vi.fn(),
 });
 (0, vitest_1.describe)("SecurityAuthController", () => {
     let service;
@@ -80,8 +79,4 @@ const makeAuthService = () => ({
         });
         (0, vitest_1.expect)(service.verifyEmailByToken).toHaveBeenCalledWith("token-1");
     });
-    (0, vitest_1.it)("delegates getMyRoles", async () => {
-        service.getMyRoles.mockResolvedValue({ userId: "u1", roles: ["ADMIN"] });
-        await (0, vitest_1.expect)(controller.getMyRoles({ user: { sub: "u1" } })).resolves.toEqual({ userId: "u1", roles: ["ADMIN"] });
-    });
 });

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

@@ -60,11 +60,18 @@ let SecurityAuthModule = SecurityAuthModule_1 = class SecurityAuthModule {
                 security_admin_guard_1.SecurityAdminGuard,
                 notifierProvider,
             ],
-            exports: [security_auth_service_1.SecurityAuthService, security_workflows_service_1.SecurityWorkflowsService],
+            exports: [
+                security_auth_constants_1.SECURITY_AUTH_OPTIONS,
+                security_auth_service_1.SecurityAuthService,
+                security_workflows_service_1.SecurityWorkflowsService,
+                security_jwt_guard_1.SecurityJwtGuard,
+                security_admin_guard_1.SecurityAdminGuard,
+            ],
         };
     }
 };
 exports.SecurityAuthModule = SecurityAuthModule;
 exports.SecurityAuthModule = SecurityAuthModule = SecurityAuthModule_1 = __decorate([
+    (0, common_1.Global)(),
     (0, common_1.Module)({})
 ], SecurityAuthModule);

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

@@ -229,12 +229,15 @@ let SecurityAuthService = class SecurityAuthService {
             expiresAt: refreshTokenExpiresAt,
             revokedAt: null,
         }));
+        const user = await this.toSafeUser(appUser, securityUser);
         return {
             accessToken,
             accessTokenExpiresIn,
             refreshToken,
             refreshTokenExpiresAt,
-            user: await this.toSafeUser(appUser, securityUser),
+            userId: appUser.id,
+            roles,
+            user,
         };
     }
     async createEmailVerificationToken(userId) {
@@ -273,6 +276,8 @@ let SecurityAuthService = class SecurityAuthService {
         return {
             id: appUser.id,
             email: appUser.email,
+            firstName: appUser.firstName ?? null,
+            lastName: appUser.lastName ?? null,
             phone: null,
             roles: await this.getUserRoleKeys(appUser.id),
             emailVerifiedAt: securityUser.emailVerifiedAt,

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "@scryan7371/sdr-security",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Reusable auth/security capability for API and app clients.",
   "main": "dist/index.js",
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
     "./nest": {
       "types": "./dist/nest/index.d.ts",
+      "require": "./dist/nest/index.js",
       "default": "./dist/nest/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/index.d.ts",
   "publishConfig": {
@@ -23,16 +29,18 @@
     "build": "tsc -p tsconfig.json",
     "clean": "rm -rf dist",
     "prepublishOnly": "npm run clean && npm run build",
-    "lint": "eslint \"src/**/*.ts\"",
-    "prettier": "prettier --write \"src/**/*.ts\" \"README.md\"",
+    "lint": "eslint \"src/**/*.ts\" --max-warnings=0",
+    "format": "prettier --write \"src/**/*.ts\" \"README.md\"",
     "test": "vitest run",
     "test:db": "vitest run --config vitest.db.config.ts",
-    "test:cov": "vitest run --coverage",
+    "coverage": "vitest run --coverage",
     "test:db:keep": "SECURITY_TEST_KEEP_SCHEMA=true SECURITY_TEST_SCHEMA=sdr_security_it_debug npm run test:db",
     "test:db:teardown": "SECURITY_TEST_SCHEMA=sdr_security_it_debug npm run test:db",
     "release:patch": "bash ./scripts/release.sh patch",
     "release:minor": "bash ./scripts/release.sh minor",
-    "release:major": "bash ./scripts/release.sh major"
+    "release:major": "bash ./scripts/release.sh major",
+    "ci:prepush": "npm run lint && npm run test",
+    "prepush": "npm run ci:prepush"
   },
   "dependencies": {
     "@babel/runtime": "7.28.6",

package/src/api/contracts.ts

@@ -4,6 +4,8 @@ export type UserRole = string;
 export type SafeUser = {
   id: string;
   email: string;
+  firstName: string | null;
+  lastName: string | null;
   phone: string | null;
   roles: UserRole[];
   emailVerifiedAt: string | Date | null;
@@ -32,6 +34,8 @@ export type AuthResponse = {
   accessTokenExpiresIn: string;
   refreshToken: string;
   refreshTokenExpiresAt: string | Date;
+  userId: string;
+  roles: UserRole[];
   user: SafeUser;
 };
 

package/src/api/migrations/1739490000000-create-app-user.ts

@@ -9,7 +9,9 @@ export class CreateAppUser1739490000000 {
     await queryRunner.query(`
       CREATE TABLE IF NOT EXISTS ${userTableRef} (
         "id" uuid PRIMARY KEY NOT NULL,
-        "email" varchar NOT NULL
+        "email" varchar NOT NULL,
+        "first_name" varchar,
+        "last_name" varchar
       )
     `);
   }

package/src/nest/entities/app-user.entity.ts

@@ -7,4 +7,10 @@ export class AppUserEntity {
 
   @Column({ type: "varchar" })
   email!: string;
+
+  @Column({ type: "varchar", nullable: true, name: "first_name" })
+  firstName!: string | null;
+
+  @Column({ type: "varchar", nullable: true, name: "last_name" })
+  lastName!: string | null;
 }

package/src/nest/security-auth.controller.test.ts

@@ -11,7 +11,6 @@ const makeAuthService = () => ({
   requestForgotPassword: vi.fn(),
   resetPassword: vi.fn(),
   verifyEmailByToken: vi.fn(),
-  getMyRoles: vi.fn(),
 });
 
 describe("SecurityAuthController", () => {
@@ -118,11 +117,4 @@ describe("SecurityAuthController", () => {
     });
     expect(service.verifyEmailByToken).toHaveBeenCalledWith("token-1");
   });
-
-  it("delegates getMyRoles", async () => {
-    service.getMyRoles.mockResolvedValue({ userId: "u1", roles: ["ADMIN"] });
-    await expect(
-      controller.getMyRoles({ user: { sub: "u1" } }),
-    ).resolves.toEqual({ userId: "u1", roles: ["ADMIN"] });
-  });
 });

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

@@ -137,12 +137,4 @@ export class SecurityAuthController {
     }
     return this.authService.verifyEmailByToken(token);
   }
-
-  @UseGuards(SecurityJwtGuard)
-  @Get("me/roles")
-  @ApiOperation({ summary: "Get roles for authenticated user" })
-  @ApiBearerAuth()
-  async getMyRoles(@Req() request: AuthedRequest) {
-    return this.authService.getMyRoles(request.user.sub);
-  }
 }

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

@@ -1,4 +1,4 @@
-import { DynamicModule, Module, Provider } from "@nestjs/common";
+import { DynamicModule, Global, Module, Provider } from "@nestjs/common";
 import { TypeOrmModule } from "@nestjs/typeorm";
 import { SecurityWorkflowNotifier } from "./contracts";
 import { AppUserEntity } from "./entities/app-user.entity";
@@ -24,6 +24,7 @@ const noopNotifier: SecurityWorkflowNotifier = {
   sendUserAccountApproved: async () => undefined,
 };
 
+@Global()
 @Module({})
 export class SecurityAuthModule {
   static forRoot(options: {
@@ -59,7 +60,13 @@ export class SecurityAuthModule {
         SecurityAdminGuard,
         notifierProvider,
       ],
-      exports: [SecurityAuthService, SecurityWorkflowsService],
+      exports: [
+        SECURITY_AUTH_OPTIONS,
+        SecurityAuthService,
+        SecurityWorkflowsService,
+        SecurityJwtGuard,
+        SecurityAdminGuard,
+      ],
     };
   }
 }

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

@@ -294,12 +294,15 @@ export class SecurityAuthService {
       }),
     );
 
+    const user = await this.toSafeUser(appUser, securityUser);
     return {
       accessToken,
       accessTokenExpiresIn,
       refreshToken,
       refreshTokenExpiresAt,
-      user: await this.toSafeUser(appUser, securityUser),
+      userId: appUser.id,
+      roles,
+      user,
     };
   }
 
@@ -348,6 +351,8 @@ export class SecurityAuthService {
     return {
       id: appUser.id,
       email: appUser.email,
+      firstName: appUser.firstName ?? null,
+      lastName: appUser.lastName ?? null,
       phone: null,
       roles: await this.getUserRoleKeys(appUser.id),
       emailVerifiedAt: securityUser.emailVerifiedAt,