@node-c/domain-iam 1.0.0-beta2 → 1.0.0-beta3
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/services/authorization/iam.authorization.service.d.ts +3 -1
- package/dist/services/authorization/iam.authorization.service.js +12 -4
- package/dist/services/authorization/iam.authorization.service.js.map +1 -1
- package/dist/services/tokenManager/iam.tokenManager.definitions.d.ts +5 -2
- package/dist/services/tokenManager/iam.tokenManager.definitions.js +1 -0
- package/dist/services/tokenManager/iam.tokenManager.definitions.js.map +1 -1
- package/dist/services/tokenManager/iam.tokenManager.service.d.ts +1 -1
- package/dist/services/tokenManager/iam.tokenManager.service.js +75 -24
- package/dist/services/tokenManager/iam.tokenManager.service.js.map +1 -1
- package/dist/services/userManager/iam.userManager.definitions.d.ts +2 -0
- package/dist/services/userManager/iam.userManager.definitions.js.map +1 -1
- package/dist/services/userManager/iam.userManager.service.js +18 -7
- package/dist/services/userManager/iam.userManager.service.js.map +1 -1
- package/package.json +2 -2
- package/src/services/authorization/iam.authorization.service.ts +20 -5
- package/src/services/tokenManager/iam.tokenManager.definitions.ts +6 -2
- package/src/services/tokenManager/iam.tokenManager.service.ts +102 -32
- package/src/services/userManager/iam.userManager.definitions.ts +2 -0
- package/src/services/userManager/iam.userManager.service.ts +25 -8
|
@@ -17,7 +17,9 @@ export declare class IAMAuthorizationService<AuthorizationPoint extends BaseAuth
|
|
|
17
17
|
}, options?: {
|
|
18
18
|
identifierDataField?: string;
|
|
19
19
|
}): Promise<{
|
|
20
|
-
|
|
20
|
+
newAccessToken?: string;
|
|
21
|
+
newIdToken?: string;
|
|
22
|
+
newRefreshToken?: string;
|
|
21
23
|
tokenContent?: DecodedTokenContent<UserTokenEnityFields>;
|
|
22
24
|
valid: boolean;
|
|
23
25
|
}>;
|
|
@@ -73,7 +73,9 @@ class IAMAuthorizationService extends core_1.DomainEntityService {
|
|
|
73
73
|
logger.error('Missing auth token.');
|
|
74
74
|
return { valid: false };
|
|
75
75
|
}
|
|
76
|
-
let
|
|
76
|
+
let newAccessToken;
|
|
77
|
+
let newIdToken;
|
|
78
|
+
let newRefreshToken;
|
|
77
79
|
let tokenContent;
|
|
78
80
|
try {
|
|
79
81
|
const tokenRes = yield tokenManager.verifyAccessToken(authToken, {
|
|
@@ -85,15 +87,21 @@ class IAMAuthorizationService extends core_1.DomainEntityService {
|
|
|
85
87
|
refreshTokenAccessTokenIdentifierDataField: 'accessToken'
|
|
86
88
|
});
|
|
87
89
|
tokenContent = tokenRes.content;
|
|
88
|
-
if (tokenRes.
|
|
89
|
-
|
|
90
|
+
if (tokenRes.newAccessToken) {
|
|
91
|
+
newAccessToken = tokenRes.newAccessToken;
|
|
92
|
+
}
|
|
93
|
+
if (tokenRes.newIdToken) {
|
|
94
|
+
newIdToken = tokenRes.newIdToken;
|
|
95
|
+
}
|
|
96
|
+
if (tokenRes.newRefreshToken) {
|
|
97
|
+
newRefreshToken = tokenRes.newRefreshToken;
|
|
90
98
|
}
|
|
91
99
|
}
|
|
92
100
|
catch (e) {
|
|
93
101
|
logger.error('Failed to parse the access or refresh token:', e);
|
|
94
102
|
return { valid: false };
|
|
95
103
|
}
|
|
96
|
-
return {
|
|
104
|
+
return { newAccessToken, newIdToken, newRefreshToken, tokenContent, valid: true };
|
|
97
105
|
});
|
|
98
106
|
}
|
|
99
107
|
checkAccessWithStorage() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam.authorization.service.js","sourceRoot":"","sources":["../../../src/services/authorization/iam.authorization.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"iam.authorization.service.js","sourceRoot":"","sources":["../../../src/services/authorization/iam.authorization.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ export type TokenManagerCreateOptions = {
|
|
|
24
24
|
} & DomainCreateOptions;
|
|
25
25
|
export declare enum TokenType {
|
|
26
26
|
Access = "access",
|
|
27
|
+
Id = "id",
|
|
27
28
|
Refresh = "refresh"
|
|
28
29
|
}
|
|
29
30
|
export interface TokenManagerVerifyResult<TokenEntityFields> {
|
|
@@ -34,7 +35,7 @@ export interface TokenManagerVerifyResult<TokenEntityFields> {
|
|
|
34
35
|
export interface VerifyAccessTokenOptions {
|
|
35
36
|
deleteFromStoreIfExpired?: boolean;
|
|
36
37
|
identifierDataField?: string;
|
|
37
|
-
|
|
38
|
+
newAccessTokenExpiresInMinutes?: number;
|
|
38
39
|
persistNewToken?: boolean;
|
|
39
40
|
purgeStoreOnRenew?: boolean;
|
|
40
41
|
refreshToken?: string;
|
|
@@ -42,5 +43,7 @@ export interface VerifyAccessTokenOptions {
|
|
|
42
43
|
}
|
|
43
44
|
export interface VerifyAccessTokenReturnData<TokenEntityFields> {
|
|
44
45
|
content?: DecodedTokenContent<TokenEntityFields>;
|
|
45
|
-
|
|
46
|
+
newAccessToken?: string;
|
|
47
|
+
newIdToken?: string;
|
|
48
|
+
newRefreshToken?: string;
|
|
46
49
|
}
|
|
@@ -4,6 +4,7 @@ exports.TokenType = void 0;
|
|
|
4
4
|
var TokenType;
|
|
5
5
|
(function (TokenType) {
|
|
6
6
|
TokenType["Access"] = "access";
|
|
7
|
+
TokenType["Id"] = "id";
|
|
7
8
|
TokenType["Refresh"] = "refresh";
|
|
8
9
|
})(TokenType || (exports.TokenType = TokenType = {}));
|
|
9
10
|
//# sourceMappingURL=iam.tokenManager.definitions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam.tokenManager.definitions.js","sourceRoot":"","sources":["../../../src/services/tokenManager/iam.tokenManager.definitions.ts"],"names":[],"mappings":";;;AAkCA,IAAY,
|
|
1
|
+
{"version":3,"file":"iam.tokenManager.definitions.js","sourceRoot":"","sources":["../../../src/services/tokenManager/iam.tokenManager.definitions.ts"],"names":[],"mappings":";;;AAkCA,IAAY,SAOX;AAPD,WAAY,SAAS;IAEnB,8BAAiB,CAAA;IAEjB,sBAAS,CAAA;IAET,gCAAmB,CAAA;AACrB,CAAC,EAPW,SAAS,yBAAT,SAAS,QAOpB"}
|
|
@@ -11,7 +11,7 @@ export declare class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
11
11
|
[serviceName: string]: IAMAuthenticationService<object, object>;
|
|
12
12
|
};
|
|
13
13
|
protected configProvider: ConfigProviderService;
|
|
14
|
-
|
|
14
|
+
domainTokensEntityService: DomainEntityService<TokenEntity<TokenEntityFields>, DataEntityService<TokenEntity<TokenEntityFields>>>;
|
|
15
15
|
protected logger: LoggerService;
|
|
16
16
|
protected moduleName: string;
|
|
17
17
|
constructor(authServices: {
|
|
@@ -88,6 +88,15 @@ class IAMTokenManagerService {
|
|
|
88
88
|
signOptions.expiresIn = moduleConfig.accessTokenExpiryTimeInMinutes * 60;
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
|
+
else if (type === iam_tokenManager_definitions_1.TokenType.Id) {
|
|
92
|
+
secret = moduleConfig.jwtAccessSecret;
|
|
93
|
+
if (expiresInMinutes) {
|
|
94
|
+
signOptions.expiresIn = expiresInMinutes * 60;
|
|
95
|
+
}
|
|
96
|
+
else if (moduleConfig.refreshTokenExpiryTimeInMinutes) {
|
|
97
|
+
signOptions.expiresIn = moduleConfig.refreshTokenExpiryTimeInMinutes * 60;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
91
100
|
else if (type === iam_tokenManager_definitions_1.TokenType.Refresh) {
|
|
92
101
|
secret = moduleConfig.jwtRefreshSecret;
|
|
93
102
|
if (expiresInMinutes) {
|
|
@@ -133,15 +142,18 @@ class IAMTokenManagerService {
|
|
|
133
142
|
var _a;
|
|
134
143
|
const { configProvider, domainTokensEntityService, logger, moduleName } = this;
|
|
135
144
|
const moduleConfig = configProvider.config.domain[moduleName];
|
|
136
|
-
const { deleteFromStoreIfExpired, identifierDataField,
|
|
137
|
-
const
|
|
145
|
+
const { deleteFromStoreIfExpired, identifierDataField, newAccessTokenExpiresInMinutes, persistNewToken, purgeStoreOnRenew, refreshToken, refreshTokenAccessTokenIdentifierDataField } = options || {};
|
|
146
|
+
const _b = yield this.verify(token, moduleConfig.jwtAccessSecret, {
|
|
138
147
|
verifyExternal: true
|
|
139
|
-
});
|
|
148
|
+
}), { error, externalTokenData } = _b, accessTokenData = __rest(_b, ["error", "externalTokenData"]);
|
|
140
149
|
const externalAccessTokenExpired = !!(externalTokenData === null || externalTokenData === void 0 ? void 0 : externalTokenData.error);
|
|
141
150
|
const internalAccessTokenExpired = error === definitions_1.Constants.TOKEN_EXPIRED_ERROR;
|
|
151
|
+
let content = accessTokenData.content;
|
|
142
152
|
let errorMessageToLog;
|
|
143
153
|
let externalRenewEnabled = false;
|
|
144
|
-
let
|
|
154
|
+
let newAccessToken;
|
|
155
|
+
let newIdToken;
|
|
156
|
+
let newRefreshToken;
|
|
145
157
|
let refreshTokenContent;
|
|
146
158
|
let renewEnabled = false;
|
|
147
159
|
let throwError = true;
|
|
@@ -209,31 +221,70 @@ class IAMTokenManagerService {
|
|
|
209
221
|
logger.error(errorMessageToLog);
|
|
210
222
|
throw new core_1.ApplicationError('Expired access token.');
|
|
211
223
|
}
|
|
212
|
-
if (
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
224
|
+
if (content === null || content === void 0 ? void 0 : content.data) {
|
|
225
|
+
let idTokenContent;
|
|
226
|
+
let identifierValue;
|
|
227
|
+
if (identifierDataField) {
|
|
228
|
+
identifierValue = lodash_1.default.get(content.data, identifierDataField);
|
|
229
|
+
const idToken = yield this.domainTokensEntityService.findOne({
|
|
230
|
+
filters: { [identifierDataField]: identifierValue, token, type: iam_tokenManager_definitions_1.TokenType.Access }
|
|
231
|
+
});
|
|
232
|
+
if (idToken.result) {
|
|
233
|
+
const idTokenData = yield this.verify(idToken.result.token, moduleConfig.jwtAccessSecret);
|
|
234
|
+
if (idTokenData.content) {
|
|
235
|
+
idTokenContent = idTokenData.content;
|
|
236
|
+
content = lodash_1.default.merge(content, idTokenContent);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
216
239
|
}
|
|
217
|
-
if (
|
|
218
|
-
const
|
|
219
|
-
|
|
220
|
-
|
|
240
|
+
if (renewEnabled) {
|
|
241
|
+
const tokenData = Object.assign(Object.assign({}, content.data), { type: iam_tokenManager_definitions_1.TokenType.Access });
|
|
242
|
+
const refreshTokenData = Object.assign(Object.assign({}, refreshTokenContent === null || refreshTokenContent === void 0 ? void 0 : refreshTokenContent.data), { type: iam_tokenManager_definitions_1.TokenType.Access });
|
|
243
|
+
if (refreshToken && refreshTokenAccessTokenIdentifierDataField) {
|
|
244
|
+
tokenData[refreshTokenAccessTokenIdentifierDataField] = refreshToken;
|
|
245
|
+
}
|
|
246
|
+
if (externalRenewEnabled) {
|
|
247
|
+
const externalAccessTokenRenewalResult = yield this.authServices[refreshTokenContent.data.externalTokenAuthService].refreshExternalAccessToken({
|
|
248
|
+
accessToken: content.data.externalToken,
|
|
249
|
+
refreshToken: refreshTokenContent.data.externalToken
|
|
250
|
+
});
|
|
251
|
+
if (externalAccessTokenRenewalResult.error) {
|
|
252
|
+
logger.error(errorMessageToLog);
|
|
253
|
+
throw new core_1.ApplicationError('Expired access token.');
|
|
254
|
+
}
|
|
255
|
+
tokenData.externalToken = externalAccessTokenRenewalResult.newAccessToken;
|
|
256
|
+
if (externalAccessTokenRenewalResult.newRefreshToken) {
|
|
257
|
+
refreshTokenData.externalToken = externalAccessTokenRenewalResult.newRefreshToken;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
const { result } = yield this.create(tokenData, {
|
|
261
|
+
expiresInMinutes: newAccessTokenExpiresInMinutes,
|
|
262
|
+
identifierDataField,
|
|
263
|
+
persist: persistNewToken,
|
|
264
|
+
purgeOldFromData: purgeStoreOnRenew
|
|
221
265
|
});
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
266
|
+
newAccessToken = result.token;
|
|
267
|
+
refreshTokenData.accessToken = newAccessToken;
|
|
268
|
+
const { result: refreshTokenResult } = yield this.create(refreshTokenData, {
|
|
269
|
+
expiresInMinutes: newAccessTokenExpiresInMinutes,
|
|
270
|
+
identifierDataField,
|
|
271
|
+
persist: persistNewToken,
|
|
272
|
+
purgeOldFromData: purgeStoreOnRenew
|
|
273
|
+
});
|
|
274
|
+
newRefreshToken = refreshTokenResult.token;
|
|
275
|
+
if (idTokenContent === null || idTokenContent === void 0 ? void 0 : idTokenContent.data) {
|
|
276
|
+
const { result: newIdTokenResult } = yield this.create(Object.assign(Object.assign({}, idTokenContent.data), { accessToken: newAccessToken, type: iam_tokenManager_definitions_1.TokenType.Id, [identifierDataField]: identifierValue }), {
|
|
277
|
+
expiresInMinutes: newAccessTokenExpiresInMinutes,
|
|
278
|
+
identifierDataField,
|
|
279
|
+
persist: true,
|
|
280
|
+
purgeOldFromData: true,
|
|
281
|
+
tokenContentOnlyFields: Object.keys(idTokenContent.data)
|
|
282
|
+
});
|
|
283
|
+
newIdToken = newIdTokenResult.token;
|
|
225
284
|
}
|
|
226
|
-
tokenData.externalToken = externalAccessTokenRenewalResult.newAccessToken;
|
|
227
285
|
}
|
|
228
|
-
const { result } = yield this.create(tokenData, {
|
|
229
|
-
expiresInMinutes: newTokenExpiresInMinutes,
|
|
230
|
-
identifierDataField,
|
|
231
|
-
persist: persistNewToken,
|
|
232
|
-
purgeOldFromData: purgeStoreOnRenew
|
|
233
|
-
});
|
|
234
|
-
newToken = result.token;
|
|
235
286
|
}
|
|
236
|
-
return { content,
|
|
287
|
+
return { content, newAccessToken, newRefreshToken, newIdToken };
|
|
237
288
|
});
|
|
238
289
|
}
|
|
239
290
|
verify(token, secret, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam.tokenManager.service.js","sourceRoot":"","sources":["../../../src/services/tokenManager/iam.tokenManager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAWsB;AAEtB,kDAAoC;AACpC,oDAAwB;AAExB,iFASwC;AAExC,0DAAqD;AACrD,sDAAoF;AAOpF,MAAa,sBAAsB;IACjC,YAIY,YAG6D,EAE7D,cAAqC,
|
|
1
|
+
{"version":3,"file":"iam.tokenManager.service.js","sourceRoot":"","sources":["../../../src/services/tokenManager/iam.tokenManager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export interface IAMUserManagerCreateAccessTokenOptions<AuthData = unknown> {
|
|
|
14
14
|
}
|
|
15
15
|
export type IAMUserManagerCreateAccessTokenReturnData<UserData> = {
|
|
16
16
|
accessToken: string;
|
|
17
|
+
idToken: string;
|
|
17
18
|
refreshToken?: string;
|
|
18
19
|
user: UserData;
|
|
19
20
|
} | {
|
|
@@ -36,6 +37,7 @@ export interface IAMUserManagerGetUserWithPermissionsDataOptions extends DomainF
|
|
|
36
37
|
}
|
|
37
38
|
export type IAMUserManagerUserWithPermissionsData<UserData, AuthorizationPointId> = AuthorizationUser<AuthorizationPointId> & UserData;
|
|
38
39
|
export interface IAMUserManagerUserTokenEnityFields<UserId = unknown> {
|
|
40
|
+
accessToken?: string;
|
|
39
41
|
refreshToken?: string;
|
|
40
42
|
userId: UserId;
|
|
41
43
|
user?: IAMUserManagerUserWithPermissionsData<object, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam.userManager.definitions.js","sourceRoot":"","sources":["../../../src/services/userManager/iam.userManager.definitions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"iam.userManager.definitions.js","sourceRoot":"","sources":["../../../src/services/userManager/iam.userManager.definitions.ts"],"names":[],"mappings":";;;AAuEA,IAAY,qCAGX;AAHD,WAAY,qCAAqC;IAE/C,6DAAoB,CAAA;AACtB,CAAC,EAHW,qCAAqC,qDAArC,qCAAqC,QAGhD"}
|
|
@@ -128,23 +128,34 @@ class IAMUserManagerService {
|
|
|
128
128
|
});
|
|
129
129
|
refreshToken = localRefreshToken;
|
|
130
130
|
}
|
|
131
|
+
const accessTokenExpiresIn = (externalAccessToken && 'accessTokenExpiresIn' in actualStepResult && actualStepResult.accessTokenExpiresIn) ||
|
|
132
|
+
accessTokenExpiryTimeInMinutes;
|
|
131
133
|
const { result: { token: accessToken } } = yield this.tokenManager.create(Object.assign({ refreshToken, type: tokenManager_1.TokenType.Access, user, [iam_userManager_definitions_1.IAMUserManagerUserTokenUserIdentifier.FieldName]: userIdentifierValue }, (externalAccessToken
|
|
132
134
|
? {
|
|
133
135
|
externalToken: externalAccessToken,
|
|
134
136
|
externalTokenAuthService: authType
|
|
135
137
|
}
|
|
136
138
|
: {})), {
|
|
137
|
-
expiresInMinutes:
|
|
138
|
-
'accessTokenExpiresIn' in actualStepResult &&
|
|
139
|
-
actualStepResult.accessTokenExpiresIn) ||
|
|
140
|
-
accessTokenExpiryTimeInMinutes,
|
|
139
|
+
expiresInMinutes: accessTokenExpiresIn,
|
|
141
140
|
identifierDataField: iam_userManager_definitions_1.IAMUserManagerUserTokenUserIdentifier.FieldName,
|
|
142
141
|
persist: true,
|
|
143
142
|
purgeOldFromData: true,
|
|
144
|
-
tokenContentOnlyFields: ['externalToken', 'refreshToken'
|
|
143
|
+
tokenContentOnlyFields: ['externalToken', 'refreshToken']
|
|
144
|
+
});
|
|
145
|
+
const { result: { token: idToken } } = yield this.tokenManager.create({
|
|
146
|
+
accessToken,
|
|
147
|
+
type: tokenManager_1.TokenType.Id,
|
|
148
|
+
user,
|
|
149
|
+
[iam_userManager_definitions_1.IAMUserManagerUserTokenUserIdentifier.FieldName]: userIdentifierValue
|
|
150
|
+
}, {
|
|
151
|
+
expiresInMinutes: accessTokenExpiresIn,
|
|
152
|
+
identifierDataField: iam_userManager_definitions_1.IAMUserManagerUserTokenUserIdentifier.FieldName,
|
|
153
|
+
persist: true,
|
|
154
|
+
purgeOldFromData: true,
|
|
155
|
+
tokenContentOnlyFields: ['accessToken', 'user']
|
|
145
156
|
});
|
|
146
157
|
logger.info(`[Domain.${moduleName}.UserManager]: Login attempt successful for ${userFilterField} ${userFilterValue}.`);
|
|
147
|
-
return { accessToken, refreshToken, user };
|
|
158
|
+
return { accessToken, idToken, refreshToken, user };
|
|
148
159
|
}
|
|
149
160
|
const returnData = { nextStepsRequired: true };
|
|
150
161
|
if ((_a = stepConfig.stepResultPublicFields) === null || _a === void 0 ? void 0 : _a.length) {
|
|
@@ -189,7 +200,7 @@ class IAMUserManagerService {
|
|
|
189
200
|
data: stepInputData.data,
|
|
190
201
|
options: stepInputData.options
|
|
191
202
|
};
|
|
192
|
-
const cacheResult = yield this.
|
|
203
|
+
const cacheResult = yield this.tokenManager.domainTokensEntityService.findOne({
|
|
193
204
|
filters: {
|
|
194
205
|
[cacheSettings.settings.cacheFieldName]: (0, core_1.getNested)(cacheInput, cacheSettings.settings.inputFieldName)
|
|
195
206
|
.unifiedValue
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iam.userManager.service.js","sourceRoot":"","sources":["../../../src/services/userManager/iam.userManager.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"iam.userManager.service.js","sourceRoot":"","sources":["../../../src/services/userManager/iam.userManager.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@node-c/domain-iam",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-beta3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@nestjs/common": "^11.1.16",
|
|
19
|
-
"@node-c/core": "^1.0.0-
|
|
19
|
+
"@node-c/core": "^1.0.0-beta3",
|
|
20
20
|
"jsonwebtoken": "^9.0.2",
|
|
21
21
|
"lodash": "^4.17.21"
|
|
22
22
|
},
|
|
@@ -85,10 +85,17 @@ export class IAMAuthorizationService<
|
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
// TODO: decouple from users
|
|
88
|
+
// TODO: use an idToken, rather than an accessToken, for the permissions
|
|
88
89
|
async authorizeBearer<UserTokenEnityFields = unknown>(
|
|
89
90
|
data: { authToken?: string; refreshToken?: string },
|
|
90
91
|
options?: { identifierDataField?: string }
|
|
91
|
-
): Promise<{
|
|
92
|
+
): Promise<{
|
|
93
|
+
newAccessToken?: string;
|
|
94
|
+
newIdToken?: string;
|
|
95
|
+
newRefreshToken?: string;
|
|
96
|
+
tokenContent?: DecodedTokenContent<UserTokenEnityFields>;
|
|
97
|
+
valid: boolean;
|
|
98
|
+
}> {
|
|
92
99
|
const { logger, tokenManager } = this;
|
|
93
100
|
const { authToken, refreshToken } = data;
|
|
94
101
|
const { identifierDataField } = options || {};
|
|
@@ -100,7 +107,9 @@ export class IAMAuthorizationService<
|
|
|
100
107
|
logger.error('Missing auth token.');
|
|
101
108
|
return { valid: false };
|
|
102
109
|
}
|
|
103
|
-
let
|
|
110
|
+
let newAccessToken: string | undefined;
|
|
111
|
+
let newIdToken: string | undefined;
|
|
112
|
+
let newRefreshToken: string | undefined;
|
|
104
113
|
let tokenContent: DecodedTokenContent<UserTokenEnityFields> | undefined;
|
|
105
114
|
try {
|
|
106
115
|
const tokenRes = await tokenManager.verifyAccessToken(authToken, {
|
|
@@ -112,14 +121,20 @@ export class IAMAuthorizationService<
|
|
|
112
121
|
refreshTokenAccessTokenIdentifierDataField: 'accessToken'
|
|
113
122
|
});
|
|
114
123
|
tokenContent = tokenRes.content as unknown as DecodedTokenContent<UserTokenEnityFields>;
|
|
115
|
-
if (tokenRes.
|
|
116
|
-
|
|
124
|
+
if (tokenRes.newAccessToken) {
|
|
125
|
+
newAccessToken = tokenRes.newAccessToken;
|
|
126
|
+
}
|
|
127
|
+
if (tokenRes.newIdToken) {
|
|
128
|
+
newIdToken = tokenRes.newIdToken;
|
|
129
|
+
}
|
|
130
|
+
if (tokenRes.newRefreshToken) {
|
|
131
|
+
newRefreshToken = tokenRes.newRefreshToken;
|
|
117
132
|
}
|
|
118
133
|
} catch (e) {
|
|
119
134
|
logger.error('Failed to parse the access or refresh token:', e);
|
|
120
135
|
return { valid: false };
|
|
121
136
|
}
|
|
122
|
-
return {
|
|
137
|
+
return { newAccessToken, newIdToken, newRefreshToken, tokenContent, valid: true };
|
|
123
138
|
}
|
|
124
139
|
|
|
125
140
|
async checkAccessWithStorage(): Promise<void> {
|
|
@@ -36,6 +36,8 @@ export enum TokenType {
|
|
|
36
36
|
// eslint-disable-next-line no-unused-vars
|
|
37
37
|
Access = 'access',
|
|
38
38
|
// eslint-disable-next-line no-unused-vars
|
|
39
|
+
Id = 'id',
|
|
40
|
+
// eslint-disable-next-line no-unused-vars
|
|
39
41
|
Refresh = 'refresh'
|
|
40
42
|
}
|
|
41
43
|
|
|
@@ -48,7 +50,7 @@ export interface TokenManagerVerifyResult<TokenEntityFields> {
|
|
|
48
50
|
export interface VerifyAccessTokenOptions {
|
|
49
51
|
deleteFromStoreIfExpired?: boolean;
|
|
50
52
|
identifierDataField?: string;
|
|
51
|
-
|
|
53
|
+
newAccessTokenExpiresInMinutes?: number;
|
|
52
54
|
persistNewToken?: boolean;
|
|
53
55
|
purgeStoreOnRenew?: boolean;
|
|
54
56
|
refreshToken?: string;
|
|
@@ -57,5 +59,7 @@ export interface VerifyAccessTokenOptions {
|
|
|
57
59
|
|
|
58
60
|
export interface VerifyAccessTokenReturnData<TokenEntityFields> {
|
|
59
61
|
content?: DecodedTokenContent<TokenEntityFields>;
|
|
60
|
-
|
|
62
|
+
newAccessToken?: string;
|
|
63
|
+
newIdToken?: string;
|
|
64
|
+
newRefreshToken?: string;
|
|
61
65
|
}
|
|
@@ -45,7 +45,7 @@ export class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
45
45
|
// eslint-disable-next-line no-unused-vars
|
|
46
46
|
protected configProvider: ConfigProviderService,
|
|
47
47
|
// eslint-disable-next-line no-unused-vars
|
|
48
|
-
|
|
48
|
+
public domainTokensEntityService: DomainEntityService<
|
|
49
49
|
TokenEntity<TokenEntityFields>,
|
|
50
50
|
DataEntityService<TokenEntity<TokenEntityFields>>
|
|
51
51
|
>,
|
|
@@ -65,7 +65,7 @@ export class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
65
65
|
const { expiresInMinutes, identifierDataField, persist, purgeOldFromData, tokenContentOnlyFields } = options;
|
|
66
66
|
const signOptions = {} as jwt.SignOptions;
|
|
67
67
|
let secret: string;
|
|
68
|
-
//
|
|
68
|
+
// access token options
|
|
69
69
|
if (type === TokenType.Access) {
|
|
70
70
|
secret = moduleConfig.jwtAccessSecret;
|
|
71
71
|
if (expiresInMinutes) {
|
|
@@ -73,7 +73,18 @@ export class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
73
73
|
} else if (moduleConfig.accessTokenExpiryTimeInMinutes) {
|
|
74
74
|
signOptions.expiresIn = moduleConfig.accessTokenExpiryTimeInMinutes * 60;
|
|
75
75
|
}
|
|
76
|
-
}
|
|
76
|
+
}
|
|
77
|
+
// id token options: this intentionally uses the jwtAccessSecret and the jwtRefreshTokenExpiryTimeInMinutes
|
|
78
|
+
else if (type === TokenType.Id) {
|
|
79
|
+
secret = moduleConfig.jwtAccessSecret;
|
|
80
|
+
if (expiresInMinutes) {
|
|
81
|
+
signOptions.expiresIn = expiresInMinutes * 60;
|
|
82
|
+
} else if (moduleConfig.refreshTokenExpiryTimeInMinutes) {
|
|
83
|
+
signOptions.expiresIn = moduleConfig.refreshTokenExpiryTimeInMinutes * 60;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
// refresh token options
|
|
87
|
+
else if (type === TokenType.Refresh) {
|
|
77
88
|
secret = moduleConfig.jwtRefreshSecret;
|
|
78
89
|
if (expiresInMinutes) {
|
|
79
90
|
signOptions.expiresIn = expiresInMinutes * 60;
|
|
@@ -118,7 +129,6 @@ export class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
118
129
|
return { result: objectToSave };
|
|
119
130
|
}
|
|
120
131
|
|
|
121
|
-
// TODO: delete from store at the end
|
|
122
132
|
async verifyAccessToken(
|
|
123
133
|
token: string,
|
|
124
134
|
options?: VerifyAccessTokenOptions
|
|
@@ -128,22 +138,25 @@ export class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
128
138
|
const {
|
|
129
139
|
deleteFromStoreIfExpired,
|
|
130
140
|
identifierDataField,
|
|
131
|
-
|
|
141
|
+
newAccessTokenExpiresInMinutes,
|
|
132
142
|
persistNewToken,
|
|
133
143
|
purgeStoreOnRenew,
|
|
134
144
|
refreshToken,
|
|
135
145
|
refreshTokenAccessTokenIdentifierDataField
|
|
136
146
|
} = options || {};
|
|
137
147
|
// decode the token
|
|
138
|
-
const {
|
|
148
|
+
const { error, externalTokenData, ...accessTokenData } = await this.verify(token, moduleConfig.jwtAccessSecret, {
|
|
139
149
|
// TODO: make this configurable
|
|
140
150
|
verifyExternal: true
|
|
141
151
|
});
|
|
142
152
|
const externalAccessTokenExpired = !!externalTokenData?.error;
|
|
143
153
|
const internalAccessTokenExpired = error === Constants.TOKEN_EXPIRED_ERROR;
|
|
154
|
+
let content = accessTokenData.content;
|
|
144
155
|
let errorMessageToLog: string | undefined;
|
|
145
156
|
let externalRenewEnabled = false;
|
|
146
|
-
let
|
|
157
|
+
let newAccessToken: string | undefined;
|
|
158
|
+
let newIdToken: string | undefined;
|
|
159
|
+
let newRefreshToken: string | undefined;
|
|
147
160
|
let refreshTokenContent: DecodedTokenContent<object> | undefined;
|
|
148
161
|
let renewEnabled = false;
|
|
149
162
|
let throwError = true;
|
|
@@ -222,36 +235,93 @@ export class IAMTokenManagerService<TokenEntityFields extends object> {
|
|
|
222
235
|
logger.error(errorMessageToLog);
|
|
223
236
|
throw new ApplicationError('Expired access token.');
|
|
224
237
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
238
|
+
if (content?.data) {
|
|
239
|
+
let idTokenContent: DecodedTokenContent<TokenEntityFields> | undefined;
|
|
240
|
+
let identifierValue: unknown | undefined;
|
|
241
|
+
// find and decode the id token, and add its data to the content
|
|
242
|
+
if (identifierDataField) {
|
|
243
|
+
identifierValue = ld.get(content.data, identifierDataField);
|
|
244
|
+
const idToken = await this.domainTokensEntityService.findOne({
|
|
245
|
+
filters: { [identifierDataField]: identifierValue, token, type: TokenType.Access }
|
|
246
|
+
});
|
|
247
|
+
if (idToken.result) {
|
|
248
|
+
const idTokenData = await this.verify(idToken.result.token, moduleConfig.jwtAccessSecret);
|
|
249
|
+
if (idTokenData.content) {
|
|
250
|
+
idTokenContent = idTokenData.content;
|
|
251
|
+
content = ld.merge(content, idTokenContent);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
230
254
|
}
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
255
|
+
// renewal
|
|
256
|
+
if (renewEnabled) {
|
|
257
|
+
const tokenData: TokenManagerCreateData<GenericObject<unknown>> = { ...content.data, type: TokenType.Access };
|
|
258
|
+
const refreshTokenData: TokenManagerCreateData<GenericObject<unknown>> = {
|
|
259
|
+
...refreshTokenContent?.data,
|
|
260
|
+
type: TokenType.Access
|
|
261
|
+
};
|
|
262
|
+
if (refreshToken && refreshTokenAccessTokenIdentifierDataField) {
|
|
263
|
+
tokenData[refreshTokenAccessTokenIdentifierDataField] = refreshToken;
|
|
264
|
+
}
|
|
265
|
+
// renew the external access token, if enabled
|
|
266
|
+
if (externalRenewEnabled) {
|
|
267
|
+
const externalAccessTokenRenewalResult = await this.authServices[
|
|
268
|
+
refreshTokenContent!.data!.externalTokenAuthService!
|
|
269
|
+
]!.refreshExternalAccessToken({
|
|
270
|
+
accessToken: content.data!.externalToken!,
|
|
271
|
+
refreshToken: refreshTokenContent!.data!.externalToken!
|
|
272
|
+
});
|
|
273
|
+
if (externalAccessTokenRenewalResult.error) {
|
|
274
|
+
// TODO: delete the old token from store
|
|
275
|
+
logger.error(errorMessageToLog);
|
|
276
|
+
throw new ApplicationError('Expired access token.');
|
|
277
|
+
}
|
|
278
|
+
tokenData.externalToken = externalAccessTokenRenewalResult.newAccessToken;
|
|
279
|
+
if (externalAccessTokenRenewalResult.newRefreshToken) {
|
|
280
|
+
refreshTokenData.externalToken = externalAccessTokenRenewalResult.newRefreshToken;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
// renew the internal access tokens
|
|
284
|
+
const { result } = await this.create(tokenData as TokenManagerCreateData<TokenEntityFields>, {
|
|
285
|
+
expiresInMinutes: newAccessTokenExpiresInMinutes,
|
|
286
|
+
identifierDataField,
|
|
287
|
+
persist: persistNewToken,
|
|
288
|
+
purgeOldFromData: purgeStoreOnRenew
|
|
237
289
|
});
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
290
|
+
newAccessToken = result.token;
|
|
291
|
+
refreshTokenData.accessToken = newAccessToken;
|
|
292
|
+
// renew the internal refreshToken
|
|
293
|
+
const { result: refreshTokenResult } = await this.create(
|
|
294
|
+
refreshTokenData as TokenManagerCreateData<TokenEntityFields>,
|
|
295
|
+
{
|
|
296
|
+
expiresInMinutes: newAccessTokenExpiresInMinutes,
|
|
297
|
+
identifierDataField,
|
|
298
|
+
persist: persistNewToken,
|
|
299
|
+
purgeOldFromData: purgeStoreOnRenew
|
|
300
|
+
}
|
|
301
|
+
);
|
|
302
|
+
newRefreshToken = refreshTokenResult.token;
|
|
303
|
+
// renew the internal idToken
|
|
304
|
+
if (idTokenContent?.data) {
|
|
305
|
+
const { result: newIdTokenResult } = await this.create(
|
|
306
|
+
{
|
|
307
|
+
...idTokenContent.data,
|
|
308
|
+
accessToken: newAccessToken,
|
|
309
|
+
type: TokenType.Id,
|
|
310
|
+
[identifierDataField!]: identifierValue
|
|
311
|
+
} as TokenEntityFields,
|
|
312
|
+
{
|
|
313
|
+
expiresInMinutes: newAccessTokenExpiresInMinutes,
|
|
314
|
+
identifierDataField,
|
|
315
|
+
persist: true,
|
|
316
|
+
purgeOldFromData: true,
|
|
317
|
+
tokenContentOnlyFields: Object.keys(idTokenContent.data)
|
|
318
|
+
}
|
|
319
|
+
);
|
|
320
|
+
newIdToken = newIdTokenResult.token;
|
|
242
321
|
}
|
|
243
|
-
// TODO: save the new refresh token, if such exists
|
|
244
|
-
tokenData.externalToken = externalAccessTokenRenewalResult.newAccessToken;
|
|
245
322
|
}
|
|
246
|
-
const { result } = await this.create(tokenData as TokenManagerCreateData<TokenEntityFields>, {
|
|
247
|
-
expiresInMinutes: newTokenExpiresInMinutes,
|
|
248
|
-
identifierDataField,
|
|
249
|
-
persist: persistNewToken,
|
|
250
|
-
purgeOldFromData: purgeStoreOnRenew
|
|
251
|
-
});
|
|
252
|
-
newToken = result.token;
|
|
253
323
|
}
|
|
254
|
-
return { content,
|
|
324
|
+
return { content, newAccessToken, newRefreshToken, newIdToken };
|
|
255
325
|
}
|
|
256
326
|
|
|
257
327
|
protected async verify(
|
|
@@ -29,6 +29,7 @@ export interface IAMUserManagerCreateAccessTokenOptions<AuthData = unknown> {
|
|
|
29
29
|
export type IAMUserManagerCreateAccessTokenReturnData<UserData> =
|
|
30
30
|
| {
|
|
31
31
|
accessToken: string;
|
|
32
|
+
idToken: string;
|
|
32
33
|
refreshToken?: string;
|
|
33
34
|
user: UserData;
|
|
34
35
|
}
|
|
@@ -62,6 +63,7 @@ export type IAMUserManagerUserWithPermissionsData<UserData, AuthorizationPointId
|
|
|
62
63
|
AuthorizationUser<AuthorizationPointId> & UserData;
|
|
63
64
|
|
|
64
65
|
export interface IAMUserManagerUserTokenEnityFields<UserId = unknown> {
|
|
66
|
+
accessToken?: string;
|
|
65
67
|
refreshToken?: string;
|
|
66
68
|
userId: UserId;
|
|
67
69
|
user?: IAMUserManagerUserWithPermissionsData<object, unknown>;
|
|
@@ -202,6 +202,9 @@ export class IAMUserManagerService<
|
|
|
202
202
|
refreshToken = localRefreshToken;
|
|
203
203
|
}
|
|
204
204
|
// 6.2. Create a local access token and save it. The payload contains the external access token, if it exists.
|
|
205
|
+
const accessTokenExpiresIn =
|
|
206
|
+
(externalAccessToken && 'accessTokenExpiresIn' in actualStepResult && actualStepResult.accessTokenExpiresIn) ||
|
|
207
|
+
accessTokenExpiryTimeInMinutes;
|
|
205
208
|
const {
|
|
206
209
|
result: { token: accessToken }
|
|
207
210
|
} = await this.tokenManager.create(
|
|
@@ -218,21 +221,35 @@ export class IAMUserManagerService<
|
|
|
218
221
|
: {})
|
|
219
222
|
},
|
|
220
223
|
{
|
|
221
|
-
expiresInMinutes:
|
|
222
|
-
(externalAccessToken &&
|
|
223
|
-
'accessTokenExpiresIn' in actualStepResult &&
|
|
224
|
-
actualStepResult.accessTokenExpiresIn) ||
|
|
225
|
-
accessTokenExpiryTimeInMinutes,
|
|
224
|
+
expiresInMinutes: accessTokenExpiresIn,
|
|
226
225
|
identifierDataField: IAMUserManagerUserTokenUserIdentifier.FieldName,
|
|
227
226
|
persist: true,
|
|
228
227
|
purgeOldFromData: true,
|
|
229
|
-
tokenContentOnlyFields: ['externalToken', 'refreshToken'
|
|
228
|
+
tokenContentOnlyFields: ['externalToken', 'refreshToken']
|
|
229
|
+
}
|
|
230
|
+
);
|
|
231
|
+
// 6.3. Create an idToken. The payload contains the user with permissions data
|
|
232
|
+
const {
|
|
233
|
+
result: { token: idToken }
|
|
234
|
+
} = await this.tokenManager.create(
|
|
235
|
+
{
|
|
236
|
+
accessToken,
|
|
237
|
+
type: TokenType.Id,
|
|
238
|
+
user,
|
|
239
|
+
[IAMUserManagerUserTokenUserIdentifier.FieldName]: userIdentifierValue
|
|
240
|
+
},
|
|
241
|
+
{
|
|
242
|
+
expiresInMinutes: accessTokenExpiresIn,
|
|
243
|
+
identifierDataField: IAMUserManagerUserTokenUserIdentifier.FieldName,
|
|
244
|
+
persist: true,
|
|
245
|
+
purgeOldFromData: true,
|
|
246
|
+
tokenContentOnlyFields: ['accessToken', 'user']
|
|
230
247
|
}
|
|
231
248
|
);
|
|
232
249
|
logger.info(
|
|
233
250
|
`[Domain.${moduleName}.UserManager]: Login attempt successful for ${userFilterField} ${userFilterValue}.`
|
|
234
251
|
);
|
|
235
|
-
return { accessToken, refreshToken, user };
|
|
252
|
+
return { accessToken, idToken, refreshToken, user };
|
|
236
253
|
}
|
|
237
254
|
const returnData: IAMUserManagerCreateAccessTokenReturnData<User> = { nextStepsRequired: true };
|
|
238
255
|
if (stepConfig.stepResultPublicFields?.length) {
|
|
@@ -292,7 +309,7 @@ export class IAMUserManagerService<
|
|
|
292
309
|
data: stepInputData.data,
|
|
293
310
|
options: stepInputData.options
|
|
294
311
|
};
|
|
295
|
-
const cacheResult = await this.
|
|
312
|
+
const cacheResult = await this.tokenManager.domainTokensEntityService.findOne({
|
|
296
313
|
filters: {
|
|
297
314
|
[cacheSettings.settings.cacheFieldName]: getNested(cacheInput, cacheSettings.settings.inputFieldName)
|
|
298
315
|
.unifiedValue
|