@tstdl/base 0.81.33 → 0.81.35
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/openid-connect/oidc.service.d.ts +2 -1
- package/openid-connect/oidc.service.js +5 -3
- package/openid-connect/oidc.service.js.map +1 -1
- package/package.json +6 -6
- package/schema/schemas/assign.d.ts +1 -2
- package/schema/schemas/assign.js.map +1 -1
- package/utils/jwt.d.ts +3 -3
- package/utils/jwt.js +7 -3
- package/utils/jwt.js.map +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HttpClient } from "../http/client";
|
|
2
|
+
import type { Record } from "../types";
|
|
2
3
|
import { OidcConfigurationService } from './oidc-configuration.service';
|
|
3
4
|
import type { OidcState } from './oidc-state.model';
|
|
4
5
|
import { OidcStateRepository } from './oidc-state.repository';
|
|
@@ -13,7 +14,7 @@ export declare class OidcService<Data = any> {
|
|
|
13
14
|
getState(state: string): Promise<OidcState<Data>>;
|
|
14
15
|
deleteState(state: string): Promise<void>;
|
|
15
16
|
validateState(state: string): Promise<OidcState<Data>>;
|
|
16
|
-
getToken(parameters: OidcGetTokenParameters): Promise<OidcToken>;
|
|
17
|
+
getToken(parameters: OidcGetTokenParameters, additionalData?: Record<string, string>): Promise<OidcToken>;
|
|
17
18
|
refreshToken({ endpoint, clientId, clientSecret, refreshToken }: OidcRefreshTokenParameters): Promise<OidcToken>;
|
|
18
19
|
getUserInfo(endpoint: string, token: OidcToken): Promise<unknown>;
|
|
19
20
|
}
|
|
@@ -82,7 +82,7 @@ let OidcService = class OidcService {
|
|
|
82
82
|
}
|
|
83
83
|
return oidcState;
|
|
84
84
|
}
|
|
85
|
-
async getToken(parameters) {
|
|
85
|
+
async getToken(parameters, additionalData) {
|
|
86
86
|
const oidcConfiguration = await this.oidcConfigurationService.getConfiguration(parameters.endpoint);
|
|
87
87
|
const headers = new http_headers_1.HttpHeaders();
|
|
88
88
|
let formData = {};
|
|
@@ -98,7 +98,8 @@ let OidcService = class OidcService {
|
|
|
98
98
|
scope: parameters.scope,
|
|
99
99
|
code: parameters.code,
|
|
100
100
|
code_verifier: parameters.codeVerifier,
|
|
101
|
-
redirect_uri: parameters.redirectUri
|
|
101
|
+
redirect_uri: parameters.redirectUri,
|
|
102
|
+
...additionalData
|
|
102
103
|
/* eslint-enable @typescript-eslint/naming-convention */
|
|
103
104
|
};
|
|
104
105
|
break;
|
|
@@ -106,7 +107,8 @@ let OidcService = class OidcService {
|
|
|
106
107
|
formData = {
|
|
107
108
|
/* eslint-disable @typescript-eslint/naming-convention */
|
|
108
109
|
grant_type: 'client_credentials',
|
|
109
|
-
scope: parameters.scope
|
|
110
|
+
scope: parameters.scope,
|
|
111
|
+
...additionalData
|
|
110
112
|
/* eslint-enable @typescript-eslint/naming-convention */
|
|
111
113
|
};
|
|
112
114
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../source/openid-connect/oidc.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../source/openid-connect/oidc.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.81.
|
|
3
|
+
"version": "0.81.35",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -37,20 +37,20 @@
|
|
|
37
37
|
"typescript-transform-paths": "3.4"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
|
-
"@elastic/elasticsearch": "^8.
|
|
40
|
+
"@elastic/elasticsearch": "^8.6",
|
|
41
41
|
"@koa/router": "^12.0",
|
|
42
42
|
"@tstdl/angular": "^0.81.0",
|
|
43
43
|
"chroma-js": "^2.4",
|
|
44
44
|
"got": "^12.5",
|
|
45
45
|
"handlebars": "^4.7",
|
|
46
|
-
"knex": "^2.
|
|
46
|
+
"knex": "^2.4",
|
|
47
47
|
"koa": "^2.14",
|
|
48
48
|
"minio": "^7.0",
|
|
49
49
|
"mjml": "^4.13",
|
|
50
50
|
"mongodb": "4.13",
|
|
51
|
-
"nodemailer": "^6.
|
|
52
|
-
"puppeteer": "^19.
|
|
53
|
-
"undici": "^5.
|
|
51
|
+
"nodemailer": "^6.9",
|
|
52
|
+
"puppeteer": "^19.5",
|
|
53
|
+
"undici": "^5.15",
|
|
54
54
|
"urlpattern-polyfill": "^6.0"
|
|
55
55
|
},
|
|
56
56
|
"peerDependenciesMeta": {
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import type { Record } from "../../types";
|
|
2
1
|
import type { Merge } from 'type-fest';
|
|
3
2
|
import type { ObjectSchema, ObjectSchemaOrType } from '../types';
|
|
4
3
|
export declare function assign<T1, T2>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>): ObjectSchema<Merge<T1, T2>>;
|
|
5
4
|
export declare function assign<T1, T2, T3>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>, schema3: ObjectSchemaOrType<T3>): ObjectSchema<Merge<Merge<T1, T2>, T3>>;
|
|
6
5
|
export declare function assign<T1, T2, T3, T4>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>, schema3: ObjectSchemaOrType<T3>, schema4: ObjectSchemaOrType<T4>): ObjectSchema<Merge<Merge<Merge<T1, T2>, T3>, T4>>;
|
|
7
6
|
export declare function assign<T1, T2, T3, T4, T5>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>, schema3: ObjectSchemaOrType<T3>, schema4: ObjectSchemaOrType<T4>, schema5: ObjectSchemaOrType<T5>): ObjectSchema<Merge<Merge<Merge<Merge<T1, T2>, T3>, T4>, T5>>;
|
|
8
|
-
export declare function assign<T1, T2, T3, T4, T5, T6
|
|
7
|
+
export declare function assign<T1, T2, T3, T4, T5, T6>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>, schema3: ObjectSchemaOrType<T3>, schema4: ObjectSchemaOrType<T4>, schema5: ObjectSchemaOrType<T5>, schema6: ObjectSchemaOrType<T6>): ObjectSchema<Merge<Merge<Merge<Merge<Merge<T1, T2>, T3>, T4>, T5>, T6>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assign.js","sourceRoot":"","sources":["../../../source/schema/schemas/assign.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"assign.js","sourceRoot":"","sources":["../../../source/schema/schemas/assign.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,yDAA6C;AAG7C,oCAA2C;AAO3C,SAAgB,MAAM,CAAC,GAAG,MAA4B;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAe,CAAC,CAAC;IAC5C,IAAA,oBAAM,EAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAC;IAEnE,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;IAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,GAAG;YACP,GAAG,MAAM;YACT,GAAG,OAAO,CAAC,CAAC,CAAE;YACd,UAAU,EAAE;gBACV,GAAG,MAAM,CAAC,UAAU;gBACpB,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC,UAAU;aAC1B;YACD,sBAAsB,EAAE,CAAC,GAAG,IAAA,eAAO,EAAC,MAAM,CAAC,sBAAsB,IAAI,EAAE,CAAC,EAAE,GAAG,IAAA,eAAO,EAAC,OAAO,CAAC,CAAC,CAAE,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;SAChI,CAAC;KACH;IAED,IAAK,MAAM,CAAC,sBAAgC,CAAC,MAAM,IAAI,CAAC,EAAE;QACxD,MAAM,EAAE,sBAAsB,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;QACtD,MAAM,GAAG,IAAI,CAAC;KACf;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAxBD,wBAwBC"}
|
package/utils/jwt.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type { StringMap } from '../types';
|
|
1
|
+
import type { OneOrMany, StringMap } from '../types';
|
|
2
2
|
import type { Key } from './cryptography';
|
|
3
3
|
export declare type JwtTokenAlgorithm = 'HS256' | 'HS384' | 'HS512';
|
|
4
4
|
export declare type JwtTokenHeader<T extends StringMap = StringMap> = {
|
|
5
5
|
alg: JwtTokenAlgorithm;
|
|
6
6
|
typ: 'JWT';
|
|
7
7
|
} & T;
|
|
8
|
-
export declare type JwtToken<THeader extends JwtTokenHeader = JwtTokenHeader
|
|
8
|
+
export declare type JwtToken<TPayload = StringMap, THeader extends JwtTokenHeader = JwtTokenHeader> = {
|
|
9
9
|
readonly header: THeader;
|
|
10
10
|
readonly payload: TPayload;
|
|
11
11
|
};
|
|
@@ -29,4 +29,4 @@ export declare type JwtTokenParseResult<T extends JwtToken = JwtToken> = {
|
|
|
29
29
|
};
|
|
30
30
|
export declare function parseJwtTokenString<T extends JwtToken = JwtToken>(tokenString: string): JwtTokenParseResult<T>;
|
|
31
31
|
export declare function createJwtTokenString<T extends JwtToken = JwtToken>(jwtToken: T, key: Key | string): Promise<string>;
|
|
32
|
-
export declare function parseAndValidateJwtTokenString<T extends JwtToken = JwtToken>(tokenString: string, key: Key | string): Promise<T>;
|
|
32
|
+
export declare function parseAndValidateJwtTokenString<T extends JwtToken = JwtToken>(tokenString: string, allowedAlgorithms: OneOrMany<JwtTokenAlgorithm>, key: Key | string): Promise<T>;
|
package/utils/jwt.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseAndValidateJwtTokenString = exports.createJwtTokenString = exports.parseJwtTokenString = void 0;
|
|
4
4
|
const error_1 = require("../error");
|
|
5
|
+
const array_1 = require("./array/array");
|
|
5
6
|
const base64_1 = require("./base64");
|
|
6
7
|
const cryptography_1 = require("./cryptography");
|
|
7
8
|
const encoding_1 = require("./encoding");
|
|
@@ -55,13 +56,16 @@ async function createJwtTokenString(jwtToken, key) {
|
|
|
55
56
|
return tokenString;
|
|
56
57
|
}
|
|
57
58
|
exports.createJwtTokenString = createJwtTokenString;
|
|
58
|
-
async function parseAndValidateJwtTokenString(tokenString, key) {
|
|
59
|
+
async function parseAndValidateJwtTokenString(tokenString, allowedAlgorithms, key) {
|
|
59
60
|
try {
|
|
60
61
|
const { encoded, bytes, token } = parseJwtTokenString(tokenString);
|
|
62
|
+
if (!(0, array_1.toArray)(allowedAlgorithms).includes(token.header.alg)) {
|
|
63
|
+
throw new error_1.UnauthorizedError('Invalid signature algorithm.');
|
|
64
|
+
}
|
|
61
65
|
const calculatedSignature = await getSignature((0, encoding_1.encodeUtf8)(`${encoded.header}.${encoded.payload}`), token.header.alg, key);
|
|
62
66
|
const validSignature = (0, equals_1.binaryEquals)(calculatedSignature, bytes.signature);
|
|
63
67
|
if (!validSignature) {
|
|
64
|
-
throw new error_1.UnauthorizedError('
|
|
68
|
+
throw new error_1.UnauthorizedError('Invalid token signature.');
|
|
65
69
|
}
|
|
66
70
|
return token;
|
|
67
71
|
}
|
|
@@ -69,7 +73,7 @@ async function parseAndValidateJwtTokenString(tokenString, key) {
|
|
|
69
73
|
if (error instanceof error_1.UnauthorizedError) {
|
|
70
74
|
throw error;
|
|
71
75
|
}
|
|
72
|
-
throw new error_1.UnauthorizedError('
|
|
76
|
+
throw new error_1.UnauthorizedError('Invalid token.');
|
|
73
77
|
}
|
|
74
78
|
}
|
|
75
79
|
exports.parseAndValidateJwtTokenString = parseAndValidateJwtTokenString;
|
package/utils/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../source/utils/jwt.ts"],"names":[],"mappings":";;;AAAA,oCAAgE;AAEhE,qCAA4D;AAE5D,iDAAqD;AACrD,yCAAwC;AACxC,qCAAwC;AAiCxC,SAAgB,mBAAmB,CAAgC,WAAmB;IACpF,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,yBAAiB,CAAC,sBAAsB,CAAC,CAAC;KACrD;IAED,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,gBAAgB,CAAC,GAAG,MAAM,CAAC;IAEjE,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IAEtC,MAAM,OAAO,GAAmC;QAC9C,MAAM,EAAE,aAAc;QACtB,OAAO,EAAE,cAAe;QACxB,SAAS,EAAE,gBAAiB;KAC7B,CAAC;IAEF,MAAM,KAAK,GAAiC;QAC1C,MAAM,EAAE,IAAA,wBAAe,EAAC,aAAc,CAAC;QACvC,OAAO,EAAE,IAAA,wBAAe,EAAC,cAAe,CAAC;QACzC,SAAS,EAAE,IAAA,wBAAe,EAAC,gBAAiB,CAAC;KAC9C,CAAC;IAEF,MAAM,MAAM,GAAkC;QAC5C,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QACxC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;KAC3C,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAgB,CAAC;IACxD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAiB,CAAC;IAE3D,MAAM,KAAK,GAAa;QACtB,MAAM;QACN,OAAO;KACR,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,WAAW;QAChB,KAAK,EAAE,KAAU;QACjB,OAAO;QACP,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC;AA3CD,kDA2CC;AAEM,KAAK,UAAU,oBAAoB,CAAgC,QAAW,EAAE,GAAiB;IACtG,MAAM,YAAY,GAAG,IAAA,qBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,IAAA,qBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,IAAA,wBAAe,EAAC,YAAY,EAAE,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IAChF,MAAM,cAAc,GAAG,IAAA,wBAAe,EAAC,aAAa,EAAE,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IAEnF,MAAM,uBAAuB,GAAG,GAAG,aAAa,IAAI,cAAc,EAAE,CAAC;IACrE,MAAM,iBAAiB,GAAG,IAAA,qBAAU,EAAC,uBAAuB,CAAC,CAAC;IAE9D,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAClF,MAAM,gBAAgB,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,CAAC;IAEpD,MAAM,WAAW,GAAG,GAAG,uBAAuB,IAAI,gBAAgB,EAAE,CAAC;IACrE,OAAO,WAAW,CAAC;AACrB,CAAC;AAfD,oDAeC;AAEM,KAAK,UAAU,8BAA8B,CAAgC,WAAmB,EAAE,GAAiB;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../source/utils/jwt.ts"],"names":[],"mappings":"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"}
|