@ackplus/nest-auth 1.1.29 → 1.1.31-beta.10

package/dist/lib/audit/services/audit.service.d.ts

@@ -1,5 +1,10 @@
 import { AuthConfigService } from '../../core/services/auth-config.service';
-import { UserLoggedInEvent, LoggedOutEvent, UserRegisteredEvent, UserPasswordChangedEvent, User2faEnabledEvent, User2faDisabledEvent } from '../../auth/events';
+import { UserLoggedInEvent } from '../../auth/events/user-logged-in.event';
+import { LoggedOutEvent } from '../../auth/events/logged-out.event';
+import { UserRegisteredEvent } from '../../auth/events/user-registered.event';
+import { UserPasswordChangedEvent } from '../../auth/events/user-password-changed.event';
+import { User2faEnabledEvent } from '../../auth/events/user-2fa-enabled.event';
+import { User2faDisabledEvent } from '../../auth/events/user-2fa-disabled.event';
 export declare class AuditService {
     private readonly authConfigService;
     private readonly logger;

package/dist/lib/audit/services/audit.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/audit/services/audit.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EACH,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACvB,MAAM,mBAAmB,CAAC;AAG3B,qBACa,YAAY;IAIjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAHtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;gBAGnC,iBAAiB,EAAE,iBAAiB;YAG3C,cAAc;IAiBtB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB;IAgB7C,mBAAmB,CAAC,OAAO,EAAE,cAAc;IAc3C,oBAAoB,CAAC,OAAO,EAAE,mBAAmB;IAcjD,qBAAqB,CAAC,OAAO,EAAE,wBAAwB;IAavD,gBAAgB,CAAC,OAAO,EAAE,mBAAmB;IAc7C,iBAAiB,CAAC,OAAO,EAAE,oBAAoB;CAWxD"}
+{"version":3,"file":"audit.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/audit/services/audit.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGjF,qBACa,YAAY;IAIjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAHtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;gBAGnC,iBAAiB,EAAE,iBAAiB;YAG3C,cAAc;IAiBtB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB;IAgB7C,mBAAmB,CAAC,OAAO,EAAE,cAAc;IAc3C,oBAAoB,CAAC,OAAO,EAAE,mBAAmB;IAcjD,qBAAqB,CAAC,OAAO,EAAE,wBAAwB;IAavD,gBAAgB,CAAC,OAAO,EAAE,mBAAmB;IAc7C,iBAAiB,CAAC,OAAO,EAAE,oBAAoB;CAWxD"}

package/dist/lib/audit/services/audit.service.js

@@ -15,7 +15,12 @@ const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const auth_config_service_1 = require("../../core/services/auth-config.service");
 const auth_constants_1 = require("../../auth.constants");
-const events_1 = require("../../auth/events");
+const user_logged_in_event_1 = require("../../auth/events/user-logged-in.event");
+const logged_out_event_1 = require("../../auth/events/logged-out.event");
+const user_registered_event_1 = require("../../auth/events/user-registered.event");
+const user_password_changed_event_1 = require("../../auth/events/user-password-changed.event");
+const user_2fa_enabled_event_1 = require("../../auth/events/user-2fa-enabled.event");
+const user_2fa_disabled_event_1 = require("../../auth/events/user-2fa-disabled.event");
 let AuditService = AuditService_1 = class AuditService {
     authConfigService;
     logger = new common_1.Logger(AuditService_1.name);
@@ -113,37 +118,37 @@ exports.AuditService = AuditService;
 __decorate([
     (0, event_emitter_1.OnEvent)(auth_constants_1.NestAuthEvents.LOGGED_IN),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [events_1.UserLoggedInEvent]),
+    __metadata("design:paramtypes", [user_logged_in_event_1.UserLoggedInEvent]),
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "handleUserLoggedIn", null);
 __decorate([
     (0, event_emitter_1.OnEvent)(auth_constants_1.NestAuthEvents.LOGGED_OUT),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [events_1.LoggedOutEvent]),
+    __metadata("design:paramtypes", [logged_out_event_1.LoggedOutEvent]),
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "handleUserLoggedOut", null);
 __decorate([
     (0, event_emitter_1.OnEvent)(auth_constants_1.NestAuthEvents.REGISTERED),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [events_1.UserRegisteredEvent]),
+    __metadata("design:paramtypes", [user_registered_event_1.UserRegisteredEvent]),
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "handleUserRegistered", null);
 __decorate([
     (0, event_emitter_1.OnEvent)(auth_constants_1.NestAuthEvents.PASSWORD_CHANGED),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [events_1.UserPasswordChangedEvent]),
+    __metadata("design:paramtypes", [user_password_changed_event_1.UserPasswordChangedEvent]),
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "handlePasswordChanged", null);
 __decorate([
     (0, event_emitter_1.OnEvent)(auth_constants_1.NestAuthEvents.TWO_FACTOR_ENABLED),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [events_1.User2faEnabledEvent]),
+    __metadata("design:paramtypes", [user_2fa_enabled_event_1.User2faEnabledEvent]),
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "handle2faEnabled", null);
 __decorate([
     (0, event_emitter_1.OnEvent)(auth_constants_1.NestAuthEvents.TWO_FACTOR_DISABLED),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [events_1.User2faDisabledEvent]),
+    __metadata("design:paramtypes", [user_2fa_disabled_event_1.User2faDisabledEvent]),
     __metadata("design:returntype", Promise)
 ], AuditService.prototype, "handle2faDisabled", null);
 exports.AuditService = AuditService = AuditService_1 = __decorate([

package/dist/lib/audit/services/audit.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit.service.js","sourceRoot":"","sources":["../../../../src/lib/audit/services/audit.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,yDAAgD;AAChD,iFAA4E;AAC5E,yDAAsD;AACtD,8CAO2B;AAIpB,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAIA;IAHJ,MAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;IAExD,YACqB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACrD,CAAC;IAEG,KAAK,CAAC,cAAc,CAAC,KAAqB;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;QAElD,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;YAClC,OAAO;QACX,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC;gBACD,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YACpF,CAAC;QACL,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAC,OAA0B;QAC/C,MAAM,IAAI,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS;YACrC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS;YAC5C,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE;gBACN,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;gBAClC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;aACrC;YACD,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,mBAAmB,CAAC,OAAuB;QAC7C,MAAM,IAAI,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE;YAChC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE;gBACN,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;gBAC9B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;aACxC;YACD,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,oBAAoB,CAAC,OAA4B;QACnD,MAAM,IAAI,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE;gBACN,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;gBAClC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;aACrC;YACD,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,qBAAqB,CAAC,OAAiC;QACzD,MAAM,IAAI,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE;gBACN,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;aAC3C;YACD,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAC,OAA4B;QAC/C,MAAM,IAAI,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE;gBACN,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;gBAC9B,MAAM,EAAE,SAAS;aACpB;YACD,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,iBAAiB,CAAC,OAA6B;QACjD,MAAM,IAAI,CAAC,cAAc,CAAC;YACtB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE;gBACN,MAAM,EAAE,UAAU;aACrB;YACD,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA1GY,oCAAY;AAwBf;IADL,IAAA,uBAAO,EAAC,+BAAc,CAAC,SAAS,CAAC;;qCACA,0BAAiB;;sDAalD;AAGK;IADL,IAAA,uBAAO,EAAC,+BAAc,CAAC,UAAU,CAAC;;qCACA,uBAAc;;uDAWhD;AAGK;IADL,IAAA,uBAAO,EAAC,+BAAc,CAAC,UAAU,CAAC;;qCACC,4BAAmB;;wDAWtD;AAGK;IADL,IAAA,uBAAO,EAAC,+BAAc,CAAC,gBAAgB,CAAC;;qCACJ,iCAAwB;;yDAU5D;AAGK;IADL,IAAA,uBAAO,EAAC,+BAAc,CAAC,kBAAkB,CAAC;;qCACX,4BAAmB;;oDAWlD;AAGK;IADL,IAAA,uBAAO,EAAC,+BAAc,CAAC,mBAAmB,CAAC;;qCACX,6BAAoB;;qDAUpD;uBAzGQ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAK+B,uCAAiB;GAJhD,YAAY,CA0GxB"}
+{"version":3,"file":"audit.service.js","sourceRoot":"","sources":["../../../../src/lib/audit/services/audit.service.ts"],"names":[],"mappings":"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"}

package/dist/lib/auth/auth.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/auth.module.ts"],"names":[],"mappings":"AAwBA,qBAoCa,UAAU;CACtB"}
+{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/auth.module.ts"],"names":[],"mappings":"AAyBA,qBAsCa,UAAU;CACtB"}

package/dist/lib/auth/auth.module.js

@@ -9,17 +9,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthModule = void 0;
 const common_1 = require("@nestjs/common");
 const auth_service_1 = require("./services/auth.service");
-const cookie_service_1 = require("./services/cookie.service");
 const mfa_service_1 = require("./services/mfa.service");
 const client_config_service_1 = require("./services/client-config.service");
 const auth_guard_1 = require("./guards/auth.guard");
-const refresh_token_interceptor_1 = require("./interceptors/refresh-token.interceptor");
+const token_response_interceptor_1 = require("./interceptors/token-response.interceptor");
 const auth_controller_1 = require("./controllers/auth.controller");
 const mfa_controller_1 = require("./controllers/mfa.controller");
 const auth_session_event_listener_service_1 = require("./services/auth-session-event-listener.service");
 const identity_entity_1 = require("../user/entities/identity.entity");
 const typeorm_1 = require("@nestjs/typeorm");
 const user_entity_1 = require("../user/entities/user.entity");
+const password_service_1 = require("./services/password.service");
+const verification_service_1 = require("./services/verification.service");
 const otp_entity_1 = require("./entities/otp.entity");
 const mfa_secret_entity_1 = require("./entities/mfa-secret.entity");
 const access_key_entity_1 = require("../user/entities/access-key.entity");
@@ -53,21 +54,23 @@ exports.AuthModule = AuthModule = __decorate([
         ],
         providers: [
             auth_service_1.AuthService,
-            cookie_service_1.CookieService,
             mfa_service_1.MfaService,
             client_config_service_1.ClientConfigService,
             auth_guard_1.NestAuthAuthGuard,
-            refresh_token_interceptor_1.RefreshTokenInterceptor,
+            token_response_interceptor_1.TokenResponseInterceptor,
             auth_session_event_listener_service_1.AuthSessionEventListener,
+            password_service_1.PasswordService,
+            verification_service_1.VerificationService,
         ],
         controllers: [auth_controller_1.AuthController, mfa_controller_1.MfaController],
         exports: [
             auth_service_1.AuthService,
-            cookie_service_1.CookieService,
+            password_service_1.PasswordService,
+            verification_service_1.VerificationService,
             mfa_service_1.MfaService,
             client_config_service_1.ClientConfigService,
             auth_guard_1.NestAuthAuthGuard,
-            refresh_token_interceptor_1.RefreshTokenInterceptor,
+            token_response_interceptor_1.TokenResponseInterceptor,
         ],
     })
 ], AuthModule);

package/dist/lib/auth/auth.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../src/lib/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,0DAAsD;AACtD,8DAA0D;AAC1D,wDAAoD;AACpD,4EAAuE;AACvE,oDAAwD;AACxD,wFAAmF;AACnF,mEAA+D;AAC/D,iEAA6D;AAC7D,wGAA0F;AAC1F,sEAAoE;AACpE,6CAAgD;AAChD,8DAA4D;AAC5D,sDAAoD;AACpD,oEAAiE;AACjE,0EAAuE;AACvE,4EAAyE;AACzE,yDAA2D;AAC3D,qDAAiD;AACjD,qDAAiD;AACjD,8DAA0D;AAC1D,2DAAuD;AACvD,qDAAiD;AAsC1C,IAAM,UAAU,GAAhB,MAAM,UAAU;CACtB,CAAA;AADY,gCAAU;qBAAV,UAAU;IApCtB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,kCAAkB;YAClB,uBAAa,CAAC,UAAU,CAAC;gBACrB,0BAAY;gBACZ,wBAAW;gBACX,qCAAiB;gBACjB,qCAAiB;gBACjB,kCAAgB;gBAChB,6CAAqB;aACxB,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;YAC9B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;SAC/B;QACD,SAAS,EAAE;YACP,0BAAW;YACX,8BAAa;YACb,wBAAU;YACV,2CAAmB;YACnB,8BAAiB;YACjB,mDAAuB;YACvB,8DAAwB;SAC3B;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,8BAAa,CAAC;QAC5C,OAAO,EAAE;YACL,0BAAW;YACX,8BAAa;YACb,wBAAU;YACV,2CAAmB;YACnB,8BAAiB;YACjB,mDAAuB;SAC1B;KACJ,CAAC;GACW,UAAU,CACtB"}
+{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../src/lib/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,0DAAsD;AACtD,wDAAoD;AACpD,4EAAuE;AACvE,oDAAwD;AACxD,0FAAqF;AACrF,mEAA+D;AAC/D,iEAA6D;AAC7D,wGAA0F;AAC1F,sEAAoE;AACpE,6CAAgD;AAChD,8DAA4D;AAC5D,kEAA8D;AAC9D,0EAAsE;AACtE,sDAAoD;AACpD,oEAAiE;AACjE,0EAAuE;AACvE,4EAAyE;AACzE,yDAA2D;AAC3D,qDAAiD;AACjD,qDAAiD;AACjD,8DAA0D;AAC1D,2DAAuD;AACvD,qDAAiD;AAwC1C,IAAM,UAAU,GAAhB,MAAM,UAAU;CACtB,CAAA;AADY,gCAAU;qBAAV,UAAU;IAtCtB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,kCAAkB;YAClB,uBAAa,CAAC,UAAU,CAAC;gBACrB,0BAAY;gBACZ,wBAAW;gBACX,qCAAiB;gBACjB,qCAAiB;gBACjB,kCAAgB;gBAChB,6CAAqB;aACxB,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;YAC9B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;SAC/B;QACD,SAAS,EAAE;YACP,0BAAW;YACX,wBAAU;YACV,2CAAmB;YACnB,8BAAiB;YACjB,qDAAwB;YACxB,8DAAwB;YACxB,kCAAe;YACf,0CAAmB;SACtB;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,8BAAa,CAAC;QAC5C,OAAO,EAAE;YACL,0BAAW;YACX,kCAAe;YACf,0CAAmB;YACnB,wBAAU;YACV,2CAAmB;YACnB,8BAAiB;YACjB,qDAAwB;SAC3B;KACJ,CAAC;GACW,UAAU,CACtB"}

package/dist/lib/auth/controllers/auth.controller.d.ts

@@ -1,56 +1,48 @@
 import { AuthService } from '../services/auth.service';
-import { Verify2faRequestDto } from '../dto/requests/verify-2fa.request.dto';
-import { RefreshTokenRequestDto } from '../dto/requests/refresh-token.request.dto';
-import { Response } from 'express';
-import { CookieService } from '../services/cookie.service';
-import { AuthConfigService } from '../../core/services/auth-config.service';
-import { SignupRequestDto } from '../dto/requests/signup.request.dto';
-import { LoginRequestDto } from '../dto/requests/login.request.dto';
-import { MessageResponseDto, MFAMethodEnum } from '../../core';
-import { ForgotPasswordRequestDto } from '../dto/requests/forgot-password.request.dto';
-import { ResetPasswordRequestDto } from '../dto/requests/reset-password.request.dto';
-import { VerifyForgotPasswordOtpRequestDto } from '../dto/requests/verify-forgot-password-otp-request-dto';
-import { ResetPasswordWithTokenRequestDto } from '../dto/requests/reset-password-with-token.request.dto';
+import { NestAuthVerify2faRequestDto } from '../dto/requests/verify-2fa.request.dto';
+import { NestAuthRefreshTokenRequestDto } from '../dto/requests/refresh-token.request.dto';
+import { Request, Response } from 'express';
+import { AuthWithTokensResponseDto, Verify2faWithTokensResponseDto } from '../dto/responses/auth.response.dto';
+import { NestAuthSignupRequestDto } from '../dto/requests/signup.request.dto';
+import { NestAuthLogoutResponseDto, NestAuthLogoutAllResponseDto, NestAuthPasswordResetLinkSentResponseDto, NestAuthPasswordResetResponseDto, NestAuthEmailVerificationSentResponseDto, NestAuthEmailVerifiedResponseDto, NestAuthMfaCodeSentResponseDto } from '../dto/responses/auth-messages.response.dto';
+import { NestAuthLoginRequestDto } from '../dto/requests/login.request.dto';
+import { NestAuthMFAMethodEnum } from '@ackplus/nest-auth-contracts';
+import { NestAuthForgotPasswordRequestDto } from '../dto/requests/forgot-password.request.dto';
+import { NestAuthVerifyForgotPasswordOtpRequestDto } from '../dto/requests/verify-forgot-password-otp-request-dto';
+import { NestAuthResetPasswordWithTokenRequestDto } from '../dto/requests/reset-password-with-token.request.dto';
 import { VerifyOtpResponseDto } from '../dto/responses/verify-otp.response.dto';
-import { ChangePasswordRequestDto } from '../dto/requests/change-password.request.dto';
-import { SendEmailVerificationRequestDto } from '../dto/requests/send-email-verification.request.dto';
-import { VerifyEmailRequestDto } from '../dto/requests/verify-email.request.dto';
+import { NestAuthChangePasswordRequestDto } from '../dto/requests/change-password.request.dto';
+import { NestAuthSendEmailVerificationRequestDto } from '../dto/requests/send-email-verification.request.dto';
+import { NestAuthVerifyEmailRequestDto } from '../dto/requests/verify-email.request.dto';
 import { ClientConfigService } from '../services/client-config.service';
 import { ClientConfigResponseDto } from '../dto/responses/client-config.response.dto';
+import { PasswordService } from '../services/password.service';
+import { VerificationService } from '../services/verification.service';
 export declare class AuthController {
     private readonly authService;
-    private readonly cookieService;
-    private readonly authConfig;
+    private readonly passwordService;
+    private readonly verificationService;
     private readonly clientConfigService;
-    constructor(authService: AuthService, cookieService: CookieService, authConfig: AuthConfigService, clientConfigService: ClientConfigService);
-    protected isUsingCookies(): boolean;
-    protected handleAuthResponse(res: Response, authResult: {
-        accessToken: string;
-        refreshToken: string;
-        isRequiresMfa: boolean;
-    }, successMessage?: string): void;
-    protected handle2faResponse(res: Response, authResult: {
-        accessToken: string;
-        refreshToken: string;
-        trustToken?: string;
-    }): void;
-    signup(input: SignupRequestDto, res: Response): Promise<void>;
-    login(input: LoginRequestDto, res: Response): Promise<void>;
-    refreshToken(input: RefreshTokenRequestDto, res: Response): Promise<void>;
-    send2faCode(method: MFAMethodEnum): Promise<{
-        message: string;
-    }>;
-    verify2fa(input: Verify2faRequestDto, res: Response): Promise<void>;
-    logout(res: Response): Promise<void>;
-    logoutAll(): Promise<MessageResponseDto>;
-    changePassword(input: ChangePasswordRequestDto, res: Response): Promise<void>;
-    forgotPassword(input: ForgotPasswordRequestDto): Promise<MessageResponseDto>;
-    verifyForgotPasswordOtp(input: VerifyForgotPasswordOtpRequestDto): Promise<VerifyOtpResponseDto>;
-    resetPassword(input: ResetPasswordRequestDto): Promise<MessageResponseDto>;
-    resetPasswordWithToken(input: ResetPasswordWithTokenRequestDto): Promise<MessageResponseDto>;
+    constructor(authService: AuthService, passwordService: PasswordService, verificationService: VerificationService, clientConfigService: ClientConfigService);
+    signup(input: NestAuthSignupRequestDto): Promise<AuthWithTokensResponseDto>;
+    login(input: NestAuthLoginRequestDto): Promise<AuthWithTokensResponseDto>;
+    refreshToken(input: NestAuthRefreshTokenRequestDto): Promise<AuthWithTokensResponseDto>;
+    send2faCode(method: NestAuthMFAMethodEnum): Promise<NestAuthMfaCodeSentResponseDto>;
+    verify2fa(input: NestAuthVerify2faRequestDto): Promise<Verify2faWithTokensResponseDto>;
+    logout(res: Response, req: Request): Promise<NestAuthLogoutResponseDto>;
+    logoutAll(): Promise<NestAuthLogoutAllResponseDto>;
+    changePassword(input: NestAuthChangePasswordRequestDto): Promise<AuthWithTokensResponseDto>;
+    forgotPassword(input: NestAuthForgotPasswordRequestDto): Promise<NestAuthPasswordResetLinkSentResponseDto>;
+    verifyForgotPasswordOtp(input: NestAuthVerifyForgotPasswordOtpRequestDto): Promise<VerifyOtpResponseDto>;
+    resetPassword(input: NestAuthResetPasswordWithTokenRequestDto): Promise<NestAuthPasswordResetResponseDto>;
     getUser(): Promise<Partial<import("../../core").NestAuthUser>>;
-    sendEmailVerification(input: SendEmailVerificationRequestDto): Promise<MessageResponseDto>;
-    verifyEmail(input: VerifyEmailRequestDto): Promise<MessageResponseDto>;
+    verifySession(): Promise<{
+        valid: boolean;
+        userId: string;
+        expiresAt: string;
+    }>;
+    sendEmailVerification(input: NestAuthSendEmailVerificationRequestDto): Promise<NestAuthEmailVerificationSentResponseDto>;
+    verifyEmail(input: NestAuthVerifyEmailRequestDto): Promise<NestAuthEmailVerifiedResponseDto>;
     getClientConfig(): Promise<ClientConfigResponseDto>;
     ssoCallback(provider: string, data: any, res: Response): Promise<void>;
 }

package/dist/lib/auth/controllers/auth.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.controller.d.ts","sourceRoot":"","sources":["../../../../src/lib/auth/controllers/auth.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.controller.d.ts","sourceRoot":"","sources":["../../../../src/lib/auth/controllers/auth.controller.ts"],"names":[],"mappings":"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"}