@nest-boot/auth 7.2.0 → 7.3.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.interceptor.d.ts +1 -3
- package/dist/auth.interceptor.js +7 -13
- package/dist/auth.interceptor.js.map +1 -1
- package/dist/auth.module.js +2 -0
- package/dist/auth.module.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { EntityManager } from "@mikro-orm/core";
|
|
2
2
|
import { type CallHandler, type ExecutionContext, type NestInterceptor } from "@nestjs/common";
|
|
3
3
|
import { Request, Response } from "express";
|
|
4
|
-
import { Observable } from "rxjs";
|
|
5
4
|
import { AuthTransactionContext } from "./auth.transaction-context";
|
|
6
5
|
export declare class AuthInterceptor implements NestInterceptor {
|
|
7
6
|
protected readonly em: EntityManager;
|
|
@@ -14,6 +13,5 @@ export declare class AuthInterceptor implements NestInterceptor {
|
|
|
14
13
|
*/
|
|
15
14
|
extendTransactionContext(transactionContext: AuthTransactionContext, executionContext: ExecutionContext): void | Promise<void>;
|
|
16
15
|
private setTransactionAuthContext;
|
|
17
|
-
|
|
18
|
-
intercept<T>(executionContext: ExecutionContext, next: CallHandler<T>): Observable<T>;
|
|
16
|
+
intercept<T>(executionContext: ExecutionContext, next: CallHandler<T>): import("rxjs").Observable<T>;
|
|
19
17
|
}
|
package/dist/auth.interceptor.js
CHANGED
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.AuthInterceptor = void 0;
|
|
13
13
|
const core_1 = require("@mikro-orm/core");
|
|
14
|
+
const request_context_1 = require("@nest-boot/request-context");
|
|
14
15
|
const common_1 = require("@nestjs/common");
|
|
15
16
|
const rxjs_1 = require("rxjs");
|
|
16
17
|
const auth_transaction_context_1 = require("./auth.transaction-context");
|
|
@@ -68,25 +69,18 @@ let AuthInterceptor = class AuthInterceptor {
|
|
|
68
69
|
await knex.raw(/* SQL */ `SET LOCAL ROLE anonymous;`);
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
|
-
|
|
72
|
-
// 检查是否已在事务中
|
|
72
|
+
intercept(executionContext, next) {
|
|
73
73
|
const knex = this.em.getTransactionContext();
|
|
74
74
|
if (knex) {
|
|
75
|
-
|
|
76
|
-
await this.setTransactionAuthContext(executionContext, knex);
|
|
75
|
+
return (0, rxjs_1.from)(this.setTransactionAuthContext(executionContext, knex)).pipe((0, rxjs_1.concatMap)(() => next.handle()));
|
|
77
76
|
}
|
|
78
77
|
else {
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
return (0, rxjs_1.from)(request_context_1.RequestContext.child(() => this.em.transactional(async (em) => {
|
|
79
|
+
request_context_1.RequestContext.set(core_1.EntityManager, em);
|
|
81
80
|
await this.setTransactionAuthContext(executionContext, em.getTransactionContext());
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
intercept(executionContext, next) {
|
|
86
|
-
if (["http", "graphql"].includes(executionContext.getType())) {
|
|
87
|
-
return (0, rxjs_1.from)(this.interceptAsync(executionContext)).pipe((0, rxjs_1.concatMap)(() => next.handle()));
|
|
81
|
+
return await (0, rxjs_1.lastValueFrom)(next.handle());
|
|
82
|
+
})));
|
|
88
83
|
}
|
|
89
|
-
return next.handle();
|
|
90
84
|
}
|
|
91
85
|
};
|
|
92
86
|
exports.AuthInterceptor = AuthInterceptor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../src/auth.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAgD;AAEhD,2CAKwB;AAExB,+
|
|
1
|
+
{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../src/auth.interceptor.ts"],"names":[],"mappings":"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"}
|
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 request_context_1 = require("@nest-boot/request-context");
|
|
17
18
|
const common_1 = require("@nestjs/common");
|
|
18
19
|
const core_2 = require("@nestjs/core");
|
|
19
20
|
const better_auth_1 = require("better-auth");
|
|
@@ -59,6 +60,7 @@ let AuthModule = class AuthModule extends auth_module_definition_1.ConfigurableM
|
|
|
59
60
|
exports.AuthModule = AuthModule;
|
|
60
61
|
exports.AuthModule = AuthModule = __decorate([
|
|
61
62
|
(0, common_1.Module)({
|
|
63
|
+
imports: [request_context_1.RequestContextModule],
|
|
62
64
|
providers: [authProvider, auth_service_1.AuthService],
|
|
63
65
|
exports: [auth_service_1.AuthService],
|
|
64
66
|
}),
|
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,2CAOwB;AACxB,uCAA+C;AAC/C,6CAA+C;AAC/C,2CAAiD;AAGjD,oEAA+D;AAC/D,qDAA8C;AAC9C,uDAAmD;AACnD,qEAGkC;AAClC,iDAA6C;AAG7C,MAAM,YAAY,GAAa;IAC7B,OAAO,EAAE,2BAAU;IACnB,MAAM,EAAE,CAAC,6CAAoB,EAAE,eAAQ,CAAC;IACxC,UAAU,EAAE,CAAC,OAA0B,EAAE,GAAa,EAAE,EAAE,CACxD,IAAA,wBAAU,EAAC;QACT,GAAG,OAAO;QACV,QAAQ,EAAE,IAAA,mCAAe,EAAC;YACxB,GAAG;YACH,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC;KACH,CAAC;CACL,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAA2C;AAC3C,gEAAkE;AAClE,2CAOwB;AACxB,uCAA+C;AAC/C,6CAA+C;AAC/C,2CAAiD;AAGjD,oEAA+D;AAC/D,qDAA8C;AAC9C,uDAAmD;AACnD,qEAGkC;AAClC,iDAA6C;AAG7C,MAAM,YAAY,GAAa;IAC7B,OAAO,EAAE,2BAAU;IACnB,MAAM,EAAE,CAAC,6CAAoB,EAAE,eAAQ,CAAC;IACxC,UAAU,EAAE,CAAC,OAA0B,EAAE,GAAa,EAAE,EAAE,CACxD,IAAA,wBAAU,EAAC;QACT,GAAG,OAAO;QACV,QAAQ,EAAE,IAAA,mCAAe,EAAC;YACxB,GAAG;YACH,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC;KACH,CAAC;CACL,CAAC;AAOK,IAAM,UAAU,GAAhB,MAAM,UACX,SAAQ,gDAAuB;IAG/B,YACmB,WAA4B,EAE5B,IAAU,EAEV,OAA0B;QAE3C,KAAK,EAAE,CAAC;QANS,gBAAW,GAAX,WAAW,CAAiB;QAE5B,SAAI,GAAJ,IAAI,CAAM;QAEV,YAAO,GAAP,OAAO,CAAmB;IAG7C,CAAC;IAED,SAAS,CAAC,QAA4B;QACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,gCAAc,CAAC,CAAC;QAE7C,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;YAC3C,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC1D,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,YAAY;QACV,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;QAEjD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,EAAW,CAAC;YAE/C,GAAG,CAAC,GAAG,CACL,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,kBAAkB,EAC3C,IAAA,oBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AApCY,gCAAU;qBAAV,UAAU;IALtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,sCAAoB,CAAC;QAC/B,SAAS,EAAE,CAAC,YAAY,EAAE,0BAAW,CAAC;QACtC,OAAO,EAAE,CAAC,0BAAW,CAAC;KACvB,CAAC;IAOG,WAAA,IAAA,eAAM,EAAC,2BAAU,CAAC,CAAA;IAElB,WAAA,IAAA,eAAM,EAAC,6CAAoB,CAAC,CAAA;qCAHC,sBAAe;GALpC,UAAU,CAoCtB"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export * from "./auth.constants";
|
|
2
2
|
export * from "./auth.guard";
|
|
3
|
+
export * from "./auth.interceptor";
|
|
3
4
|
export * from "./auth.module";
|
|
5
|
+
export * from "./auth.transaction-context";
|
|
4
6
|
export * from "./auth-module-options.interface";
|
|
5
7
|
export * from "./decorators";
|
|
6
8
|
export * from "./entities";
|
package/dist/index.js
CHANGED
|
@@ -16,7 +16,9 @@ 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.interceptor"), exports);
|
|
19
20
|
__exportStar(require("./auth.module"), exports);
|
|
21
|
+
__exportStar(require("./auth.transaction-context"), exports);
|
|
20
22
|
__exportStar(require("./auth-module-options.interface"), exports);
|
|
21
23
|
__exportStar(require("./decorators"), exports);
|
|
22
24
|
__exportStar(require("./entities"), 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,kEAAgD;AAChD,+CAA6B;AAC7B,6CAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,+CAA6B;AAC7B,qDAAmC;AACnC,gDAA8B;AAC9B,6DAA2C;AAC3C,kEAAgD;AAChD,+CAA6B;AAC7B,6CAA2B"}
|