@nest-boot/auth 7.5.0 → 7.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth-module-options.interface.d.ts +9 -0
- package/dist/auth.middleware.js +8 -2
- package/dist/auth.middleware.js.map +1 -1
- package/dist/auth.module.d.ts +6 -4
- package/dist/auth.module.js +11 -7
- package/dist/auth.module.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -2
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { Loaded } from "@mikro-orm/core";
|
|
1
2
|
import { RouteInfo, Type } from "@nestjs/common/interfaces";
|
|
2
3
|
import { BetterAuthOptions } from "better-auth";
|
|
4
|
+
import { Request, Response } from "express";
|
|
3
5
|
import { MikroOrmAdapterConfig } from "./adapters/mikro-orm-adapter";
|
|
6
|
+
import { BaseSession, BaseUser } from "./entities";
|
|
4
7
|
export interface AuthModuleMiddlewareOptions {
|
|
5
8
|
register?: boolean;
|
|
6
9
|
includeRoutes?: (string | RouteInfo | Type)[];
|
|
@@ -10,4 +13,10 @@ export interface AuthModuleOptions extends Omit<BetterAuthOptions, "database"> {
|
|
|
10
13
|
basePath?: string;
|
|
11
14
|
entities: MikroOrmAdapterConfig["entities"];
|
|
12
15
|
middleware?: AuthModuleMiddlewareOptions;
|
|
16
|
+
onAuthenticated?: (context: {
|
|
17
|
+
req: Request;
|
|
18
|
+
res: Response;
|
|
19
|
+
user: Loaded<BaseUser> | null;
|
|
20
|
+
session: Loaded<BaseSession> | null;
|
|
21
|
+
}) => void | Promise<void>;
|
|
13
22
|
}
|
package/dist/auth.middleware.js
CHANGED
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.AuthMiddleware = void 0;
|
|
16
16
|
const core_1 = require("@mikro-orm/core");
|
|
17
|
+
const request_context_1 = require("@nest-boot/request-context");
|
|
17
18
|
const common_1 = require("@nestjs/common");
|
|
18
19
|
const auth_module_definition_1 = require("./auth.module-definition");
|
|
19
20
|
const auth_service_1 = require("./auth.service");
|
|
@@ -54,8 +55,13 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
54
55
|
token: data.session.token,
|
|
55
56
|
}),
|
|
56
57
|
]);
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
if (user && session) {
|
|
59
|
+
res.locals.user = user;
|
|
60
|
+
res.locals.session = session;
|
|
61
|
+
request_context_1.RequestContext.set(this.options.entities.user, user);
|
|
62
|
+
request_context_1.RequestContext.set(this.options.entities.session, session);
|
|
63
|
+
}
|
|
64
|
+
await this.options.onAuthenticated?.({ req, res, user, session });
|
|
59
65
|
next();
|
|
60
66
|
}
|
|
61
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.middleware.js","sourceRoot":"","sources":["../src/auth.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"auth.middleware.js","sourceRoot":"","sources":["../src/auth.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAAgD;AAChD,gEAA4D;AAC5D,2CAA0E;AAG1E,qEAAgE;AAChE,iDAA6C;AAKtC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAEmB,OAA0B,EAC1B,WAAwB,EACxB,EAAiB;QAFjB,YAAO,GAAP,OAAO,CAAmB;QAC1B,gBAAW,GAAX,WAAW,CAAa;QACxB,OAAE,GAAF,EAAE,CAAe;IACjC,CAAC;IACI,KAAK,CAAC,UAAU,CAAC,GAAY;QACnC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC;YAC3C,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACpE,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;4BACzB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;wBAC5B,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC;SAClB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC1C,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;aACjB,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC7C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;aAC1B,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YACpB,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACvB,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;YAE7B,gCAAc,CAAC,GAAG,CAChB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAsB,EAC5C,IAAI,CACL,CAAC;YACF,gCAAc,CAAC,GAAG,CAChB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAA4B,EAClD,OAAO,CACR,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAElE,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AA3DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,6CAAoB,CAAC,CAAA;6CAEC,0BAAW;QACpB,oBAAa;GALzB,cAAc,CA2D1B"}
|
package/dist/auth.module.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MiddlewareManager } from "@nest-boot/middleware";
|
|
2
2
|
import { Auth } from "better-auth";
|
|
3
|
+
import { AuthMiddleware } from "./auth.middleware";
|
|
3
4
|
import { ConfigurableModuleClass } from "./auth.module-definition";
|
|
4
5
|
import { AuthModuleOptions } from "./auth-module-options.interface";
|
|
5
|
-
export declare class AuthModule extends ConfigurableModuleClass
|
|
6
|
+
export declare class AuthModule extends ConfigurableModuleClass {
|
|
6
7
|
private readonly auth;
|
|
7
8
|
private readonly options;
|
|
8
|
-
|
|
9
|
-
|
|
9
|
+
private readonly middlewareManager;
|
|
10
|
+
private readonly authMiddleware;
|
|
11
|
+
constructor(auth: Auth, options: AuthModuleOptions, middlewareManager: MiddlewareManager, authMiddleware: AuthMiddleware);
|
|
10
12
|
}
|
package/dist/auth.module.js
CHANGED
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.AuthModule = void 0;
|
|
16
16
|
const core_1 = require("@mikro-orm/core");
|
|
17
|
+
const middleware_1 = require("@nest-boot/middleware");
|
|
17
18
|
const request_context_1 = require("@nest-boot/request-context");
|
|
18
19
|
const common_1 = require("@nestjs/common");
|
|
19
20
|
const better_auth_1 = require("better-auth");
|
|
@@ -24,17 +25,19 @@ const auth_middleware_1 = require("./auth.middleware");
|
|
|
24
25
|
const auth_module_definition_1 = require("./auth.module-definition");
|
|
25
26
|
const auth_service_1 = require("./auth.service");
|
|
26
27
|
let AuthModule = class AuthModule extends auth_module_definition_1.ConfigurableModuleClass {
|
|
27
|
-
constructor(auth, options) {
|
|
28
|
+
constructor(auth, options, middlewareManager, authMiddleware) {
|
|
28
29
|
super();
|
|
29
30
|
this.auth = auth;
|
|
30
31
|
this.options = options;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
this.middlewareManager = middlewareManager;
|
|
33
|
+
this.authMiddleware = authMiddleware;
|
|
34
|
+
this.middlewareManager
|
|
34
35
|
.apply((0, node_1.toNodeHandler)(this.auth))
|
|
35
36
|
.forRoutes(this.options.basePath ?? "/api/auth/{*any}");
|
|
36
37
|
if (this.options.middleware?.register !== false) {
|
|
37
|
-
const proxy =
|
|
38
|
+
const proxy = this.middlewareManager
|
|
39
|
+
.apply(this.authMiddleware)
|
|
40
|
+
.dependencies(request_context_1.RequestContextMiddleware);
|
|
38
41
|
if (this.options.middleware?.excludeRoutes) {
|
|
39
42
|
proxy.exclude(...this.options.middleware.excludeRoutes);
|
|
40
43
|
}
|
|
@@ -51,7 +54,7 @@ exports.AuthModule = AuthModule;
|
|
|
51
54
|
exports.AuthModule = AuthModule = __decorate([
|
|
52
55
|
(0, common_1.Global)(),
|
|
53
56
|
(0, common_1.Module)({
|
|
54
|
-
imports: [request_context_1.RequestContextModule],
|
|
57
|
+
imports: [request_context_1.RequestContextModule, middleware_1.MiddlewareModule],
|
|
55
58
|
providers: [
|
|
56
59
|
auth_service_1.AuthService,
|
|
57
60
|
auth_middleware_1.AuthMiddleware,
|
|
@@ -73,6 +76,7 @@ exports.AuthModule = AuthModule = __decorate([
|
|
|
73
76
|
}),
|
|
74
77
|
__param(0, (0, common_1.Inject)(auth_constants_1.AUTH_TOKEN)),
|
|
75
78
|
__param(1, (0, common_1.Inject)(auth_module_definition_1.MODULE_OPTIONS_TOKEN)),
|
|
76
|
-
__metadata("design:paramtypes", [Object, Object
|
|
79
|
+
__metadata("design:paramtypes", [Object, Object, middleware_1.MiddlewareManager,
|
|
80
|
+
auth_middleware_1.AuthMiddleware])
|
|
77
81
|
], AuthModule);
|
|
78
82
|
//# sourceMappingURL=auth.module.js.map
|
package/dist/auth.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAA2C;AAC3C,sDAA4E;AAC5E,gEAGoC;AACpC,2CAAwD;AACxD,6CAA+C;AAC/C,2CAAiD;AAEjD,oEAA+D;AAC/D,qDAA8C;AAC9C,uDAAmD;AACnD,qEAGkC;AAClC,iDAA6C;AA0BtC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gDAAuB;IACrD,YAEmB,IAAU,EAEV,OAA0B,EAC1B,iBAAoC,EACpC,cAA8B;QAE/C,KAAK,EAAE,CAAC;QANS,SAAI,GAAJ,IAAI,CAAM;QAEV,YAAO,GAAP,OAAO,CAAmB;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAI/C,IAAI,CAAC,iBAAiB;aACnB,KAAK,CAAC,IAAA,oBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,kBAAkB,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,KAAK,KAAK,EAAE,CAAC;YAChD,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB;iBACjC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;iBAC1B,YAAY,CAAC,0CAAwB,CAAC,CAAC;YAE1C,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;gBAC3C,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC1D,CAAC;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;gBAC3C,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AA/BY,gCAAU;qBAAV,UAAU;IAvBtB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,sCAAoB,EAAE,6BAAgB,CAAC;QACjD,SAAS,EAAE;YACT,0BAAW;YACX,gCAAc;YACd;gBACE,OAAO,EAAE,2BAAU;gBACnB,MAAM,EAAE,CAAC,6CAAoB,EAAE,eAAQ,CAAC;gBACxC,UAAU,EAAE,CAAC,OAA0B,EAAE,GAAa,EAAE,EAAE,CACxD,IAAA,wBAAU,EAAC;oBACT,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO;oBACpD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;oBACzD,GAAG,OAAO;oBACV,QAAQ,EAAE,IAAA,mCAAe,EAAC;wBACxB,GAAG;wBACH,QAAQ,EAAE,OAAO,CAAC,QAAQ;qBAC3B,CAAC;iBACH,CAAC;aACL;SACF;QACD,OAAO,EAAE,CAAC,0BAAW,EAAE,gCAAc,CAAC;KACvC,CAAC;IAGG,WAAA,IAAA,eAAM,EAAC,2BAAU,CAAC,CAAA;IAElB,WAAA,IAAA,eAAM,EAAC,6CAAoB,CAAC,CAAA;qDAEO,8BAAiB;QACpB,gCAAc;GAPtC,UAAU,CA+BtB"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./auth.constants"), exports);
|
|
18
18
|
__exportStar(require("./auth.guard"), exports);
|
|
19
|
+
__exportStar(require("./auth.middleware"), exports);
|
|
19
20
|
__exportStar(require("./auth.module"), exports);
|
|
20
21
|
__exportStar(require("./auth.transaction-context"), exports);
|
|
21
22
|
__exportStar(require("./auth-module-options.interface"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,+CAA6B;AAC7B,gDAA8B;AAC9B,6DAA2C;AAC3C,kEAAgD;AAChD,+CAA6B;AAC7B,6CAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,+CAA6B;AAC7B,oDAAkC;AAClC,gDAA8B;AAC9B,6DAA2C;AAC3C,kEAAgD;AAChD,+CAA6B;AAC7B,6CAA2B"}
|