@node-c/api-http 1.0.0-alpha60 → 1.0.0-alpha62
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/common/definitions/common.constants.d.ts +1 -1
- package/dist/common/definitions/common.constants.js +1 -1
- package/dist/common/definitions/common.constants.js.map +1 -1
- package/dist/interceptors/http.interceptors.authorization.js.map +1 -1
- package/dist/middlewares/{http.middlewares.authentication.d.ts → http.middlewares.authorization.d.ts} +4 -3
- package/dist/middlewares/{http.middlewares.authentication.js → http.middlewares.authorization.js} +49 -75
- package/dist/middlewares/http.middlewares.authorization.js.map +1 -0
- package/dist/middlewares/index.d.ts +1 -1
- package/dist/middlewares/index.js +1 -1
- package/dist/middlewares/index.js.map +1 -1
- package/dist/module/http.api.module.js +1 -1
- package/dist/module/http.api.module.js.map +1 -1
- package/package.json +3 -3
- package/dist/middlewares/http.middlewares.authentication.js.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare enum Constants {
|
|
2
2
|
API_MODULE_AUTHORIZATION_SERVICE = "API_MODULE_AUTHORIZATION_SERVICE",
|
|
3
3
|
API_MODULE_NAME = "API_MODULE_NAME",
|
|
4
|
-
|
|
4
|
+
AUTORIZATION_MIDDLEWARE_TOKEN_MANAGER_SERVICE = "AUTORIZATION_MIDDLEWARE_TOKEN_MANAGER_SERVICE",
|
|
5
5
|
AUTHENTICATION_MIDDLEWARE_USERS_SERVICE = "AUTHENTICATION_MIDDLEWARE_USERS_SERVICE",
|
|
6
6
|
AUTHORIZATION_INTERCEPTOR = "AUTHORIZATION_INTERCEPTOR",
|
|
7
7
|
ERROR_INTERCEPTOR = "ERROR_INTERCEPTOR",
|
|
@@ -5,7 +5,7 @@ var Constants;
|
|
|
5
5
|
(function (Constants) {
|
|
6
6
|
Constants["API_MODULE_AUTHORIZATION_SERVICE"] = "API_MODULE_AUTHORIZATION_SERVICE";
|
|
7
7
|
Constants["API_MODULE_NAME"] = "API_MODULE_NAME";
|
|
8
|
-
Constants["
|
|
8
|
+
Constants["AUTORIZATION_MIDDLEWARE_TOKEN_MANAGER_SERVICE"] = "AUTORIZATION_MIDDLEWARE_TOKEN_MANAGER_SERVICE";
|
|
9
9
|
Constants["AUTHENTICATION_MIDDLEWARE_USERS_SERVICE"] = "AUTHENTICATION_MIDDLEWARE_USERS_SERVICE";
|
|
10
10
|
Constants["AUTHORIZATION_INTERCEPTOR"] = "AUTHORIZATION_INTERCEPTOR";
|
|
11
11
|
Constants["ERROR_INTERCEPTOR"] = "ERROR_INTERCEPTOR";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.constants.js","sourceRoot":"","sources":["../../../src/common/definitions/common.constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAeX;AAfD,WAAY,SAAS;IAEnB,kFAAqE,CAAA;IAErE,gDAAmC,CAAA;IAEnC,
|
|
1
|
+
{"version":3,"file":"common.constants.js","sourceRoot":"","sources":["../../../src/common/definitions/common.constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAeX;AAfD,WAAY,SAAS;IAEnB,kFAAqE,CAAA;IAErE,gDAAmC,CAAA;IAEnC,4GAA+F,CAAA;IAE/F,gGAAmF,CAAA;IAEnF,oEAAuD,CAAA;IAEvD,oDAAuC,CAAA;IAEvC,4DAA+C,CAAA;AACjD,CAAC,EAfW,SAAS,yBAAT,SAAS,QAepB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.interceptors.authorization.js","sourceRoot":"","sources":["../../src/interceptors/http.interceptors.authorization.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAQwB;AAExB,uCAAqG;AACrG,mDAA0G;AAE1G,+BAAuC;AAEvC,uDAAqE;
|
|
1
|
+
{"version":3,"file":"http.interceptors.authorization.js","sourceRoot":"","sources":["../../src/interceptors/http.interceptors.authorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { NestMiddleware } from '@nestjs/common';
|
|
2
2
|
import { ConfigProviderService } from '@node-c/core';
|
|
3
|
-
import { IAMTokenManagerService, IAMUsersService, UserTokenEnityFields } from '@node-c/domain-iam';
|
|
3
|
+
import { AuthorizationPoint, IAMAuthorizationService, IAMTokenManagerService, IAMUsersService, UserTokenEnityFields } from '@node-c/domain-iam';
|
|
4
4
|
import { NextFunction, Response } from 'express';
|
|
5
5
|
import { RequestWithLocals } from '../common/definitions';
|
|
6
|
-
export declare class
|
|
6
|
+
export declare class HTTPAuthorizationMiddleware<User extends object> implements NestMiddleware {
|
|
7
7
|
protected configProvider: ConfigProviderService;
|
|
8
8
|
protected moduleName: string;
|
|
9
|
+
protected authorizationService: IAMAuthorizationService<AuthorizationPoint<unknown>>;
|
|
9
10
|
protected tokenManager?: IAMTokenManagerService<UserTokenEnityFields> | undefined;
|
|
10
11
|
protected usersService?: IAMUsersService<User> | undefined;
|
|
11
|
-
constructor(configProvider: ConfigProviderService, moduleName: string, tokenManager?: IAMTokenManagerService<UserTokenEnityFields> | undefined, usersService?: IAMUsersService<User> | undefined);
|
|
12
|
+
constructor(configProvider: ConfigProviderService, moduleName: string, authorizationService: IAMAuthorizationService<AuthorizationPoint<unknown>>, tokenManager?: IAMTokenManagerService<UserTokenEnityFields> | undefined, usersService?: IAMUsersService<User> | undefined);
|
|
12
13
|
use(req: RequestWithLocals<unknown>, res: Response, next: NextFunction): void;
|
|
13
14
|
}
|
package/dist/middlewares/{http.middlewares.authentication.js → http.middlewares.authorization.js}
RENAMED
|
@@ -20,28 +20,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
20
20
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
21
|
});
|
|
22
22
|
};
|
|
23
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
|
-
};
|
|
26
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.
|
|
28
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
24
|
+
exports.HTTPAuthorizationMiddleware = void 0;
|
|
29
25
|
const common_1 = require("@nestjs/common");
|
|
30
26
|
const core_1 = require("@node-c/core");
|
|
31
27
|
const domain_iam_1 = require("@node-c/domain-iam");
|
|
32
28
|
const definitions_1 = require("../common/definitions");
|
|
33
29
|
const utils_1 = require("../common/utils");
|
|
34
|
-
let
|
|
35
|
-
constructor(configProvider, moduleName, tokenManager, usersService) {
|
|
30
|
+
let HTTPAuthorizationMiddleware = class HTTPAuthorizationMiddleware {
|
|
31
|
+
constructor(configProvider, moduleName, authorizationService, tokenManager, usersService) {
|
|
36
32
|
this.configProvider = configProvider;
|
|
37
33
|
this.moduleName = moduleName;
|
|
34
|
+
this.authorizationService = authorizationService;
|
|
38
35
|
this.tokenManager = tokenManager;
|
|
39
36
|
this.usersService = usersService;
|
|
40
37
|
}
|
|
41
38
|
use(req, res, next) {
|
|
42
39
|
(() => __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
var _a, _b, _c;
|
|
44
|
-
const
|
|
40
|
+
var _a, _b, _c, _d;
|
|
41
|
+
const moduleConfig = this.configProvider.config.api[this.moduleName];
|
|
42
|
+
const { anonymousAccessRoutes } = moduleConfig;
|
|
45
43
|
const requestMethod = req.method.toLowerCase();
|
|
46
44
|
if (!req.locals) {
|
|
47
45
|
req.locals = {};
|
|
@@ -63,37 +61,31 @@ let HTTPAuthenticationMiddleware = class HTTPAuthenticationMiddleware {
|
|
|
63
61
|
}
|
|
64
62
|
}
|
|
65
63
|
const { tokenManager, usersService } = this;
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
64
|
+
const hasApiKey = !!((_a = req.headers.authorization) === null || _a === void 0 ? void 0 : _a.match(/^ApiKey\s/));
|
|
65
|
+
if (hasApiKey) {
|
|
66
|
+
const [apiKeyFromHeader, requestSignature] = ((_c = (_b = req.headers.authorization) === null || _b === void 0 ? void 0 : _b.replace(/^ApiKey\s/, '')) === null || _c === void 0 ? void 0 : _c.split(' ')) || [];
|
|
67
|
+
let signatureContent = '';
|
|
68
|
+
if (requestMethod === 'get' && req.query && Object.keys(req.query).length) {
|
|
69
|
+
signatureContent = JSON.stringify(req.query);
|
|
71
70
|
}
|
|
72
|
-
if (
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
.createHmac(apiSecretAlgorithm, apiSecret)
|
|
91
|
-
.update(signatureContent)
|
|
92
|
-
.digest('hex');
|
|
93
|
-
if (calcualtedSignature !== requestSignature) {
|
|
94
|
-
console.error(`Invalid request signature in the authorization header. Expected: ${calcualtedSignature}. Provided: ${requestSignature}`);
|
|
95
|
-
throw new common_1.HttpException('Unauthorized', common_1.HttpStatus.UNAUTHORIZED);
|
|
96
|
-
}
|
|
71
|
+
else if ((requestMethod === 'delete' ||
|
|
72
|
+
requestMethod === 'patch' ||
|
|
73
|
+
requestMethod === 'post' ||
|
|
74
|
+
requestMethod === 'put') &&
|
|
75
|
+
req.body &&
|
|
76
|
+
Object.keys(req.body).length) {
|
|
77
|
+
signatureContent = JSON.stringify(req.body);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
signatureContent = req.originalUrl.split('?')[0];
|
|
81
|
+
}
|
|
82
|
+
const { valid } = yield this.authorizationService.authorizeApiKey({
|
|
83
|
+
apiKey: apiKeyFromHeader,
|
|
84
|
+
signature: requestSignature,
|
|
85
|
+
signatureContent
|
|
86
|
+
}, { config: moduleConfig });
|
|
87
|
+
if (!valid) {
|
|
88
|
+
throw new common_1.HttpException('Unauthorized', common_1.HttpStatus.UNAUTHORIZED);
|
|
97
89
|
}
|
|
98
90
|
next();
|
|
99
91
|
return;
|
|
@@ -104,9 +96,7 @@ let HTTPAuthenticationMiddleware = class HTTPAuthenticationMiddleware {
|
|
|
104
96
|
}
|
|
105
97
|
let tokens = [];
|
|
106
98
|
let authToken = req.headers.authorization;
|
|
107
|
-
let authTokenIsNew = false;
|
|
108
99
|
let refreshToken;
|
|
109
|
-
let tokenContent;
|
|
110
100
|
let useCookie = false;
|
|
111
101
|
if (typeof authToken === 'string' && authToken.length && authToken.match(/^Bearer\s/)) {
|
|
112
102
|
tokens = authToken.split(' ');
|
|
@@ -119,42 +109,24 @@ let HTTPAuthenticationMiddleware = class HTTPAuthenticationMiddleware {
|
|
|
119
109
|
authToken = req.cookies['sid'];
|
|
120
110
|
useCookie = true;
|
|
121
111
|
}
|
|
122
|
-
|
|
123
|
-
|
|
112
|
+
const { newAuthToken, tokenContent, valid } = yield this.authorizationService.authorizeBearer({ authToken, refreshToken }, { identifierDataField: usersService ? 'userId' : undefined });
|
|
113
|
+
if (!valid) {
|
|
124
114
|
throw new common_1.HttpException('Unauthorized', common_1.HttpStatus.UNAUTHORIZED);
|
|
125
115
|
}
|
|
126
|
-
try {
|
|
127
|
-
const tokenRes = yield tokenManager.verifyAccessToken(authToken, {
|
|
128
|
-
deleteFromStoreIfExpired: true,
|
|
129
|
-
identifierDataField: usersService ? 'userId' : undefined,
|
|
130
|
-
persistNewToken: true,
|
|
131
|
-
purgeStoreOnRenew: true,
|
|
132
|
-
refreshToken,
|
|
133
|
-
refreshTokenAccessTokenIdentifierDataField: 'accessToken'
|
|
134
|
-
});
|
|
135
|
-
tokenContent = tokenRes.content;
|
|
136
|
-
if (tokenRes.newToken) {
|
|
137
|
-
authTokenIsNew = true;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
catch (e) {
|
|
141
|
-
console.error('Failed to parse the access or refresh token:', e);
|
|
142
|
-
throw new common_1.HttpException('Unauthorized', common_1.HttpStatus.UNAUTHORIZED);
|
|
143
|
-
}
|
|
144
|
-
if (authTokenIsNew) {
|
|
145
|
-
res.setHeader('Authorization', `Bearer ${authToken}${refreshToken ? ` ${refreshToken}` : ''}`);
|
|
146
|
-
if (useCookie) {
|
|
147
|
-
res.cookie('sid', authToken);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
116
|
if (usersService) {
|
|
151
|
-
const userId = (
|
|
117
|
+
const userId = (_d = tokenContent === null || tokenContent === void 0 ? void 0 : tokenContent.data) === null || _d === void 0 ? void 0 : _d.userId;
|
|
152
118
|
if (!userId) {
|
|
153
119
|
console.error('Missing userId in the tokenContent data.');
|
|
154
120
|
throw new common_1.HttpException('Unauthorized', common_1.HttpStatus.UNAUTHORIZED);
|
|
155
121
|
}
|
|
156
122
|
req.locals.user = yield usersService.getUserWithPermissionsData({ filters: { id: userId } });
|
|
157
123
|
}
|
|
124
|
+
if (newAuthToken) {
|
|
125
|
+
res.setHeader('Authorization', `Bearer ${newAuthToken}${refreshToken ? ` ${refreshToken}` : ''}`);
|
|
126
|
+
if (useCookie) {
|
|
127
|
+
res.cookie('sid', newAuthToken);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
158
130
|
next();
|
|
159
131
|
}))().then(() => true, err => {
|
|
160
132
|
console.error(err);
|
|
@@ -162,13 +134,15 @@ let HTTPAuthenticationMiddleware = class HTTPAuthenticationMiddleware {
|
|
|
162
134
|
});
|
|
163
135
|
}
|
|
164
136
|
};
|
|
165
|
-
exports.
|
|
166
|
-
exports.
|
|
137
|
+
exports.HTTPAuthorizationMiddleware = HTTPAuthorizationMiddleware;
|
|
138
|
+
exports.HTTPAuthorizationMiddleware = HTTPAuthorizationMiddleware = __decorate([
|
|
167
139
|
(0, common_1.Injectable)(),
|
|
168
140
|
__param(1, (0, common_1.Inject)(definitions_1.Constants.API_MODULE_NAME)),
|
|
169
|
-
__param(2, (0, common_1.Inject)(definitions_1.Constants.
|
|
170
|
-
__param(3, (0, common_1.Inject)(definitions_1.Constants.
|
|
171
|
-
|
|
141
|
+
__param(2, (0, common_1.Inject)(definitions_1.Constants.API_MODULE_AUTHORIZATION_SERVICE)),
|
|
142
|
+
__param(3, (0, common_1.Inject)(definitions_1.Constants.AUTORIZATION_MIDDLEWARE_TOKEN_MANAGER_SERVICE)),
|
|
143
|
+
__param(4, (0, common_1.Inject)(definitions_1.Constants.AUTHENTICATION_MIDDLEWARE_USERS_SERVICE)),
|
|
144
|
+
__metadata("design:paramtypes", [core_1.ConfigProviderService, String, domain_iam_1.IAMAuthorizationService,
|
|
145
|
+
domain_iam_1.IAMTokenManagerService,
|
|
172
146
|
domain_iam_1.IAMUsersService])
|
|
173
|
-
],
|
|
174
|
-
//# sourceMappingURL=http.middlewares.
|
|
147
|
+
], HTTPAuthorizationMiddleware);
|
|
148
|
+
//# sourceMappingURL=http.middlewares.authorization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.middlewares.authorization.js","sourceRoot":"","sources":["../../src/middlewares/http.middlewares.authorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './http.middlewares.
|
|
1
|
+
export * from './http.middlewares.authorization';
|
|
2
2
|
export * from './http.middlewares.cors';
|
|
@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./http.middlewares.
|
|
17
|
+
__exportStar(require("./http.middlewares.authorization"), exports);
|
|
18
18
|
__exportStar(require("./http.middlewares.cors"), exports);
|
|
19
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mEAAiD;AACjD,0DAAwC"}
|
|
@@ -40,7 +40,7 @@ let HTTPAPIModule = HTTPAPIModule_1 = class HTTPAPIModule {
|
|
|
40
40
|
.apply((0, morgan_1.default)(`[${this.moduleName}]: :method :url :status :res[content-length] - :response-time ms`))
|
|
41
41
|
.forRoutes('*');
|
|
42
42
|
consumer.apply(middlewares_1.HTTPCORSMiddleware).forRoutes('*');
|
|
43
|
-
consumer.apply(middlewares_1.
|
|
43
|
+
consumer.apply(middlewares_1.HTTPAuthorizationMiddleware).forRoutes('*');
|
|
44
44
|
}
|
|
45
45
|
static rawBodyBuffer(req, _res, buffer) {
|
|
46
46
|
if (buffer && buffer.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.api.module.js","sourceRoot":"","sources":["../../src/module/http.api.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,2CAA2G;AAC3G,uCAAwC;AAExC,uCAAyE;AAEzE,kEAAyC;AACzC,sDAA4C;AAC5C,oDAA4B;AAI5B,uDAAqE;AACrE,wCAAiD;AACjD,kDAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"http.api.module.js","sourceRoot":"","sources":["../../src/module/http.api.module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@node-c/api-http",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-alpha62",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"@types/lodash": "^4.17.19"
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|
|
28
|
-
"@node-c/core": "^1.0.0-
|
|
29
|
-
"@node-c/domain-iam": "^1.0.0-
|
|
28
|
+
"@node-c/core": "^1.0.0-alpha62",
|
|
29
|
+
"@node-c/domain-iam": "^1.0.0-alpha62"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"http.middlewares.authentication.js","sourceRoot":"","sources":["../../src/middlewares/http.middlewares.authentication.ts"],"names":[],"mappings":"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"}
|