@lenne.tech/nest-server 11.10.1 → 11.10.3
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/config.env.js +16 -133
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/interfaces/server-options.interface.d.ts +4 -0
- package/dist/core/modules/auth/guards/auth.guard.d.ts +2 -2
- package/dist/core/modules/auth/guards/auth.guard.js +68 -8
- package/dist/core/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/core/modules/auth/guards/roles.guard.d.ts +3 -4
- package/dist/core/modules/auth/guards/roles.guard.js +64 -159
- package/dist/core/modules/auth/guards/roles.guard.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth-token.service.d.ts +21 -0
- package/dist/core/modules/better-auth/better-auth-token.service.js +153 -0
- package/dist/core/modules/better-auth/better-auth-token.service.js.map +1 -0
- package/dist/core/modules/better-auth/better-auth.config.d.ts +3 -0
- package/dist/core/modules/better-auth/better-auth.config.js +176 -47
- package/dist/core/modules/better-auth/better-auth.config.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.types.d.ts +13 -0
- package/dist/core/modules/better-auth/better-auth.types.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-api.middleware.d.ts +5 -1
- package/dist/core/modules/better-auth/core-better-auth-api.middleware.js +101 -8
- package/dist/core/modules/better-auth/core-better-auth-api.middleware.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-challenge.service.d.ts +20 -0
- package/dist/core/modules/better-auth/core-better-auth-challenge.service.js +142 -0
- package/dist/core/modules/better-auth/core-better-auth-challenge.service.js.map +1 -0
- package/dist/core/modules/better-auth/core-better-auth-user.mapper.js +1 -1
- package/dist/core/modules/better-auth/core-better-auth-user.mapper.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-web.helper.d.ts +2 -0
- package/dist/core/modules/better-auth/core-better-auth-web.helper.js +29 -1
- package/dist/core/modules/better-auth/core-better-auth-web.helper.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.controller.js +5 -13
- package/dist/core/modules/better-auth/core-better-auth.controller.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.middleware.d.ts +0 -1
- package/dist/core/modules/better-auth/core-better-auth.middleware.js +6 -19
- package/dist/core/modules/better-auth/core-better-auth.middleware.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.module.d.ts +6 -1
- package/dist/core/modules/better-auth/core-better-auth.module.js +82 -19
- package/dist/core/modules/better-auth/core-better-auth.module.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.resolver.js +7 -6
- package/dist/core/modules/better-auth/core-better-auth.resolver.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.service.d.ts +1 -2
- package/dist/core/modules/better-auth/core-better-auth.service.js +27 -37
- package/dist/core/modules/better-auth/core-better-auth.service.js.map +1 -1
- package/dist/core/modules/better-auth/index.d.ts +1 -0
- package/dist/core/modules/better-auth/index.js +1 -0
- package/dist/core/modules/better-auth/index.js.map +1 -1
- package/dist/core.module.js +4 -0
- package/dist/core.module.js.map +1 -1
- package/dist/server/modules/better-auth/better-auth.module.d.ts +4 -1
- package/dist/server/modules/better-auth/better-auth.module.js +4 -1
- package/dist/server/modules/better-auth/better-auth.module.js.map +1 -1
- package/dist/server/server.module.js +1 -4
- package/dist/server/server.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config.env.ts +24 -174
- package/src/core/common/interfaces/server-options.interface.ts +288 -35
- package/src/core/modules/auth/guards/auth.guard.ts +136 -23
- package/src/core/modules/auth/guards/roles.guard.ts +119 -239
- package/src/core/modules/better-auth/INTEGRATION-CHECKLIST.md +82 -56
- package/src/core/modules/better-auth/README.md +132 -35
- package/src/core/modules/better-auth/better-auth-token.service.ts +241 -0
- package/src/core/modules/better-auth/better-auth.config.ts +402 -70
- package/src/core/modules/better-auth/better-auth.types.ts +37 -0
- package/src/core/modules/better-auth/core-better-auth-api.middleware.ts +158 -18
- package/src/core/modules/better-auth/core-better-auth-challenge.service.ts +254 -0
- package/src/core/modules/better-auth/core-better-auth-user.mapper.ts +1 -1
- package/src/core/modules/better-auth/core-better-auth-web.helper.ts +64 -1
- package/src/core/modules/better-auth/core-better-auth.controller.ts +7 -15
- package/src/core/modules/better-auth/core-better-auth.middleware.ts +7 -20
- package/src/core/modules/better-auth/core-better-auth.module.ts +182 -25
- package/src/core/modules/better-auth/core-better-auth.resolver.ts +8 -7
- package/src/core/modules/better-auth/core-better-auth.service.ts +40 -48
- package/src/core/modules/better-auth/index.ts +1 -0
- package/src/core.module.ts +8 -0
- package/src/server/modules/better-auth/better-auth.module.ts +40 -10
- package/src/server/server.module.ts +2 -4
package/dist/config.env.js
CHANGED
|
@@ -8,55 +8,10 @@ dotenv.config();
|
|
|
8
8
|
const config = {
|
|
9
9
|
development: {
|
|
10
10
|
auth: {
|
|
11
|
-
legacyEndpoints: {
|
|
12
|
-
enabled: true,
|
|
13
|
-
},
|
|
11
|
+
legacyEndpoints: { enabled: true },
|
|
14
12
|
},
|
|
15
13
|
automaticObjectIdFiltering: true,
|
|
16
|
-
|
|
17
|
-
basePath: '/iam',
|
|
18
|
-
baseUrl: 'http://localhost:3000',
|
|
19
|
-
jwt: {
|
|
20
|
-
enabled: true,
|
|
21
|
-
expiresIn: '15m',
|
|
22
|
-
},
|
|
23
|
-
passkey: {
|
|
24
|
-
enabled: false,
|
|
25
|
-
origin: 'http://localhost:3000',
|
|
26
|
-
rpId: 'localhost',
|
|
27
|
-
rpName: 'Nest Server Development',
|
|
28
|
-
},
|
|
29
|
-
rateLimit: {
|
|
30
|
-
enabled: true,
|
|
31
|
-
max: 20,
|
|
32
|
-
message: 'Too many requests, please try again later.',
|
|
33
|
-
skipEndpoints: ['/session', '/callback'],
|
|
34
|
-
strictEndpoints: ['/sign-in', '/sign-up', '/forgot-password', '/reset-password'],
|
|
35
|
-
windowSeconds: 60,
|
|
36
|
-
},
|
|
37
|
-
secret: 'BETTER_AUTH_SECRET_DEV_32_CHARS_MIN',
|
|
38
|
-
socialProviders: {
|
|
39
|
-
apple: {
|
|
40
|
-
clientId: process.env.SOCIAL_APPLE_CLIENT_ID || '',
|
|
41
|
-
clientSecret: process.env.SOCIAL_APPLE_CLIENT_SECRET || '',
|
|
42
|
-
enabled: false,
|
|
43
|
-
},
|
|
44
|
-
github: {
|
|
45
|
-
clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '',
|
|
46
|
-
clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '',
|
|
47
|
-
enabled: false,
|
|
48
|
-
},
|
|
49
|
-
google: {
|
|
50
|
-
clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '',
|
|
51
|
-
clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '',
|
|
52
|
-
enabled: false,
|
|
53
|
-
},
|
|
54
|
-
},
|
|
55
|
-
twoFactor: {
|
|
56
|
-
appName: 'Nest Server Development',
|
|
57
|
-
enabled: false,
|
|
58
|
-
},
|
|
59
|
-
},
|
|
14
|
+
baseUrl: 'http://localhost:3000',
|
|
60
15
|
compression: true,
|
|
61
16
|
cookies: false,
|
|
62
17
|
email: {
|
|
@@ -148,56 +103,21 @@ const config = {
|
|
|
148
103
|
},
|
|
149
104
|
local: {
|
|
150
105
|
auth: {
|
|
151
|
-
legacyEndpoints: {
|
|
152
|
-
enabled: true,
|
|
153
|
-
},
|
|
106
|
+
legacyEndpoints: { enabled: true },
|
|
154
107
|
},
|
|
155
108
|
automaticObjectIdFiltering: true,
|
|
156
109
|
betterAuth: {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
enabled: true,
|
|
160
|
-
jwt: {
|
|
161
|
-
enabled: true,
|
|
162
|
-
expiresIn: '15m',
|
|
163
|
-
},
|
|
164
|
-
passkey: {
|
|
165
|
-
enabled: true,
|
|
166
|
-
origin: 'http://localhost:3000',
|
|
167
|
-
rpId: 'localhost',
|
|
168
|
-
rpName: 'Nest Server Local',
|
|
169
|
-
},
|
|
170
|
-
rateLimit: {
|
|
171
|
-
enabled: true,
|
|
172
|
-
max: 100,
|
|
173
|
-
message: 'Too many requests, please try again later.',
|
|
174
|
-
skipEndpoints: ['/session', '/callback'],
|
|
175
|
-
strictEndpoints: ['/sign-in', '/sign-up', '/forgot-password', '/reset-password'],
|
|
176
|
-
windowSeconds: 60,
|
|
177
|
-
},
|
|
110
|
+
jwt: { enabled: true, expiresIn: '15m' },
|
|
111
|
+
passkey: { enabled: true, origin: 'http://localhost:3001', rpId: 'localhost', rpName: 'Nest Server Local' },
|
|
112
|
+
rateLimit: { enabled: true, max: 100, windowSeconds: 60 },
|
|
178
113
|
secret: 'BETTER_AUTH_SECRET_LOCAL_32_CHARS_M',
|
|
179
114
|
socialProviders: {
|
|
180
|
-
apple: {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
enabled: false,
|
|
184
|
-
},
|
|
185
|
-
github: {
|
|
186
|
-
clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '',
|
|
187
|
-
clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '',
|
|
188
|
-
enabled: false,
|
|
189
|
-
},
|
|
190
|
-
google: {
|
|
191
|
-
clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '',
|
|
192
|
-
clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '',
|
|
193
|
-
enabled: false,
|
|
194
|
-
},
|
|
115
|
+
apple: { clientId: '', clientSecret: '', enabled: false },
|
|
116
|
+
github: { clientId: '', clientSecret: '', enabled: false },
|
|
117
|
+
google: { clientId: '', clientSecret: '', enabled: false },
|
|
195
118
|
},
|
|
196
119
|
trustedOrigins: ['http://localhost:3000', 'http://localhost:3001'],
|
|
197
|
-
twoFactor: {
|
|
198
|
-
appName: 'Nest Server Local',
|
|
199
|
-
enabled: true,
|
|
200
|
-
},
|
|
120
|
+
twoFactor: { appName: 'Nest Server Local', enabled: true },
|
|
201
121
|
},
|
|
202
122
|
compression: true,
|
|
203
123
|
cookies: false,
|
|
@@ -304,55 +224,18 @@ const config = {
|
|
|
304
224
|
},
|
|
305
225
|
production: {
|
|
306
226
|
auth: {
|
|
307
|
-
legacyEndpoints: {
|
|
308
|
-
enabled: process.env.LEGACY_AUTH_ENABLED !== 'false',
|
|
309
|
-
},
|
|
227
|
+
legacyEndpoints: { enabled: process.env.LEGACY_AUTH_ENABLED !== 'false' },
|
|
310
228
|
},
|
|
311
229
|
automaticObjectIdFiltering: true,
|
|
230
|
+
baseUrl: process.env.BASE_URL,
|
|
312
231
|
betterAuth: {
|
|
313
|
-
|
|
314
|
-
baseUrl: process.env.BETTER_AUTH_URL || 'https://example.com',
|
|
315
|
-
jwt: {
|
|
316
|
-
enabled: true,
|
|
317
|
-
expiresIn: '15m',
|
|
318
|
-
},
|
|
319
|
-
passkey: {
|
|
320
|
-
enabled: false,
|
|
321
|
-
origin: process.env.BETTER_AUTH_URL || 'https://example.com',
|
|
322
|
-
rpId: process.env.PASSKEY_RP_ID || 'example.com',
|
|
323
|
-
rpName: process.env.PASSKEY_RP_NAME || 'Nest Server Production',
|
|
324
|
-
},
|
|
325
|
-
rateLimit: {
|
|
326
|
-
enabled: process.env.RATE_LIMIT_ENABLED !== 'false',
|
|
327
|
-
max: parseInt(process.env.RATE_LIMIT_MAX || '10', 10),
|
|
328
|
-
message: process.env.RATE_LIMIT_MESSAGE || 'Too many requests, please try again later.',
|
|
329
|
-
skipEndpoints: ['/session', '/callback'],
|
|
330
|
-
strictEndpoints: ['/sign-in', '/sign-up', '/forgot-password', '/reset-password'],
|
|
331
|
-
windowSeconds: parseInt(process.env.RATE_LIMIT_WINDOW_SECONDS || '60', 10),
|
|
332
|
-
},
|
|
232
|
+
rateLimit: { enabled: process.env.RATE_LIMIT_ENABLED !== 'false', max: parseInt(process.env.RATE_LIMIT_MAX || '10', 10) },
|
|
333
233
|
secret: process.env.BETTER_AUTH_SECRET,
|
|
334
234
|
socialProviders: {
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
clientSecret: process.env.SOCIAL_APPLE_CLIENT_SECRET || '',
|
|
338
|
-
enabled: !!process.env.SOCIAL_APPLE_CLIENT_ID,
|
|
339
|
-
},
|
|
340
|
-
github: {
|
|
341
|
-
clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '',
|
|
342
|
-
clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '',
|
|
343
|
-
enabled: !!process.env.SOCIAL_GITHUB_CLIENT_ID,
|
|
344
|
-
},
|
|
345
|
-
google: {
|
|
346
|
-
clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '',
|
|
347
|
-
clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '',
|
|
348
|
-
enabled: !!process.env.SOCIAL_GOOGLE_CLIENT_ID,
|
|
349
|
-
},
|
|
350
|
-
},
|
|
351
|
-
trustedOrigins: process.env.TRUSTED_ORIGINS?.split(',') || [],
|
|
352
|
-
twoFactor: {
|
|
353
|
-
appName: process.env.TWO_FACTOR_APP_NAME || 'Nest Server',
|
|
354
|
-
enabled: process.env.TWO_FACTOR_ENABLED === 'true',
|
|
235
|
+
github: { clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '', clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '' },
|
|
236
|
+
google: { clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '', clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '' },
|
|
355
237
|
},
|
|
238
|
+
twoFactor: { appName: process.env.TWO_FACTOR_APP_NAME || 'Nest Server' },
|
|
356
239
|
},
|
|
357
240
|
compression: true,
|
|
358
241
|
cookies: false,
|
package/dist/config.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD,iCAAiC;AACjC,+BAA4B;AAE5B,uEAA2E;
|
|
1
|
+
{"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,8 @@ export interface IBetterAuthJwtConfig {
|
|
|
38
38
|
}
|
|
39
39
|
export interface IBetterAuthPasskeyConfig {
|
|
40
40
|
authenticatorAttachment?: 'cross-platform' | 'platform';
|
|
41
|
+
challengeStorage?: 'cookie' | 'database';
|
|
42
|
+
challengeTtlSeconds?: number;
|
|
41
43
|
enabled?: boolean;
|
|
42
44
|
origin?: string;
|
|
43
45
|
residentKey?: 'discouraged' | 'preferred' | 'required';
|
|
@@ -90,8 +92,10 @@ export interface IJwt {
|
|
|
90
92
|
signInOptions?: JwtSignOptions;
|
|
91
93
|
}
|
|
92
94
|
export interface IServerOptions {
|
|
95
|
+
appUrl?: string;
|
|
93
96
|
auth?: IAuth;
|
|
94
97
|
automaticObjectIdFiltering?: boolean;
|
|
98
|
+
baseUrl?: string;
|
|
95
99
|
betterAuth?: boolean | IBetterAuth;
|
|
96
100
|
brevo?: {
|
|
97
101
|
apiKey: string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { CanActivate } from '@nestjs/common';
|
|
1
|
+
import { CanActivate, ExecutionContext } from '@nestjs/common';
|
|
2
2
|
import { Type } from '@nestjs/passport';
|
|
3
3
|
import { AuthGuardStrategy } from '../auth-guard-strategy.enum';
|
|
4
4
|
export type IAuthGuard = CanActivate & {
|
|
5
|
-
handleRequest<TUser = any>(err:
|
|
5
|
+
handleRequest<TUser = any>(err: Error | null, user: any, info: any, context: ExecutionContext): TUser;
|
|
6
6
|
};
|
|
7
7
|
export declare const AuthGuard: (type?: AuthGuardStrategy | string | string[]) => Type<IAuthGuard>;
|
|
@@ -14,11 +14,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.AuthGuard = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const core_1 = require("@nestjs/core");
|
|
17
18
|
const graphql_1 = require("@nestjs/graphql");
|
|
18
19
|
const passport_1 = require("@nestjs/passport");
|
|
19
20
|
const options_1 = require("@nestjs/passport/dist/options");
|
|
20
21
|
const memoize_util_1 = require("@nestjs/passport/dist/utils/memoize.util");
|
|
21
22
|
const passport = require("passport");
|
|
23
|
+
const better_auth_token_service_1 = require("../../better-auth/better-auth-token.service");
|
|
24
|
+
const core_better_auth_service_1 = require("../../better-auth/core-better-auth.service");
|
|
22
25
|
const auth_guard_strategy_enum_1 = require("../auth-guard-strategy.enum");
|
|
23
26
|
const expired_refresh_token_exception_1 = require("../exceptions/expired-refresh-token.exception");
|
|
24
27
|
const expired_token_exception_1 = require("../exceptions/expired-token.exception");
|
|
@@ -33,16 +36,37 @@ const createPassportContext = (request, response) => (type, options, callback) =
|
|
|
33
36
|
catch (err) {
|
|
34
37
|
reject(err);
|
|
35
38
|
}
|
|
36
|
-
})(request, response, (err) => (err ? reject(err) : resolve)));
|
|
39
|
+
})(request, response, (err) => (err ? reject(err) : resolve(undefined))));
|
|
37
40
|
function createAuthGuard(type) {
|
|
38
41
|
let MixinAuthGuard = class MixinAuthGuard {
|
|
39
|
-
constructor(options) {
|
|
42
|
+
constructor(options, moduleRef) {
|
|
40
43
|
this.options = options;
|
|
44
|
+
this.moduleRef = moduleRef;
|
|
45
|
+
this.logger = new common_1.Logger('AuthGuard');
|
|
46
|
+
this.betterAuthService = null;
|
|
47
|
+
this.tokenService = null;
|
|
48
|
+
this.servicesResolved = false;
|
|
41
49
|
this.options = this.options || {};
|
|
42
50
|
if (!type && !this.options.defaultStrategy) {
|
|
43
|
-
|
|
51
|
+
this.logger.error(NO_STRATEGY_ERROR);
|
|
44
52
|
}
|
|
45
53
|
}
|
|
54
|
+
resolveServices() {
|
|
55
|
+
if (this.servicesResolved || !this.moduleRef) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
try {
|
|
59
|
+
this.betterAuthService = this.moduleRef.get(core_better_auth_service_1.CoreBetterAuthService, { strict: false });
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
}
|
|
63
|
+
try {
|
|
64
|
+
this.tokenService = this.moduleRef.get(better_auth_token_service_1.BetterAuthTokenService, { strict: false });
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
}
|
|
68
|
+
this.servicesResolved = true;
|
|
69
|
+
}
|
|
46
70
|
async canActivate(context) {
|
|
47
71
|
const args = context.getArgs();
|
|
48
72
|
if (args.length > 0 && args[args.length - 1]?.operation?.operation === 'subscription') {
|
|
@@ -56,12 +80,45 @@ function createAuthGuard(type) {
|
|
|
56
80
|
request[options.property || options_1.defaultOptions.property] = validatedUser;
|
|
57
81
|
return true;
|
|
58
82
|
}
|
|
83
|
+
if (type === auth_guard_strategy_enum_1.AuthGuardStrategy.BETTER_AUTH) {
|
|
84
|
+
return this.handleBetterAuthStrategy(context, request, options);
|
|
85
|
+
}
|
|
59
86
|
const response = context?.switchToHttp()?.getResponse();
|
|
60
87
|
const passportFn = createPassportContext(request, response);
|
|
61
|
-
const user = await passportFn(type || this.options
|
|
88
|
+
const user = await passportFn(type || this.options?.defaultStrategy, options, (err, currentUser, info) => this.handleRequest(err, currentUser, info, context));
|
|
62
89
|
request[options.property || options_1.defaultOptions.property] = user;
|
|
63
90
|
return true;
|
|
64
91
|
}
|
|
92
|
+
async handleBetterAuthStrategy(context, request, options) {
|
|
93
|
+
this.resolveServices();
|
|
94
|
+
if (!this.betterAuthService?.isEnabled()) {
|
|
95
|
+
this.logger.warn('BETTER_AUTH strategy used but BetterAuth is not enabled');
|
|
96
|
+
throw new invalid_token_exception_1.InvalidTokenException();
|
|
97
|
+
}
|
|
98
|
+
const user = await this.verifyBetterAuthToken(request);
|
|
99
|
+
if (!user) {
|
|
100
|
+
throw new invalid_token_exception_1.InvalidTokenException();
|
|
101
|
+
}
|
|
102
|
+
const validatedUser = this.handleRequest(null, user, null, context);
|
|
103
|
+
request[options.property || options_1.defaultOptions.property] = validatedUser;
|
|
104
|
+
return true;
|
|
105
|
+
}
|
|
106
|
+
async verifyBetterAuthToken(request) {
|
|
107
|
+
if (!this.tokenService) {
|
|
108
|
+
return null;
|
|
109
|
+
}
|
|
110
|
+
try {
|
|
111
|
+
const { token } = this.tokenService.extractTokenFromRequest(request);
|
|
112
|
+
if (!token) {
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
return await this.tokenService.verifyAndLoadUser(token);
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
this.logger.debug(`BetterAuth token verification failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
65
122
|
getRequest(context) {
|
|
66
123
|
try {
|
|
67
124
|
const ctx = graphql_1.GqlExecutionContext.create(context)?.getContext();
|
|
@@ -69,14 +126,15 @@ function createAuthGuard(type) {
|
|
|
69
126
|
return ctx.req;
|
|
70
127
|
}
|
|
71
128
|
}
|
|
72
|
-
catch
|
|
129
|
+
catch {
|
|
130
|
+
}
|
|
73
131
|
return context && context.switchToHttp() ? context.switchToHttp().getRequest() : null;
|
|
74
132
|
}
|
|
75
133
|
async logIn(request) {
|
|
76
|
-
const user = request[this.options
|
|
134
|
+
const user = request[this.options?.property || options_1.defaultOptions.property];
|
|
77
135
|
await new Promise((resolve, reject) => request.logIn(user, (err) => (err ? reject(err) : resolve())));
|
|
78
136
|
}
|
|
79
|
-
handleRequest(err, user, info,
|
|
137
|
+
handleRequest(err, user, info, _context) {
|
|
80
138
|
if (err) {
|
|
81
139
|
throw new invalid_token_exception_1.InvalidTokenException();
|
|
82
140
|
}
|
|
@@ -96,7 +154,9 @@ function createAuthGuard(type) {
|
|
|
96
154
|
};
|
|
97
155
|
MixinAuthGuard = __decorate([
|
|
98
156
|
__param(0, (0, common_1.Optional)()),
|
|
99
|
-
|
|
157
|
+
__param(1, (0, common_1.Optional)()),
|
|
158
|
+
__metadata("design:paramtypes", [passport_1.AuthModuleOptions,
|
|
159
|
+
core_1.ModuleRef])
|
|
100
160
|
], MixinAuthGuard);
|
|
101
161
|
const guard = (0, common_1.mixin)(MixinAuthGuard);
|
|
102
162
|
return guard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwF;AACxF,6CAAsD;AACtD,+CAA2D;AAC3D,2DAA+D;AAC/D,2EAAmE;AACnE,qCAAsC;AAEtC,0EAAgE;AAChE,mGAA6F;AAC7F,mFAA8E;AAC9E,mFAA8E;AAK9E,MAAM,iBAAiB,GACrB,qFAAqF;IACrF,kFAAkF,CAAC;AAcrF,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/auth.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,15 +6,14 @@ export declare class RolesGuard extends RolesGuard_base {
|
|
|
6
6
|
private readonly moduleRef?;
|
|
7
7
|
private readonly logger;
|
|
8
8
|
private betterAuthService;
|
|
9
|
-
private
|
|
9
|
+
private tokenService;
|
|
10
10
|
private servicesResolved;
|
|
11
11
|
constructor(reflector: Reflector, moduleRef?: ModuleRef);
|
|
12
12
|
private resolveServices;
|
|
13
13
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
14
14
|
private verifyBetterAuthTokenFromContext;
|
|
15
|
-
private
|
|
16
|
-
|
|
17
|
-
handleRequest(err: any, user: any, info: any, context: any): any;
|
|
15
|
+
private extractRequestFromContext;
|
|
16
|
+
handleRequest(err: Error | null, user: any, info: any, context: ExecutionContext): any;
|
|
18
17
|
getRequest(context: ExecutionContext): any;
|
|
19
18
|
}
|
|
20
19
|
export {};
|