@openmfp/portal-server-lib 0.163.0 → 0.163.2
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.
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { CookiesService } from '../services/index.js';
|
|
2
|
+
import { AuthConfigService } from './auth-config.service.js';
|
|
2
3
|
import { AuthTokenData, AuthTokenService } from './auth-token.service.js';
|
|
3
4
|
import { AuthCallback } from './auth.callback.js';
|
|
4
5
|
import type { Request, Response } from 'express';
|
|
5
6
|
export declare class AuthController {
|
|
6
7
|
private authCallbackService;
|
|
8
|
+
private authConfigService;
|
|
7
9
|
private cookiesService;
|
|
8
10
|
private authTokenService;
|
|
9
11
|
private logger;
|
|
10
|
-
constructor(authCallbackService: AuthCallback, cookiesService: CookiesService, authTokenService: AuthTokenService);
|
|
12
|
+
constructor(authCallbackService: AuthCallback, authConfigService: AuthConfigService, cookiesService: CookiesService, authTokenService: AuthTokenService);
|
|
11
13
|
auth(request: Request, response: Response): Response;
|
|
12
14
|
private isDomainOrSubdomain;
|
|
13
15
|
private createAppStateUrl;
|
|
@@ -11,17 +11,19 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
var AuthController_1;
|
|
14
|
-
import { AUTH_CALLBACK_INJECTION_TOKEN } from '../injection-tokens.js';
|
|
14
|
+
import { AUTH_CALLBACK_INJECTION_TOKEN, AUTH_CONFIG_INJECTION_TOKEN, } from '../injection-tokens.js';
|
|
15
15
|
import { CookiesService, RequestCodeParamGuard } from '../services/index.js';
|
|
16
16
|
import { AuthTokenService } from './auth-token.service.js';
|
|
17
17
|
import { Controller, Get, Inject, Logger, Post, Req, Res, UseGuards, } from '@nestjs/common';
|
|
18
18
|
let AuthController = AuthController_1 = class AuthController {
|
|
19
19
|
authCallbackService;
|
|
20
|
+
authConfigService;
|
|
20
21
|
cookiesService;
|
|
21
22
|
authTokenService;
|
|
22
23
|
logger = new Logger(AuthController_1.name);
|
|
23
|
-
constructor(authCallbackService, cookiesService, authTokenService) {
|
|
24
|
+
constructor(authCallbackService, authConfigService, cookiesService, authTokenService) {
|
|
24
25
|
this.authCallbackService = authCallbackService;
|
|
26
|
+
this.authConfigService = authConfigService;
|
|
25
27
|
this.cookiesService = cookiesService;
|
|
26
28
|
this.authTokenService = authTokenService;
|
|
27
29
|
}
|
|
@@ -29,7 +31,7 @@ let AuthController = AuthController_1 = class AuthController {
|
|
|
29
31
|
const { code, state } = request.query;
|
|
30
32
|
let postLoginRedirectUrl = this.createAppStateUrl(state);
|
|
31
33
|
try {
|
|
32
|
-
if (!this.isDomainOrSubdomain(postLoginRedirectUrl)) {
|
|
34
|
+
if (!(await this.isDomainOrSubdomain(request, postLoginRedirectUrl))) {
|
|
33
35
|
throw new Error('Bad redirection url: ' + postLoginRedirectUrl);
|
|
34
36
|
}
|
|
35
37
|
const authTokenData = await this.authTokenService.exchangeTokenForCode(request, response, code);
|
|
@@ -43,8 +45,8 @@ let AuthController = AuthController_1 = class AuthController {
|
|
|
43
45
|
}
|
|
44
46
|
return response.redirect(postLoginRedirectUrl.href);
|
|
45
47
|
}
|
|
46
|
-
isDomainOrSubdomain(appStateUrl) {
|
|
47
|
-
const baseDomain =
|
|
48
|
+
async isDomainOrSubdomain(request, appStateUrl) {
|
|
49
|
+
const { baseDomain } = await this.authConfigService.getAuthConfig(request);
|
|
48
50
|
if (!baseDomain)
|
|
49
51
|
return false;
|
|
50
52
|
const hostname = appStateUrl.hostname;
|
|
@@ -110,7 +112,8 @@ __decorate([
|
|
|
110
112
|
AuthController = AuthController_1 = __decorate([
|
|
111
113
|
Controller('/'),
|
|
112
114
|
__param(0, Inject(AUTH_CALLBACK_INJECTION_TOKEN)),
|
|
113
|
-
|
|
115
|
+
__param(1, Inject(AUTH_CONFIG_INJECTION_TOKEN)),
|
|
116
|
+
__metadata("design:paramtypes", [Object, Object, CookiesService,
|
|
114
117
|
AuthTokenService])
|
|
115
118
|
], AuthController);
|
|
116
119
|
export { AuthController };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EACL,6BAA6B,EAC7B,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAiB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EACL,UAAU,EACV,GAAG,EACH,MAAM,EACN,MAAM,EACN,IAAI,EACJ,GAAG,EACH,GAAG,EACH,SAAS,GACV,MAAM,gBAAgB,CAAC;AAKjB,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKf;IAEA;IACA;IACA;IARF,MAAM,GAAW,IAAI,MAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAEzD,YAEU,mBAAiC,EAEjC,iBAAoC,EACpC,cAA8B,EAC9B,gBAAkC;QAJlC,wBAAmB,GAAnB,mBAAmB,CAAc;QAEjC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAAkB;IACzC,CAAC;IAIE,AAAN,KAAK,CAAC,IAAI,CAAQ,OAAgB,EAAS,QAAkB;QAC3D,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QACtC,IAAI,oBAAoB,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAEzD,IAAI,CAAC;YACH,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC;gBACrE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,oBAAoB,CAAC,CAAC;YAClE,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CACpE,OAAO,EACP,QAAQ,EACR,IAAI,CACL,CAAC;YAEF,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wDAAwD,CAAC,EAAE,CAC5D,CAAC;YACF,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC9C,oBAAoB,GAAG,IAAI,GAAG,CAAC,GAAG,oBAAoB,CAAC,MAAM,SAAS,CAAC,CAAC;YACxE,oBAAoB,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,OAAgB,EAAE,WAAoB;QACtE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU;YAAE,OAAO,KAAK,CAAC;QAE9B,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACtC,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC;IAEO,iBAAiB,CAAC,KAAa;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAClD,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACJ,OAAgB,EACK,QAAkB;QAE9C,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QAED,IAAI,aAAa,GAAkB,IAAI,CAAC;QACxC,IAAI,CAAC;YACH,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,CACtE,OAAO,EACP,QAAQ,EACR,YAAY,CACb,CAAC;QACJ,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,EAAE,CAAC,CAAC;YACrE,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,OAAgB,EAChB,QAAkB,EAClB,iBAAgC;QAEhC,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAC1C,OAAO,EACP,QAAQ,EACR,iBAAiB,CAClB,CAAC;QACF,OAAO,IAAI,CAAC,kCAAkC,CAAC,iBAAiB,CAAC,CAAC;IACpE,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,OAAgB,EAChB,QAAkB;QAElB,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAExD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,sDAAsD,EACtD,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,kCAAkC,CACxC,iBAAgC;QAEhC,OAAO,iBAAiB,CAAC,aAAa,CAAC;QACvC,OAAO,iBAAiB,CAAC,kBAAkB,CAAC;QAC5C,OAAO,iBAAiB,CAAC;IAC3B,CAAC;CACF,CAAA;AAvGO;IAFL,SAAS,CAAC,qBAAqB,CAAC;IAChC,GAAG,CAAC,UAAU,CAAC;IACJ,WAAA,GAAG,EAAE,CAAA;IAAoB,WAAA,GAAG,EAAE,CAAA;;;;0CA0BzC;AAiBK;IADL,IAAI,CAAC,mBAAmB,CAAC;IAEvB,WAAA,GAAG,EAAE,CAAA;IACL,WAAA,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;;;;6CAoB5B;AA/EU,cAAc;IAD1B,UAAU,CAAC,GAAG,CAAC;IAKX,WAAA,MAAM,CAAC,6BAA6B,CAAC,CAAA;IAErC,WAAA,MAAM,CAAC,2BAA2B,CAAC,CAAA;qDAEZ,cAAc;QACZ,gBAAgB;GATjC,cAAc,CAqH1B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmfp/portal-server-lib",
|
|
3
|
-
"version": "0.163.
|
|
3
|
+
"version": "0.163.2",
|
|
4
4
|
"description": "This library helps you to set up an openmfp based micro frontend portal server with ease.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "git+https://github.com/openmfp/portal-server-lib.git"
|
|
@@ -26,20 +26,20 @@
|
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|
|
28
28
|
"@nestjs/axios": "4.0.1",
|
|
29
|
-
"@nestjs/common": "11.1.
|
|
30
|
-
"@nestjs/core": "11.1.
|
|
31
|
-
"@nestjs/platform-express": "11.1.
|
|
29
|
+
"@nestjs/common": "11.1.9",
|
|
30
|
+
"@nestjs/core": "11.1.9",
|
|
31
|
+
"@nestjs/platform-express": "11.1.9",
|
|
32
32
|
"@nestjs/serve-static": "5.0.4",
|
|
33
|
-
"axios": "1.13.
|
|
33
|
+
"axios": "1.13.2",
|
|
34
34
|
"cookie-parser": "1.4.7",
|
|
35
35
|
"express": "5.1.0",
|
|
36
36
|
"rxjs": "7.8.2"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@nestjs/axios": "4.0.1",
|
|
40
|
-
"@nestjs/common": "11.1.
|
|
40
|
+
"@nestjs/common": "11.1.9",
|
|
41
41
|
"@nestjs/serve-static": "5.0.4",
|
|
42
|
-
"axios": "1.13.
|
|
42
|
+
"axios": "1.13.2",
|
|
43
43
|
"class-transformer": "0.5.1",
|
|
44
44
|
"class-validator": "0.14.2",
|
|
45
45
|
"express": "5.1.0",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@eslint/js": "9.38.0",
|
|
51
51
|
"@nestjs/cli": "11.0.10",
|
|
52
|
-
"@nestjs/testing": "11.1.
|
|
52
|
+
"@nestjs/testing": "11.1.9",
|
|
53
53
|
"@openmfp/config-prettier": "0.9.1",
|
|
54
54
|
"@types/jest": "30.0.0",
|
|
55
55
|
"@types/node": "24.9.2",
|