@ambushsoftworks/nestjs-auth-graphql 0.9.1 → 0.11.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/CHANGELOG.md +231 -0
- package/README.md +164 -8
- package/dist/auth.module.d.ts +10 -0
- package/dist/auth.module.d.ts.map +1 -1
- package/dist/auth.module.js +69 -2
- package/dist/auth.module.js.map +1 -1
- package/dist/exceptions/oauth.exceptions.d.ts +4 -1
- package/dist/exceptions/oauth.exceptions.d.ts.map +1 -1
- package/dist/exceptions/oauth.exceptions.js +12 -1
- package/dist/exceptions/oauth.exceptions.js.map +1 -1
- package/dist/guards/create-auth-guard.d.ts.map +1 -1
- package/dist/guards/create-auth-guard.js +3 -6
- package/dist/guards/create-auth-guard.js.map +1 -1
- package/dist/guards/csrf.guard.d.ts +2 -0
- package/dist/guards/csrf.guard.d.ts.map +1 -1
- package/dist/guards/csrf.guard.js +26 -5
- package/dist/guards/csrf.guard.js.map +1 -1
- package/dist/guards/jwt-auth.guard.d.ts +2 -1
- package/dist/guards/jwt-auth.guard.d.ts.map +1 -1
- package/dist/guards/jwt-auth.guard.js +6 -3
- package/dist/guards/jwt-auth.guard.js.map +1 -1
- package/dist/guards/permission.guard.js +2 -2
- package/dist/guards/permission.guard.js.map +1 -1
- package/dist/guards/tenant.guard.d.ts.map +1 -1
- package/dist/guards/tenant.guard.js +3 -0
- package/dist/guards/tenant.guard.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces/refresh-retry-cache.interface.d.ts +6 -0
- package/dist/interfaces/refresh-retry-cache.interface.d.ts.map +1 -0
- package/dist/interfaces/refresh-retry-cache.interface.js +3 -0
- package/dist/interfaces/refresh-retry-cache.interface.js.map +1 -0
- package/dist/interfaces/refresh-token-repository.interface.d.ts.map +1 -1
- package/dist/middleware/realm.middleware.d.ts +7 -2
- package/dist/middleware/realm.middleware.d.ts.map +1 -1
- package/dist/middleware/realm.middleware.js +60 -14
- package/dist/middleware/realm.middleware.js.map +1 -1
- package/dist/resolvers/base-auth.resolver.d.ts.map +1 -1
- package/dist/resolvers/base-auth.resolver.js +2 -1
- package/dist/resolvers/base-auth.resolver.js.map +1 -1
- package/dist/resolvers/oauth.controller.d.ts.map +1 -1
- package/dist/resolvers/oauth.controller.js +27 -17
- package/dist/resolvers/oauth.controller.js.map +1 -1
- package/dist/resolvers/rest-error.interceptor.d.ts +7 -0
- package/dist/resolvers/rest-error.interceptor.d.ts.map +1 -0
- package/dist/resolvers/rest-error.interceptor.js +36 -0
- package/dist/resolvers/rest-error.interceptor.js.map +1 -0
- package/dist/services/auth.service.d.ts +2 -3
- package/dist/services/auth.service.d.ts.map +1 -1
- package/dist/services/auth.service.js +15 -10
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/in-memory-refresh-retry-cache.d.ts +11 -0
- package/dist/services/in-memory-refresh-retry-cache.d.ts.map +1 -0
- package/dist/services/in-memory-refresh-retry-cache.js +45 -0
- package/dist/services/in-memory-refresh-retry-cache.js.map +1 -0
- package/dist/services/refresh-token.service.d.ts +13 -14
- package/dist/services/refresh-token.service.d.ts.map +1 -1
- package/dist/services/refresh-token.service.js +112 -33
- package/dist/services/refresh-token.service.js.map +1 -1
- package/dist/strategies/api-key.strategy.d.ts.map +1 -1
- package/dist/strategies/api-key.strategy.js +1 -1
- package/dist/strategies/api-key.strategy.js.map +1 -1
- package/dist/strategies/jwt.strategy.d.ts +3 -1
- package/dist/strategies/jwt.strategy.d.ts.map +1 -1
- package/dist/strategies/jwt.strategy.js +15 -11
- package/dist/strategies/jwt.strategy.js.map +1 -1
- package/dist/strategies/noop-facebook.strategy.d.ts.map +1 -1
- package/dist/strategies/noop-facebook.strategy.js +2 -1
- package/dist/strategies/noop-facebook.strategy.js.map +1 -1
- package/dist/strategies/noop-google.strategy.d.ts.map +1 -1
- package/dist/strategies/noop-google.strategy.js +2 -1
- package/dist/strategies/noop-google.strategy.js.map +1 -1
- package/dist/test-utils/execution-contexts.d.ts +7 -0
- package/dist/test-utils/execution-contexts.d.ts.map +1 -0
- package/dist/test-utils/execution-contexts.js +41 -0
- package/dist/test-utils/execution-contexts.js.map +1 -0
- package/dist/utils/cookies.d.ts +2 -0
- package/dist/utils/cookies.d.ts.map +1 -0
- package/dist/utils/cookies.js +34 -0
- package/dist/utils/cookies.js.map +1 -0
- package/dist/utils/execution-context.d.ts +3 -1
- package/dist/utils/execution-context.d.ts.map +1 -1
- package/dist/utils/execution-context.js +39 -4
- package/dist/utils/execution-context.js.map +1 -1
- package/dist/utils/request-realm.d.ts +2 -0
- package/dist/utils/request-realm.d.ts.map +1 -0
- package/dist/utils/request-realm.js +12 -0
- package/dist/utils/request-realm.js.map +1 -0
- package/package.json +13 -4
|
@@ -1,9 +1,14 @@
|
|
|
1
|
-
import { NestMiddleware } from '@nestjs/common';
|
|
1
|
+
import { NestMiddleware, Logger } from '@nestjs/common';
|
|
2
|
+
import type { AuthModuleOptions } from '../auth.module';
|
|
2
3
|
import { IRealmExtractor } from '../interfaces/realm-extractor.interface';
|
|
4
|
+
type RealmSkip = NonNullable<AuthModuleOptions['realm']>['skip'];
|
|
3
5
|
export declare class RealmMiddleware implements NestMiddleware {
|
|
4
6
|
private readonly realmExtractor?;
|
|
7
|
+
private readonly options?;
|
|
5
8
|
private readonly logger;
|
|
6
|
-
constructor(realmExtractor?: IRealmExtractor | undefined);
|
|
9
|
+
constructor(realmExtractor?: IRealmExtractor | undefined, options?: AuthModuleOptions | undefined);
|
|
7
10
|
use(req: Record<string, any>, _res: any, next: () => void): Promise<void>;
|
|
8
11
|
}
|
|
12
|
+
export declare function resolveRealm(req: Record<string, any>, extractor: IRealmExtractor, skip: RealmSkip, logger: Logger): void | Promise<void>;
|
|
13
|
+
export {};
|
|
9
14
|
//# sourceMappingURL=realm.middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"realm.middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/realm.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,
|
|
1
|
+
{"version":3,"file":"realm.middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/realm.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EAId,MAAM,EACP,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,KAAK,SAAS,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAwBjE,qBACa,eAAgB,YAAW,cAAc;IAMlD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAGhC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAR3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;gBAKxC,cAAc,CAAC,EAAE,eAAe,YAAA,EAGhC,OAAO,CAAC,EAAE,iBAAiB,YAAA;IAGxC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAWhF;AAUD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACxB,SAAS,EAAE,eAAe,EAC1B,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,GACb,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBtB"}
|
|
@@ -14,30 +14,23 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var RealmMiddleware_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.RealmMiddleware = void 0;
|
|
17
|
+
exports.resolveRealm = resolveRealm;
|
|
17
18
|
const common_1 = require("@nestjs/common");
|
|
18
19
|
const constants_1 = require("../constants");
|
|
19
20
|
let RealmMiddleware = RealmMiddleware_1 = class RealmMiddleware {
|
|
20
|
-
constructor(realmExtractor) {
|
|
21
|
+
constructor(realmExtractor, options) {
|
|
21
22
|
this.realmExtractor = realmExtractor;
|
|
23
|
+
this.options = options;
|
|
22
24
|
this.logger = new common_1.Logger(RealmMiddleware_1.name);
|
|
23
25
|
}
|
|
24
26
|
async use(req, _res, next) {
|
|
25
27
|
if (!this.realmExtractor) {
|
|
26
28
|
return next();
|
|
27
29
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
realm = result instanceof Promise ? await result : result;
|
|
30
|
+
const pending = resolveRealm(req, this.realmExtractor, this.options?.realm?.skip, this.logger);
|
|
31
|
+
if (pending instanceof Promise) {
|
|
32
|
+
await pending;
|
|
32
33
|
}
|
|
33
|
-
catch (err) {
|
|
34
|
-
this.logger.error(`Realm extractor failed: ${err instanceof Error ? err.message : String(err)}`, err instanceof Error ? err.stack : undefined);
|
|
35
|
-
throw new common_1.BadRequestException('Realm required');
|
|
36
|
-
}
|
|
37
|
-
if (realm === null || realm === undefined) {
|
|
38
|
-
throw new common_1.BadRequestException('Realm required');
|
|
39
|
-
}
|
|
40
|
-
req._realm = realm;
|
|
41
34
|
next();
|
|
42
35
|
}
|
|
43
36
|
};
|
|
@@ -46,6 +39,59 @@ exports.RealmMiddleware = RealmMiddleware = RealmMiddleware_1 = __decorate([
|
|
|
46
39
|
(0, common_1.Injectable)(),
|
|
47
40
|
__param(0, (0, common_1.Optional)()),
|
|
48
41
|
__param(0, (0, common_1.Inject)(constants_1.REALM_EXTRACTOR)),
|
|
49
|
-
|
|
42
|
+
__param(1, (0, common_1.Optional)()),
|
|
43
|
+
__param(1, (0, common_1.Inject)(constants_1.AUTH_MODULE_OPTIONS)),
|
|
44
|
+
__metadata("design:paramtypes", [Object, Object])
|
|
50
45
|
], RealmMiddleware);
|
|
46
|
+
function resolveRealm(req, extractor, skip, logger) {
|
|
47
|
+
if (isSkipped(req, skip, logger)) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
let result;
|
|
51
|
+
try {
|
|
52
|
+
result = extractor.extractRealm(req);
|
|
53
|
+
}
|
|
54
|
+
catch (err) {
|
|
55
|
+
throw extractorFailed(err, logger);
|
|
56
|
+
}
|
|
57
|
+
if (result instanceof Promise) {
|
|
58
|
+
return result.then((realm) => attachRealm(req, realm), (err) => {
|
|
59
|
+
throw extractorFailed(err, logger);
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
attachRealm(req, result);
|
|
63
|
+
}
|
|
64
|
+
function attachRealm(req, realm) {
|
|
65
|
+
if (realm === null || realm === undefined) {
|
|
66
|
+
throw new common_1.BadRequestException('Realm required');
|
|
67
|
+
}
|
|
68
|
+
req._realm = realm;
|
|
69
|
+
}
|
|
70
|
+
function extractorFailed(err, logger) {
|
|
71
|
+
logger.error(`Realm extractor failed: ${err instanceof Error ? err.message : String(err)}`, err instanceof Error ? err.stack : undefined);
|
|
72
|
+
return new common_1.BadRequestException('Realm required');
|
|
73
|
+
}
|
|
74
|
+
function isSkipped(req, skip, logger) {
|
|
75
|
+
if (!skip) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
let result;
|
|
79
|
+
try {
|
|
80
|
+
result = skip(requestPath(req), req);
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
logger.error(`realm.skip threw, so the request still requires a realm: ${err instanceof Error ? err.message : String(err)}`, err instanceof Error ? err.stack : undefined);
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
if (typeof result !== 'boolean') {
|
|
87
|
+
logger.error(`realm.skip must return a boolean synchronously, but returned ${result instanceof Promise ? 'a Promise' : typeof result}, so the request still requires a realm.`);
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
return result;
|
|
91
|
+
}
|
|
92
|
+
function requestPath(req) {
|
|
93
|
+
const url = req.originalUrl ?? req.url ?? '';
|
|
94
|
+
const queryStart = url.indexOf('?');
|
|
95
|
+
return queryStart === -1 ? url : url.slice(0, queryStart);
|
|
96
|
+
}
|
|
51
97
|
//# sourceMappingURL=realm.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"realm.middleware.js","sourceRoot":"","sources":["../../src/middleware/realm.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"realm.middleware.js","sourceRoot":"","sources":["../../src/middleware/realm.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-auth.resolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/base-auth.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoD,MAAM,gBAAgB,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"base-auth.resolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/base-auth.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoD,MAAM,gBAAgB,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,qCAAqC,CAAC;AA6CjF,8BAAsB,gBAAgB,CAAC,CAAC,SAAS,SAAS;IAItD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,2BAA2B;IAEpE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,eAAe,CAAC,SAAS,CAAC;IAE7D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,WAAW;IARhD,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAqC;gBAGzC,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,2BAA2B,EAEjD,cAAc,EAAE,eAAe,CAAC,SAAS,CAAC,EAE1C,cAAc,EAAE,WAAW;IAShD,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;IAY/D,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAQ/D,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI;IAYjD,SAAS,CAAC,iBAAiB,CACzB,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,SAAS,CAAA;KAAE,EACtE,OAAO,CAAC,EAAE,GAAG,GACZ,gBAAgB,CAAC,CAAC,CAAC;IAoBtB,SAAS,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI;cAmCpC,aAAa,CAC3B,KAAK,EAAE,gBAAgB,EACvB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;cAsCf,YAAY,CAC1B,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;cA0Cf,mBAAmB,CACjC,KAAK,EAAE,sBAAsB,EAC7B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAiB/B,OAAO,CAAC,mBAAmB;cAmCX,aAAa,CAC3B,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,CAAC,EACP,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,mBAAmB,CAAC;cA6Cf,gBAAgB,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;cAoCzE,6BAA6B,CAC3C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,sBAAsB,CAAC;cAgClB,kBAAkB,CAChC,KAAK,EAAE,qBAAqB,EAC5B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,wBAAwB,CAAC;cA0BpB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,wBAAwB,CAAC;cA2BpB,4BAA4B,CAC1C,KAAK,EAAE,+BAA+B,EACtC,IAAI,EAAE,CAAC,EACP,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,8BAA8B,CAAC;cA6B1B,kBAAkB,CAChC,KAAK,EAAE,qBAAqB,EAC5B,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,wBAAwB,CAAC;cAuBpB,8BAA8B,CAC5C,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,8BAA8B,CAAC;cAsB1B,wBAAwB,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;cAsBpE,8BAA8B,CAC5C,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,4BAA4B,CAAC;cAqDxB,2BAA2B,CACzC,KAAK,EAAE,8BAA8B,EACrC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,0BAA0B,CAAC;cAoCtB,oBAAoB,CAClC,KAAK,EAAE,uBAAuB,EAC9B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,0BAA0B,CAAC;cA6DtB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;cA2BjC,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;cAqDjD,6BAA6B,CAC3C,KAAK,EAAE,gCAAgC,EACvC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAqBhC"}
|
|
@@ -20,6 +20,7 @@ const auth_logger_interface_1 = require("../interfaces/auth-logger.interface");
|
|
|
20
20
|
const constants_1 = require("../constants");
|
|
21
21
|
const request_helpers_1 = require("../utils/request-helpers");
|
|
22
22
|
const personal_data_1 = require("../utils/personal-data");
|
|
23
|
+
const request_realm_1 = require("../utils/request-realm");
|
|
23
24
|
let BaseAuthResolver = class BaseAuthResolver {
|
|
24
25
|
constructor(authService, bruteForceProtection, userRepository, securityLogger) {
|
|
25
26
|
this.authService = authService;
|
|
@@ -32,7 +33,7 @@ let BaseAuthResolver = class BaseAuthResolver {
|
|
|
32
33
|
return context?.res ?? context?.req?.res;
|
|
33
34
|
}
|
|
34
35
|
getRealmFromContext(context) {
|
|
35
|
-
return context?.req
|
|
36
|
+
return (0, request_realm_1.realmForRequest)(context?.req, this.authService.realmsEnabled);
|
|
36
37
|
}
|
|
37
38
|
setSecurityHeaders(context) {
|
|
38
39
|
const res = this.getResponseFromContext(context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-auth.resolver.js","sourceRoot":"","sources":["../../src/resolvers/base-auth.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0F;AAC1F,2DAAuD;AAsBvD,+FAAyF;AAGzF,+EAAiF;AACjF,4CAA4D;AAC5D,8DAA4D;AAC5D,0DAA+D;
|
|
1
|
+
{"version":3,"file":"base-auth.resolver.js","sourceRoot":"","sources":["../../src/resolvers/base-auth.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.controller.d.ts","sourceRoot":"","sources":["../../src/resolvers/oauth.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauth.controller.d.ts","sourceRoot":"","sources":["../../src/resolvers/oauth.controller.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,OAAO,EAAE,WAAW,EAAiB,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAO1E,qBAAa,eAAe;IAG1B,OAAO,EAAG,MAAM,CAAC;CAClB;AAED,qBAAa,iBAAiB;IAG5B,WAAW,EAAG,MAAM,CAAC;CACtB;AAED,qBAAa,oBAAoB;IAC/B,WAAW,EAAG,MAAM,CAAC;IACrB,YAAY,EAAG,MAAM,CAAC;IACtB,IAAI,EAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AA6BD,qBAEa,eAAe;IAIxB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,wBAAwB;IAEhC,OAAO,CAAC,cAAc;IAEtB,OAAO,CAAC,cAAc;IAXxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;gBAGjD,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,2BAA2B,EACjD,wBAAwB,EAAE,wBAAwB,EAElD,cAAc,EAAE,eAAe,EAE/B,cAAc,EAAE,WAAW;IAe/B,YAAY,CACR,IAAI,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,GACtB,OAAO,CAAC,oBAAoB,CAAC;IAmHhC,OAAO,CAAC,sBAAsB;IA0CxB,cAAc,CACV,IAAI,EAAE,iBAAiB,EACxB,OAAO,EAAE,OAAO,GACtB,OAAO,CAAC,oBAAoB,CAAC;CA0NjC"}
|
|
@@ -23,10 +23,13 @@ const facebook_strategy_1 = require("../strategies/facebook.strategy");
|
|
|
23
23
|
const brute_force_protection_service_1 = require("../services/brute-force-protection.service");
|
|
24
24
|
const oauth_linking_token_service_1 = require("../services/oauth-linking-token.service");
|
|
25
25
|
const oauth_exceptions_1 = require("../exceptions/oauth.exceptions");
|
|
26
|
+
const account_locked_exception_1 = require("../exceptions/account-locked.exception");
|
|
26
27
|
const auth_logger_interface_1 = require("../interfaces/auth-logger.interface");
|
|
27
28
|
const constants_1 = require("../constants");
|
|
28
29
|
const request_helpers_1 = require("../utils/request-helpers");
|
|
29
30
|
const personal_data_1 = require("../utils/personal-data");
|
|
31
|
+
const request_realm_1 = require("../utils/request-realm");
|
|
32
|
+
const rest_error_interceptor_1 = require("./rest-error.interceptor");
|
|
30
33
|
class GoogleSignInDto {
|
|
31
34
|
}
|
|
32
35
|
exports.GoogleSignInDto = GoogleSignInDto;
|
|
@@ -46,6 +49,13 @@ __decorate([
|
|
|
46
49
|
class GoogleSignInResponse {
|
|
47
50
|
}
|
|
48
51
|
exports.GoogleSignInResponse = GoogleSignInResponse;
|
|
52
|
+
function ipRateLimitExceeded() {
|
|
53
|
+
return new common_1.HttpException({
|
|
54
|
+
message: 'Too many requests. Please try again later.',
|
|
55
|
+
code: 'RATE_LIMIT_EXCEEDED',
|
|
56
|
+
statusCode: common_1.HttpStatus.TOO_MANY_REQUESTS,
|
|
57
|
+
}, common_1.HttpStatus.TOO_MANY_REQUESTS);
|
|
58
|
+
}
|
|
49
59
|
let OAuthController = OAuthController_1 = class OAuthController {
|
|
50
60
|
constructor(authService, googleStrategy, facebookStrategy, bruteForceProtection, oauthLinkingTokenService, userRepository, securityLogger) {
|
|
51
61
|
this.authService = authService;
|
|
@@ -58,6 +68,7 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
58
68
|
this.logger = new common_1.Logger(OAuthController_1.name);
|
|
59
69
|
}
|
|
60
70
|
async googleSignIn(body, request) {
|
|
71
|
+
const realm = (0, request_realm_1.realmForRequest)(request, this.authService.realmsEnabled);
|
|
61
72
|
const ipAddress = (0, request_helpers_1.extractIpAddress)(request);
|
|
62
73
|
this.logger.log(`[OAUTH_CONTROLLER] Google Sign-In attempt (${(0, personal_data_1.ipForLog)(ipAddress)})`);
|
|
63
74
|
this.securityLogger.log(auth_logger_interface_1.SecurityEvent.OAUTH_INITIATED, {
|
|
@@ -66,18 +77,17 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
66
77
|
});
|
|
67
78
|
const googleProfile = await this.googleStrategy.verifyIdToken(body.idToken);
|
|
68
79
|
this.logger.log(`[OAUTH_CONTROLLER] Google ID token verified (${(0, personal_data_1.emailForLog)(googleProfile.email)})`);
|
|
69
|
-
if (await this.bruteForceProtection.isAccountLocked(googleProfile.email)) {
|
|
70
|
-
const remainingTime = await this.bruteForceProtection.getRemainingLockoutTime(googleProfile.email);
|
|
80
|
+
if (await this.bruteForceProtection.isAccountLocked(googleProfile.email, realm)) {
|
|
81
|
+
const remainingTime = await this.bruteForceProtection.getRemainingLockoutTime(googleProfile.email, realm);
|
|
71
82
|
this.logger.warn(`[OAUTH_CONTROLLER] Account locked (${(0, personal_data_1.emailForLog)(googleProfile.email)}), remaining: ${remainingTime}s`);
|
|
72
|
-
throw new
|
|
83
|
+
throw new account_locked_exception_1.AccountLockedException(remainingTime);
|
|
73
84
|
}
|
|
74
|
-
if (await this.bruteForceProtection.checkIpRateLimit(ipAddress)) {
|
|
85
|
+
if (await this.bruteForceProtection.checkIpRateLimit(ipAddress, realm)) {
|
|
75
86
|
this.logger.warn(`[OAUTH_CONTROLLER] IP rate limit exceeded (${(0, personal_data_1.ipForLog)(ipAddress)})`);
|
|
76
|
-
throw
|
|
87
|
+
throw ipRateLimitExceeded();
|
|
77
88
|
}
|
|
78
89
|
let result;
|
|
79
90
|
try {
|
|
80
|
-
const realm = request._realm;
|
|
81
91
|
result = await this.authService.handleSocialLogin('google', googleProfile, ipAddress, realm);
|
|
82
92
|
this.logger.log(`[OAUTH_CONTROLLER] Google Sign-In successful for user: ${result.user.id}`);
|
|
83
93
|
this.securityLogger.log(auth_logger_interface_1.SecurityEvent.OAUTH_SUCCESS, {
|
|
@@ -103,7 +113,7 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
103
113
|
});
|
|
104
114
|
throw error;
|
|
105
115
|
}
|
|
106
|
-
await this.bruteForceProtection.resetFailedAttempts(googleProfile.email);
|
|
116
|
+
await this.bruteForceProtection.resetFailedAttempts(googleProfile.email, realm);
|
|
107
117
|
return {
|
|
108
118
|
accessToken: result.accessToken,
|
|
109
119
|
refreshToken: result.refreshToken,
|
|
@@ -137,6 +147,7 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
137
147
|
};
|
|
138
148
|
}
|
|
139
149
|
async facebookSignIn(body, request) {
|
|
150
|
+
const realm = (0, request_realm_1.realmForRequest)(request, this.authService.realmsEnabled);
|
|
140
151
|
const ipAddress = (0, request_helpers_1.extractIpAddress)(request);
|
|
141
152
|
this.logger.log(`[OAUTH_CONTROLLER] Facebook Sign-In attempt (${(0, personal_data_1.ipForLog)(ipAddress)})`);
|
|
142
153
|
this.securityLogger.log(auth_logger_interface_1.SecurityEvent.OAUTH_INITIATED, {
|
|
@@ -146,7 +157,6 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
146
157
|
const facebookProfile = await this.facebookStrategy.verifyAccessToken(body.accessToken);
|
|
147
158
|
if (!facebookProfile.email) {
|
|
148
159
|
this.logger.warn(`[OAUTH_CONTROLLER] Facebook email missing for facebookId: ${facebookProfile.facebookId}`);
|
|
149
|
-
const realm = request._realm;
|
|
150
160
|
const existingUser = await this.userRepository.findByOAuthProvider('facebook', facebookProfile.facebookId, realm);
|
|
151
161
|
if (existingUser) {
|
|
152
162
|
this.logger.log(`[OAUTH_CONTROLLER] Found existing Facebook user by facebookId: ${existingUser.id}, using their stored email`);
|
|
@@ -178,7 +188,7 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
178
188
|
});
|
|
179
189
|
throw error;
|
|
180
190
|
}
|
|
181
|
-
await this.bruteForceProtection.resetFailedAttempts(existingUser.email);
|
|
191
|
+
await this.bruteForceProtection.resetFailedAttempts(existingUser.email, realm);
|
|
182
192
|
return {
|
|
183
193
|
accessToken: result.accessToken,
|
|
184
194
|
refreshToken: result.refreshToken,
|
|
@@ -191,23 +201,22 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
191
201
|
throw new oauth_exceptions_1.OAuthMissingDataException('Facebook', 'email', fallbackToken, facebookProfile.facebookId);
|
|
192
202
|
}
|
|
193
203
|
this.logger.log(`[OAUTH_CONTROLLER] Facebook access token verified (${(0, personal_data_1.emailForLog)(facebookProfile.email)})`);
|
|
194
|
-
if (await this.bruteForceProtection.isAccountLocked(facebookProfile.email)) {
|
|
195
|
-
const remainingTime = await this.bruteForceProtection.getRemainingLockoutTime(facebookProfile.email);
|
|
204
|
+
if (await this.bruteForceProtection.isAccountLocked(facebookProfile.email, realm)) {
|
|
205
|
+
const remainingTime = await this.bruteForceProtection.getRemainingLockoutTime(facebookProfile.email, realm);
|
|
196
206
|
this.logger.warn(`[OAUTH_CONTROLLER] Account locked (${(0, personal_data_1.emailForLog)(facebookProfile.email)}), remaining: ${remainingTime}s`);
|
|
197
|
-
throw new
|
|
207
|
+
throw new account_locked_exception_1.AccountLockedException(remainingTime);
|
|
198
208
|
}
|
|
199
|
-
if (await this.bruteForceProtection.checkIpRateLimit(ipAddress)) {
|
|
209
|
+
if (await this.bruteForceProtection.checkIpRateLimit(ipAddress, realm)) {
|
|
200
210
|
this.logger.warn(`[OAUTH_CONTROLLER] IP rate limit exceeded (${(0, personal_data_1.ipForLog)(ipAddress)})`);
|
|
201
|
-
throw
|
|
211
|
+
throw ipRateLimitExceeded();
|
|
202
212
|
}
|
|
203
213
|
let result;
|
|
204
214
|
try {
|
|
205
|
-
const facebookRealm = request._realm;
|
|
206
215
|
result = await this.authService.handleSocialLogin('facebook', {
|
|
207
216
|
...facebookProfile,
|
|
208
217
|
email: facebookProfile.email,
|
|
209
218
|
emailVerified: facebookProfile.emailVerified,
|
|
210
|
-
}, ipAddress,
|
|
219
|
+
}, ipAddress, realm);
|
|
211
220
|
this.logger.log(`[OAUTH_CONTROLLER] Facebook Sign-In successful for user: ${result.user.id}`);
|
|
212
221
|
this.securityLogger.log(auth_logger_interface_1.SecurityEvent.OAUTH_SUCCESS, {
|
|
213
222
|
userId: result.user.id,
|
|
@@ -232,7 +241,7 @@ let OAuthController = OAuthController_1 = class OAuthController {
|
|
|
232
241
|
});
|
|
233
242
|
throw error;
|
|
234
243
|
}
|
|
235
|
-
await this.bruteForceProtection.resetFailedAttempts(facebookProfile.email);
|
|
244
|
+
await this.bruteForceProtection.resetFailedAttempts(facebookProfile.email, realm);
|
|
236
245
|
return {
|
|
237
246
|
accessToken: result.accessToken,
|
|
238
247
|
refreshToken: result.refreshToken,
|
|
@@ -263,6 +272,7 @@ __decorate([
|
|
|
263
272
|
], OAuthController.prototype, "facebookSignIn", null);
|
|
264
273
|
exports.OAuthController = OAuthController = OAuthController_1 = __decorate([
|
|
265
274
|
(0, common_1.Controller)('auth'),
|
|
275
|
+
(0, common_1.UseInterceptors)(rest_error_interceptor_1.RestErrorInterceptor),
|
|
266
276
|
__param(5, (0, common_1.Inject)(constants_1.USER_REPOSITORY)),
|
|
267
277
|
__param(6, (0, common_1.Inject)(constants_1.AUTH_LOGGER)),
|
|
268
278
|
__metadata("design:paramtypes", [auth_service_1.AuthService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.controller.js","sourceRoot":"","sources":["../../src/resolvers/oauth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"oauth.controller.js","sourceRoot":"","sources":["../../src/resolvers/oauth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
|
|
2
|
+
import { Observable } from 'rxjs';
|
|
3
|
+
export declare class RestErrorInterceptor implements NestInterceptor {
|
|
4
|
+
intercept(_context: ExecutionContext, next: CallHandler): Observable<unknown>;
|
|
5
|
+
}
|
|
6
|
+
export declare function toHttpException(error: unknown): unknown;
|
|
7
|
+
//# sourceMappingURL=rest-error.interceptor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rest-error.interceptor.d.ts","sourceRoot":"","sources":["../../src/resolvers/rest-error.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGhB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,UAAU,EAAc,MAAM,MAAM,CAAC;AAY9C,qBACa,oBAAqB,YAAW,eAAe;IAC1D,SAAS,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC;CAG9E;AASD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAavD"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.RestErrorInterceptor = void 0;
|
|
10
|
+
exports.toHttpException = toHttpException;
|
|
11
|
+
const common_1 = require("@nestjs/common");
|
|
12
|
+
const graphql_1 = require("graphql");
|
|
13
|
+
const rxjs_1 = require("rxjs");
|
|
14
|
+
const operators_1 = require("rxjs/operators");
|
|
15
|
+
let RestErrorInterceptor = class RestErrorInterceptor {
|
|
16
|
+
intercept(_context, next) {
|
|
17
|
+
return next.handle().pipe((0, operators_1.catchError)((error) => (0, rxjs_1.throwError)(() => toHttpException(error))));
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
exports.RestErrorInterceptor = RestErrorInterceptor;
|
|
21
|
+
exports.RestErrorInterceptor = RestErrorInterceptor = __decorate([
|
|
22
|
+
(0, common_1.Injectable)()
|
|
23
|
+
], RestErrorInterceptor);
|
|
24
|
+
function toHttpException(error) {
|
|
25
|
+
if (!(error instanceof graphql_1.GraphQLError)) {
|
|
26
|
+
return error;
|
|
27
|
+
}
|
|
28
|
+
const statusCode = error.extensions?.statusCode;
|
|
29
|
+
if (typeof statusCode !== 'number' || statusCode < 400 || statusCode > 599) {
|
|
30
|
+
return error;
|
|
31
|
+
}
|
|
32
|
+
return new common_1.HttpException({ message: error.message, ...error.extensions }, statusCode, {
|
|
33
|
+
cause: error,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=rest-error.interceptor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rest-error.interceptor.js","sourceRoot":"","sources":["../../src/resolvers/rest-error.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAkCA,0CAaC;AA/CD,2CAMwB;AACxB,qCAAuC;AACvC,+BAA8C;AAC9C,8CAA4C;AAYrC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,SAAS,CAAC,QAA0B,EAAE,IAAiB;QACrD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAA,sBAAU,EAAC,CAAC,KAAc,EAAE,EAAE,CAAC,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACtG,CAAC;CACF,CAAA;AAJY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAIhC;AASD,SAAgB,eAAe,CAAC,KAAc;IAC5C,IAAI,CAAC,CAAC,KAAK,YAAY,sBAAY,CAAC,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC;IAChD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,GAAG,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,sBAAa,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE;QACpF,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -125,6 +125,7 @@ export declare class AuthService {
|
|
|
125
125
|
user: IAuthUser;
|
|
126
126
|
}>;
|
|
127
127
|
get cookieAuthEnabled(): boolean;
|
|
128
|
+
get realmsEnabled(): boolean;
|
|
128
129
|
issueAuthSession(userId: string, res?: {
|
|
129
130
|
cookie: (name: string, value: string, options: Record<string, unknown>) => void;
|
|
130
131
|
}, realm?: string): Promise<{
|
|
@@ -134,9 +135,7 @@ export declare class AuthService {
|
|
|
134
135
|
setAuthCookies(res: {
|
|
135
136
|
cookie: (name: string, value: string, options: Record<string, unknown>) => void;
|
|
136
137
|
}, accessToken: string, refreshToken: string): void;
|
|
137
|
-
readRefreshTokenFromCookie(req:
|
|
138
|
-
cookies?: Record<string, string>;
|
|
139
|
-
} | undefined): string | null;
|
|
138
|
+
readRefreshTokenFromCookie(req: Record<string, any> | undefined): string | null;
|
|
140
139
|
clearAuthCookies(res: {
|
|
141
140
|
clearCookie: (name: string, options: Record<string, unknown>) => void;
|
|
142
141
|
}): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ const common_1 = require("@nestjs/common");
|
|
|
51
51
|
const jwt_1 = require("@nestjs/jwt");
|
|
52
52
|
const account_locked_exception_1 = require("../exceptions/account-locked.exception");
|
|
53
53
|
const account_inactive_exception_1 = require("../exceptions/account-inactive.exception");
|
|
54
|
+
const cookies_1 = require("../utils/cookies");
|
|
54
55
|
const account_status_1 = require("../utils/account-status");
|
|
55
56
|
const oauth_exceptions_1 = require("../exceptions/oauth.exceptions");
|
|
56
57
|
const refresh_token_service_1 = require("./refresh-token.service");
|
|
@@ -216,12 +217,9 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
216
217
|
async refreshToken(refreshToken, ipAddress, realm) {
|
|
217
218
|
try {
|
|
218
219
|
const refreshTokenHash = this.refreshTokenService.hashToken(refreshToken);
|
|
219
|
-
const cachedResult = this.refreshTokenService.getCachedRefreshResult(refreshTokenHash);
|
|
220
|
+
const cachedResult = await this.refreshTokenService.getCachedRefreshResult(refreshTokenHash);
|
|
220
221
|
if (cachedResult) {
|
|
221
|
-
const
|
|
222
|
-
const user = storedToken
|
|
223
|
-
? await this.userRepository.findById(storedToken.userId)
|
|
224
|
-
: null;
|
|
222
|
+
const user = await this.userRepository.findById(cachedResult.userId);
|
|
225
223
|
if (!user) {
|
|
226
224
|
throw new common_1.UnauthorizedException('Invalid refresh token');
|
|
227
225
|
}
|
|
@@ -264,12 +262,16 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
264
262
|
throw new common_1.UnauthorizedException('User not found');
|
|
265
263
|
}
|
|
266
264
|
this.assertUserActive(user, 'refresh');
|
|
267
|
-
const { accessToken: newAccessToken, refreshToken: newRefreshToken
|
|
265
|
+
const { accessToken: newAccessToken, refreshToken: newRefreshToken } = await this.generateTokenPairAndStore(user, realm);
|
|
266
|
+
await this.refreshTokenService.cacheRefreshResult(refreshTokenHash, {
|
|
267
|
+
userId: user.id,
|
|
268
|
+
accessToken: newAccessToken,
|
|
269
|
+
refreshToken: newRefreshToken,
|
|
270
|
+
});
|
|
268
271
|
await this.refreshTokenRepository.delete(storedToken.id);
|
|
269
272
|
await this.refreshTokenRepository.deleteExpired().catch((err) => {
|
|
270
273
|
this.logger.warn(`Failed to clean up expired refresh tokens: ${err instanceof Error ? err.message : String(err)}`);
|
|
271
274
|
});
|
|
272
|
-
this.refreshTokenService.cacheRefreshResult(refreshTokenHash, newAccessToken, newRefreshToken, newRefreshTokenHash);
|
|
273
275
|
this.securityLogger.log(auth_logger_interface_1.SecurityEvent.TOKEN_REFRESH_SUCCESS, {
|
|
274
276
|
userId: user.id,
|
|
275
277
|
ipAddress,
|
|
@@ -300,7 +302,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
300
302
|
const storedToken = await this.refreshTokenRepository.findByUserIdAndHashedToken(userId, refreshTokenHash);
|
|
301
303
|
if (storedToken) {
|
|
302
304
|
await this.refreshTokenRepository.delete(storedToken.id);
|
|
303
|
-
this.refreshTokenService.invalidateCachedRefresh(refreshTokenHash);
|
|
305
|
+
await this.refreshTokenService.invalidateCachedRefresh(refreshTokenHash);
|
|
304
306
|
this.securityLogger.log(auth_logger_interface_1.SecurityEvent.LOGOUT_SUCCESS, {
|
|
305
307
|
userId,
|
|
306
308
|
});
|
|
@@ -911,6 +913,9 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
911
913
|
get cookieAuthEnabled() {
|
|
912
914
|
return this.authModuleOptions?.features?.cookieAuth === true;
|
|
913
915
|
}
|
|
916
|
+
get realmsEnabled() {
|
|
917
|
+
return Boolean(this.authModuleOptions?.realmExtractorInstance);
|
|
918
|
+
}
|
|
914
919
|
async issueAuthSession(userId, res, realm) {
|
|
915
920
|
const user = await this.userRepository.findById(userId);
|
|
916
921
|
if (!user) {
|
|
@@ -941,12 +946,12 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
941
946
|
res.cookie(refreshTokenName, refreshToken, refreshOpts);
|
|
942
947
|
}
|
|
943
948
|
readRefreshTokenFromCookie(req) {
|
|
944
|
-
if (!this.cookieAuthEnabled || !req
|
|
949
|
+
if (!this.cookieAuthEnabled || !req)
|
|
945
950
|
return null;
|
|
946
951
|
const cookieConfig = this.authModuleOptions?.cookie;
|
|
947
952
|
const baseName = cookieConfig?.refreshTokenName || 'refresh_token';
|
|
948
953
|
const cookieName = (0, cookie_options_1.resolveHostPrefixedName)(baseName, cookieConfig);
|
|
949
|
-
return req
|
|
954
|
+
return (0, cookies_1.readCookie)(req, cookieName);
|
|
950
955
|
}
|
|
951
956
|
clearAuthCookies(res) {
|
|
952
957
|
if (!this.cookieAuthEnabled)
|