@or-sdk/authorizer 0.24.14-beta.935.0 → 0.24.14-beta.944.0
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/cjs/Basic/BasicAuth.js +2 -2
- package/dist/cjs/Basic/BasicAuth.js.map +1 -1
- package/dist/cjs/Basic/BasicCollection.js +6 -2
- package/dist/cjs/Basic/BasicCollection.js.map +1 -1
- package/dist/cjs/OAuth/OAuth.js +75 -49
- package/dist/cjs/OAuth/OAuth.js.map +1 -1
- package/dist/cjs/OAuth/OAuthCollection.js +8 -4
- package/dist/cjs/OAuth/OAuthCollection.js.map +1 -1
- package/dist/cjs/OAuth/types.js.map +1 -1
- package/dist/cjs/Token/TokenAuth.js +2 -2
- package/dist/cjs/Token/TokenAuth.js.map +1 -1
- package/dist/cjs/Token/TokenCollection.js +6 -2
- package/dist/cjs/Token/TokenCollection.js.map +1 -1
- package/dist/esm/Basic/BasicAuth.js +2 -2
- package/dist/esm/Basic/BasicAuth.js.map +1 -1
- package/dist/esm/Basic/BasicCollection.js +5 -2
- package/dist/esm/Basic/BasicCollection.js.map +1 -1
- package/dist/esm/OAuth/OAuth.js +57 -35
- package/dist/esm/OAuth/OAuth.js.map +1 -1
- package/dist/esm/OAuth/OAuthCollection.js +7 -4
- package/dist/esm/OAuth/OAuthCollection.js.map +1 -1
- package/dist/esm/OAuth/types.js.map +1 -1
- package/dist/esm/Token/TokenAuth.js +2 -2
- package/dist/esm/Token/TokenAuth.js.map +1 -1
- package/dist/esm/Token/TokenCollection.js +5 -2
- package/dist/esm/Token/TokenCollection.js.map +1 -1
- package/dist/types/Basic/BasicCollection.d.ts +2 -1
- package/dist/types/Basic/BasicCollection.d.ts.map +1 -1
- package/dist/types/OAuth/OAuth.d.ts +1 -1
- package/dist/types/OAuth/OAuth.d.ts.map +1 -1
- package/dist/types/OAuth/OAuthCollection.d.ts +3 -2
- package/dist/types/OAuth/OAuthCollection.d.ts.map +1 -1
- package/dist/types/OAuth/types.d.ts +5 -0
- package/dist/types/OAuth/types.d.ts.map +1 -1
- package/dist/types/Token/TokenCollection.d.ts +2 -1
- package/dist/types/Token/TokenCollection.d.ts.map +1 -1
- package/package.json +6 -4
- package/src/Basic/BasicAuth.ts +3 -2
- package/src/Basic/BasicCollection.ts +5 -4
- package/src/OAuth/OAuth.ts +105 -51
- package/src/OAuth/OAuthCollection.ts +9 -8
- package/src/OAuth/types.ts +27 -2
- package/src/Token/TokenAuth.ts +2 -2
- package/src/Token/TokenCollection.ts +5 -4
|
@@ -136,7 +136,7 @@ var BasicAuth = (function () {
|
|
|
136
136
|
var value;
|
|
137
137
|
return __generator(this, function (_a) {
|
|
138
138
|
switch (_a.label) {
|
|
139
|
-
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
139
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
140
140
|
case 1:
|
|
141
141
|
value = (_a.sent()).value;
|
|
142
142
|
return [2, value];
|
|
@@ -148,7 +148,7 @@ var BasicAuth = (function () {
|
|
|
148
148
|
return __awaiter(this, void 0, void 0, function () {
|
|
149
149
|
return __generator(this, function (_a) {
|
|
150
150
|
switch (_a.label) {
|
|
151
|
-
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, this.authKey)];
|
|
151
|
+
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
152
152
|
case 1:
|
|
153
153
|
_a.sent();
|
|
154
154
|
return [2];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasicAuth.js","sourceRoot":"","sources":["../../../src/Basic/BasicAuth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BasicAuth.js","sourceRoot":"","sources":["../../../src/Basic/BasicAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.BasicCollection = void 0;
|
|
40
|
+
var base_1 = require("@or-sdk/base");
|
|
40
41
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
41
42
|
var BasicAuth_1 = require("./BasicAuth");
|
|
42
43
|
var BasicCollection = (function () {
|
|
@@ -58,7 +59,7 @@ var BasicCollection = (function () {
|
|
|
58
59
|
case 0: return [4, this.keyValueStorage.listKeys(this.serviceName)];
|
|
59
60
|
case 1:
|
|
60
61
|
records = (_a.sent()).items;
|
|
61
|
-
return [2, records.map(function (record) { return record.key; })];
|
|
62
|
+
return [2, (0, base_1.makeList)(records.map(function (record) { return record.key; }).filter(function (key) { return key.includes('::basic'); }))];
|
|
62
63
|
}
|
|
63
64
|
});
|
|
64
65
|
});
|
|
@@ -68,7 +69,10 @@ var BasicCollection = (function () {
|
|
|
68
69
|
var record;
|
|
69
70
|
return __generator(this, function (_a) {
|
|
70
71
|
switch (_a.label) {
|
|
71
|
-
case 0:
|
|
72
|
+
case 0:
|
|
73
|
+
if (!key.includes('::basic'))
|
|
74
|
+
throw new Error('The Token authorization key should contain "basic" type specifier.');
|
|
75
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key))];
|
|
72
76
|
case 1:
|
|
73
77
|
record = _a.sent();
|
|
74
78
|
if (!record.value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasicCollection.js","sourceRoot":"","sources":["../../../src/Basic/BasicCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"BasicCollection.js","sourceRoot":"","sources":["../../../src/Basic/BasicCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAqD;AACrD,+DAA4D;AAC5D,yCAAwC;AAOxC;IAME,yBAAY,MAA6B;QAC/B,IAAA,KAAK,GAAgC,MAAM,MAAtC,EAAE,YAAY,GAAkB,MAAM,aAAxB,EAAE,WAAW,GAAK,MAAM,YAAX,CAAY;QAEpD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAe,CAAC;YACzC,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;IAKY,4CAAkB,GAA/B;;;;;4BAC6B,WAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAA;;wBAAjE,OAAO,GAAK,CAAA,SAAqD,CAAA,MAA1D;wBAEtB,WAAO,IAAA,eAAQ,EAAS,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,GAAG,EAAV,CAAU,CAAC,CAAC,MAAM,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAvB,CAAuB,CAAC,CAAC,EAAC;;;;KACrG;IAKY,0CAAgB,GAA7B,UAA8B,GAAW;;;;;;wBACvC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;4BAAE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;wBACrG,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAA;;wBAA5F,MAAM,GAAG,SAAmF;wBAClG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;4BACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;yBACjD;wBAED,WAAO,IAAI,qBAAS,CAAC;gCACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gCAC7B,OAAO,EAAE,GAAG;gCACZ,YAAY,EAAE,IAAI,CAAC,iBAAiB;gCACpC,KAAK,EAAE,IAAI,CAAC,UAAU;6BACvB,CAAC,EAAC;;;;KACJ;IAcY,6CAAmB,GAAhC,UACE,MAAyC;;;;4BAElC,WAAM,qBAAS,CAAC,MAAM,CAAC;4BAC5B,YAAY,EAAE,IAAI,CAAC,iBAAiB;4BACpC,KAAK,EAAE,IAAI,CAAC,UAAU;4BACtB,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;yBAC1B,CAAC,EAAA;4BAPF,WAAO,SAOL,EAAC;;;;KACJ;IACH,sBAAC;AAAD,CAAC,AArED,IAqEC;AArEY,0CAAe"}
|
package/dist/cjs/OAuth/OAuth.js
CHANGED
|
@@ -49,7 +49,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.OAuth = void 0;
|
|
51
51
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
52
|
+
var providers_1 = require("@or-sdk/providers");
|
|
52
53
|
var event_manager_1 = require("@or-sdk/event-manager");
|
|
54
|
+
var discovery_1 = require("@or-sdk/discovery");
|
|
53
55
|
var base_1 = require("@or-sdk/base");
|
|
54
56
|
var uuid_1 = require("uuid");
|
|
55
57
|
var constants_1 = require("../constants");
|
|
@@ -60,7 +62,13 @@ var createAuthKey_1 = require("./utils/createAuthKey");
|
|
|
60
62
|
var OAuth = (function () {
|
|
61
63
|
function OAuth(params) {
|
|
62
64
|
this.status = constants_1.AuthStatus.READY;
|
|
63
|
-
var
|
|
65
|
+
var authKey = params.authKey, discoveryUrl = params.discoveryUrl, eventManagerUrl = params.eventManagerUrl, keyValueCollection = params.keyValueCollection, providersAccountId = params.providersAccountId, serviceName = params.serviceName, token = params.token;
|
|
66
|
+
if (!(authKey && serviceName && authKey)) {
|
|
67
|
+
throw new Error('Invalit OAuth params passed.');
|
|
68
|
+
}
|
|
69
|
+
if (!discoveryUrl && !(eventManagerUrl && providersAccountId)) {
|
|
70
|
+
throw new Error('OAuth require Discovery URL or both Event Manager URL and Providers Account ID');
|
|
71
|
+
}
|
|
64
72
|
this.authKey = authKey;
|
|
65
73
|
this.serviceName = serviceName;
|
|
66
74
|
this.keyValueCollection = keyValueCollection || serviceName;
|
|
@@ -68,64 +76,85 @@ var OAuth = (function () {
|
|
|
68
76
|
token: token,
|
|
69
77
|
discoveryUrl: discoveryUrl,
|
|
70
78
|
});
|
|
71
|
-
this.
|
|
79
|
+
this.providers = new providers_1.Providers({
|
|
72
80
|
token: token,
|
|
73
81
|
discoveryUrl: discoveryUrl,
|
|
74
|
-
|
|
75
|
-
|
|
82
|
+
eventManagerUrl: eventManagerUrl,
|
|
83
|
+
providersAccountId: providersAccountId,
|
|
76
84
|
});
|
|
77
85
|
}
|
|
78
86
|
OAuth.create = function (params) {
|
|
79
87
|
return __awaiter(this, void 0, void 0, function () {
|
|
80
|
-
var
|
|
88
|
+
var appId, authName, discoveryUrl, scope, serviceName, token, accountId, eventManagerUrl, providersAccountId, discovery, keyValueCollection, keyValueStorage, providers, services, currentServiceData, apps, currentApp, serviceDefinition, id, authKey, additionalBodyData, additionalHeaders, redirectProviderUrl, authConfigs, formattedScope, configs, tempAuthData, authDataExpire, authUrl, additionalParams, formattedScope, authorizeUrl, newOAuth;
|
|
81
89
|
var _a;
|
|
82
90
|
return __generator(this, function (_b) {
|
|
83
91
|
switch (_b.label) {
|
|
84
92
|
case 0:
|
|
85
93
|
if (!(params.serviceName &&
|
|
86
94
|
params.authName &&
|
|
87
|
-
params.discoveryUrl &&
|
|
88
95
|
params.token &&
|
|
89
|
-
params.appId)
|
|
90
|
-
|
|
96
|
+
params.appId) || !(params.discoveryUrl ||
|
|
97
|
+
(params.accountId &&
|
|
98
|
+
params.providersAccountId &&
|
|
99
|
+
params.eventManagerUrl))) {
|
|
100
|
+
throw new Error('Invalid OAuth config passed');
|
|
91
101
|
}
|
|
92
|
-
|
|
102
|
+
appId = params.appId, authName = params.authName, discoveryUrl = params.discoveryUrl, scope = params.scope, serviceName = params.serviceName, token = params.token;
|
|
103
|
+
accountId = params.accountId, eventManagerUrl = params.eventManagerUrl, providersAccountId = params.providersAccountId;
|
|
104
|
+
if (!(discoveryUrl && !(accountId && eventManagerUrl && providersAccountId))) return [3, 6];
|
|
105
|
+
discovery = new discovery_1.Discovery({
|
|
106
|
+
token: token,
|
|
107
|
+
discoveryUrl: discoveryUrl,
|
|
108
|
+
});
|
|
109
|
+
if (!!accountId) return [3, 2];
|
|
110
|
+
return [4, discovery.getCurrentAccountId()];
|
|
111
|
+
case 1:
|
|
112
|
+
accountId = _b.sent();
|
|
113
|
+
_b.label = 2;
|
|
114
|
+
case 2:
|
|
115
|
+
if (!!eventManagerUrl) return [3, 4];
|
|
116
|
+
return [4, discovery.getServiceUrl(event_manager_1.EVENT_MANAGER_SERVICE_KEY)];
|
|
117
|
+
case 3:
|
|
118
|
+
eventManagerUrl = _b.sent();
|
|
119
|
+
_b.label = 4;
|
|
120
|
+
case 4:
|
|
121
|
+
if (!!providersAccountId) return [3, 6];
|
|
122
|
+
return [4, discovery.getProvidersAccountId()];
|
|
123
|
+
case 5:
|
|
124
|
+
providersAccountId = _b.sent();
|
|
125
|
+
_b.label = 6;
|
|
126
|
+
case 6:
|
|
93
127
|
keyValueCollection = params.keyValueCollection || serviceName;
|
|
94
128
|
keyValueStorage = new key_value_storage_1.KeyValueStorage({
|
|
95
129
|
token: token,
|
|
96
130
|
discoveryUrl: discoveryUrl,
|
|
97
131
|
});
|
|
98
|
-
|
|
132
|
+
providers = new providers_1.Providers({
|
|
99
133
|
token: token,
|
|
100
134
|
discoveryUrl: discoveryUrl,
|
|
101
|
-
|
|
102
|
-
|
|
135
|
+
eventManagerUrl: eventManagerUrl,
|
|
136
|
+
providersAccountId: providersAccountId,
|
|
103
137
|
});
|
|
104
|
-
return [4,
|
|
105
|
-
case 1:
|
|
106
|
-
_b.sent();
|
|
107
|
-
serviceDefinitionProviderRoute = "http/".concat(eventManager.providersAccountId).concat(constants_1.SERVICE_PROVIDER_PATH);
|
|
108
|
-
return [4, eventManager.makeRequest({
|
|
138
|
+
return [4, providers.makeRequest({
|
|
109
139
|
method: 'GET',
|
|
110
|
-
route:
|
|
140
|
+
route: constants_1.SERVICE_PROVIDER_PATH,
|
|
111
141
|
params: {
|
|
112
142
|
type: 'list',
|
|
113
143
|
},
|
|
114
144
|
})];
|
|
115
|
-
case
|
|
145
|
+
case 7:
|
|
116
146
|
services = _b.sent();
|
|
117
147
|
currentServiceData = services[serviceName];
|
|
118
148
|
return [4, keyValueStorage.getValueByKey(keyValueCollection, '__authorizer_apps')];
|
|
119
|
-
case
|
|
149
|
+
case 8:
|
|
120
150
|
apps = _b.sent();
|
|
121
151
|
currentApp = apps.value.find(function (app) { return app.value.appId === appId; }).value;
|
|
122
152
|
serviceDefinition = new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment);
|
|
123
153
|
id = (0, uuid_1.v4)();
|
|
124
|
-
authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection,
|
|
154
|
+
authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection, accountId || null);
|
|
125
155
|
additionalBodyData = {};
|
|
126
156
|
additionalHeaders = {};
|
|
127
|
-
|
|
128
|
-
redirectProviderUrl = "".concat(emUrl, "/http/").concat(eventManager.providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
|
|
157
|
+
redirectProviderUrl = "".concat(eventManagerUrl, "/http/").concat(providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
|
|
129
158
|
authConfigs = __assign(__assign({}, additionalBodyData), { grant_type: 'authorization_code', redirect_uri: redirectProviderUrl, appId: appId });
|
|
130
159
|
if (scope) {
|
|
131
160
|
formattedScope = (0, formatScope_1.formatScope)(scope, serviceDefinition.scopeType);
|
|
@@ -146,11 +175,11 @@ var OAuth = (function () {
|
|
|
146
175
|
serviceConfigName: serviceName,
|
|
147
176
|
name: authName,
|
|
148
177
|
displayServiceName: serviceDefinition.displayServiceName,
|
|
149
|
-
accountId:
|
|
178
|
+
accountId: accountId,
|
|
150
179
|
};
|
|
151
180
|
authDataExpire = Date.now() + constants_1.TEMPORARY_DATA_EXPIRATION_TIME;
|
|
152
181
|
return [4, keyValueStorage.setValueByKey('__authorizer_temp-uuid', id, tempAuthData, authDataExpire)];
|
|
153
|
-
case
|
|
182
|
+
case 9:
|
|
154
183
|
_b.sent();
|
|
155
184
|
authUrl = new URL(serviceDefinition.authorizeUri);
|
|
156
185
|
additionalParams = JSON.parse(serviceDefinition.authRequestAdditionalParams);
|
|
@@ -168,9 +197,11 @@ var OAuth = (function () {
|
|
|
168
197
|
}
|
|
169
198
|
authorizeUrl = authUrl.href;
|
|
170
199
|
newOAuth = new OAuth({
|
|
171
|
-
serviceName: serviceName,
|
|
172
200
|
authKey: authKey,
|
|
173
201
|
discoveryUrl: discoveryUrl,
|
|
202
|
+
eventManagerUrl: eventManagerUrl,
|
|
203
|
+
providersAccountId: providersAccountId,
|
|
204
|
+
serviceName: serviceName,
|
|
174
205
|
token: token,
|
|
175
206
|
});
|
|
176
207
|
newOAuth.status = constants_1.AuthStatus.PENDING;
|
|
@@ -202,21 +233,17 @@ var OAuth = (function () {
|
|
|
202
233
|
};
|
|
203
234
|
OAuth.prototype.getServiceDefinition = function (currentApp) {
|
|
204
235
|
return __awaiter(this, void 0, void 0, function () {
|
|
205
|
-
var
|
|
236
|
+
var services, currentServiceData;
|
|
206
237
|
return __generator(this, function (_a) {
|
|
207
238
|
switch (_a.label) {
|
|
208
|
-
case 0: return [4, this.
|
|
239
|
+
case 0: return [4, this.providers.makeRequest({
|
|
240
|
+
method: 'GET',
|
|
241
|
+
route: constants_1.SERVICE_PROVIDER_PATH,
|
|
242
|
+
params: {
|
|
243
|
+
type: 'list',
|
|
244
|
+
},
|
|
245
|
+
})];
|
|
209
246
|
case 1:
|
|
210
|
-
_a.sent();
|
|
211
|
-
serviceDefinitionProviderRoute = "http/".concat(this.eventManager.providersAccountId).concat(constants_1.SERVICE_PROVIDER_PATH);
|
|
212
|
-
return [4, this.eventManager.makeRequest({
|
|
213
|
-
method: 'GET',
|
|
214
|
-
route: serviceDefinitionProviderRoute,
|
|
215
|
-
params: {
|
|
216
|
-
type: 'list',
|
|
217
|
-
},
|
|
218
|
-
})];
|
|
219
|
-
case 2:
|
|
220
247
|
services = _a.sent();
|
|
221
248
|
currentServiceData = services[this.serviceName];
|
|
222
249
|
return [2, new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment)];
|
|
@@ -239,7 +266,7 @@ var OAuth = (function () {
|
|
|
239
266
|
_a.label = 1;
|
|
240
267
|
case 1:
|
|
241
268
|
if (!(spentTime < pollTimeout)) return [3, 4];
|
|
242
|
-
return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, this.authKey)];
|
|
269
|
+
return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, encodeURIComponent(this.authKey))];
|
|
243
270
|
case 2:
|
|
244
271
|
record = _a.sent();
|
|
245
272
|
if (record.value) {
|
|
@@ -267,14 +294,14 @@ var OAuth = (function () {
|
|
|
267
294
|
};
|
|
268
295
|
OAuth.prototype.getAuthData = function () {
|
|
269
296
|
return __awaiter(this, void 0, void 0, function () {
|
|
270
|
-
var value, authData,
|
|
297
|
+
var value, authData, refreshedAuthData;
|
|
271
298
|
return __generator(this, function (_a) {
|
|
272
299
|
switch (_a.label) {
|
|
273
300
|
case 0:
|
|
274
301
|
if (this.status !== constants_1.AuthStatus.READY) {
|
|
275
302
|
throw new Error('This authorization is not ready');
|
|
276
303
|
}
|
|
277
|
-
return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
304
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
278
305
|
case 1:
|
|
279
306
|
value = (_a.sent()).value;
|
|
280
307
|
if (!value) {
|
|
@@ -285,14 +312,13 @@ var OAuth = (function () {
|
|
|
285
312
|
if (!authData.expires_in) {
|
|
286
313
|
return [2, authData];
|
|
287
314
|
}
|
|
288
|
-
|
|
289
|
-
if (!expired) {
|
|
315
|
+
if (!(0, isExpired_1.isExpired)(authData.created_at, authData.expires_in)) {
|
|
290
316
|
return [2, authData];
|
|
291
317
|
}
|
|
292
318
|
return [4, this.refresh()];
|
|
293
319
|
case 2:
|
|
294
320
|
_a.sent();
|
|
295
|
-
return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
321
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
296
322
|
case 3:
|
|
297
323
|
refreshedAuthData = (_a.sent()).value;
|
|
298
324
|
return [2, refreshedAuthData];
|
|
@@ -305,7 +331,7 @@ var OAuth = (function () {
|
|
|
305
331
|
var value, authData, appId, currentApp, serviceDefinition;
|
|
306
332
|
return __generator(this, function (_a) {
|
|
307
333
|
switch (_a.label) {
|
|
308
|
-
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
334
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
309
335
|
case 1:
|
|
310
336
|
value = (_a.sent()).value;
|
|
311
337
|
if (!value) {
|
|
@@ -324,9 +350,9 @@ var OAuth = (function () {
|
|
|
324
350
|
return [4, this.getServiceDefinition(currentApp)];
|
|
325
351
|
case 3:
|
|
326
352
|
serviceDefinition = _a.sent();
|
|
327
|
-
return [4, this.
|
|
353
|
+
return [4, this.providers.makeRequest({
|
|
328
354
|
method: 'POST',
|
|
329
|
-
route:
|
|
355
|
+
route: constants_1.OAUTH_REDIRECT_PROVIDER_PATH,
|
|
330
356
|
data: {
|
|
331
357
|
refreshTokenUrl: authData.refreshUri,
|
|
332
358
|
sendDataType: serviceDefinition.requestDataType,
|
|
@@ -351,7 +377,7 @@ var OAuth = (function () {
|
|
|
351
377
|
if (this.status !== constants_1.AuthStatus.READY) {
|
|
352
378
|
throw new Error('This authorization is not ready');
|
|
353
379
|
}
|
|
354
|
-
return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
380
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
355
381
|
case 1:
|
|
356
382
|
value = (_a.sent()).value;
|
|
357
383
|
if (!value) {
|
|
@@ -376,7 +402,7 @@ var OAuth = (function () {
|
|
|
376
402
|
return __awaiter(this, void 0, void 0, function () {
|
|
377
403
|
return __generator(this, function (_a) {
|
|
378
404
|
switch (_a.label) {
|
|
379
|
-
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, this.authKey)];
|
|
405
|
+
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
380
406
|
case 1:
|
|
381
407
|
_a.sent();
|
|
382
408
|
this.status = constants_1.AuthStatus.DELETED;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
48
48
|
};
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.OAuthCollection = void 0;
|
|
51
|
+
var base_1 = require("@or-sdk/base");
|
|
51
52
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
52
53
|
var OAuth_1 = require("./OAuth");
|
|
53
54
|
var OAuthCollection = (function () {
|
|
@@ -70,7 +71,7 @@ var OAuthCollection = (function () {
|
|
|
70
71
|
case 0: return [4, this.keyValueStorage.listKeys(this.keyValueCollection)];
|
|
71
72
|
case 1:
|
|
72
73
|
records = (_a.sent()).items;
|
|
73
|
-
return [2, records.map(function (record) { return record.key; })];
|
|
74
|
+
return [2, (0, base_1.makeList)(records.map(function (record) { return record.key; }).filter(function (key) { return key.includes('::oauth'); }))];
|
|
74
75
|
}
|
|
75
76
|
});
|
|
76
77
|
});
|
|
@@ -84,10 +85,10 @@ var OAuthCollection = (function () {
|
|
|
84
85
|
case 1:
|
|
85
86
|
appsStorageRecord = _a.sent();
|
|
86
87
|
if (!appsStorageRecord.value) {
|
|
87
|
-
return [2, []];
|
|
88
|
+
return [2, (0, base_1.makeList)([])];
|
|
88
89
|
}
|
|
89
90
|
appsRecords = appsStorageRecord.value;
|
|
90
|
-
return [2, appsRecords.map(function (record) { return (__assign({ name: record.label }, record.value)); })];
|
|
91
|
+
return [2, (0, base_1.makeList)(appsRecords.map(function (record) { return (__assign({ name: record.label }, record.value)); }))];
|
|
91
92
|
}
|
|
92
93
|
});
|
|
93
94
|
});
|
|
@@ -97,7 +98,10 @@ var OAuthCollection = (function () {
|
|
|
97
98
|
var record;
|
|
98
99
|
return __generator(this, function (_a) {
|
|
99
100
|
switch (_a.label) {
|
|
100
|
-
case 0:
|
|
101
|
+
case 0:
|
|
102
|
+
if (!key.includes('::oauth'))
|
|
103
|
+
throw new Error('The OAuth authorization key should contain "oauth" type specifier.');
|
|
104
|
+
return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, encodeURIComponent(key))];
|
|
101
105
|
case 1:
|
|
102
106
|
record = _a.sent();
|
|
103
107
|
if (!record.value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuthCollection.js","sourceRoot":"","sources":["../../../src/OAuth/OAuthCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"OAuthCollection.js","sourceRoot":"","sources":["../../../src/OAuth/OAuthCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/OAuth/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/OAuth/types.ts"],"names":[],"mappings":";;;AAoJA,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,gDAAmC,CAAA;IACnC,gDAAmC,CAAA;IACnC,sFAAyE,CAAA;IACzE,sCAAyB,CAAA;AAC3B,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB"}
|
|
@@ -114,7 +114,7 @@ var TokenAuth = (function () {
|
|
|
114
114
|
var value;
|
|
115
115
|
return __generator(this, function (_a) {
|
|
116
116
|
switch (_a.label) {
|
|
117
|
-
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
117
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
118
118
|
case 1:
|
|
119
119
|
value = (_a.sent()).value;
|
|
120
120
|
return [2, value];
|
|
@@ -126,7 +126,7 @@ var TokenAuth = (function () {
|
|
|
126
126
|
return __awaiter(this, void 0, void 0, function () {
|
|
127
127
|
return __generator(this, function (_a) {
|
|
128
128
|
switch (_a.label) {
|
|
129
|
-
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, this.authKey)];
|
|
129
|
+
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey))];
|
|
130
130
|
case 1:
|
|
131
131
|
_a.sent();
|
|
132
132
|
return [2];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenAuth.js","sourceRoot":"","sources":["../../../src/Token/TokenAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA4D;AAC5D,6BAAoC;AAEpC,uDAAsD;AAItD;IAKE,mBAAY,MAAuB;QACzB,IAAA,KAAK,GAAyC,MAAM,MAA/C,EAAE,YAAY,GAA2B,MAAM,aAAjC,EAAE,OAAO,GAAkB,MAAM,QAAxB,EAAE,WAAW,GAAK,MAAM,YAAX,CAAY;QAE7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAe,CAAC;YACzC,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;IAkBY,gBAAM,GAAnB,UAAoB,MAA6B;;;;;;wBAC/C,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;4BACzG,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;yBAC1C;wBAEO,WAAW,GAAiD,MAAM,YAAvD,EAAE,QAAQ,GAAuC,MAAM,SAA7C,EAAE,WAAW,GAA0B,MAAM,YAAhC,EAAE,YAAY,GAAY,MAAM,aAAlB,EAAE,KAAK,GAAK,MAAM,MAAX,CAAY;wBAErE,eAAe,GAAG,IAAI,mCAAe,CAAC;4BAC1C,KAAK,OAAA;4BACL,YAAY,cAAA;yBACb,CAAC,CAAC;wBAEG,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;wBACd,OAAO,GAAG,IAAA,6BAAa,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;wBAEtC,QAAQ,yBACT,WAAW,KACd,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GACvC,CAAC;wBAEF,WAAM,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAA;;wBAAnE,SAAmE,CAAC;wBAEpE,WAAO,IAAI,SAAS,CAAC;gCACnB,WAAW,aAAA;gCACX,OAAO,SAAA;gCACP,YAAY,cAAA;gCACZ,KAAK,OAAA;6BACN,CAAC,EAAC;;;;KACJ;IAKY,0BAAM,GAAnB,UAAoB,cAAuC;;;;;4BAC5C,WAAM,IAAI,CAAC,WAAW,EAAE,EAAA;;wBAA/B,IAAI,GAAG,SAAwB;wBAE/B,WAAW,yBACZ,IAAI,GACJ,cAAc,CAClB,CAAC;wBAEe,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;wBAAhG,QAAQ,GAAG,SAAqF;wBAEhG,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;wBACrC,WAAO,aAA8B,EAAC;;;;KACvC;IAKY,+BAAW,GAAxB;;;;;4BACoB,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,EAAA;;
|
|
1
|
+
{"version":3,"file":"TokenAuth.js","sourceRoot":"","sources":["../../../src/Token/TokenAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA4D;AAC5D,6BAAoC;AAEpC,uDAAsD;AAItD;IAKE,mBAAY,MAAuB;QACzB,IAAA,KAAK,GAAyC,MAAM,MAA/C,EAAE,YAAY,GAA2B,MAAM,aAAjC,EAAE,OAAO,GAAkB,MAAM,QAAxB,EAAE,WAAW,GAAK,MAAM,YAAX,CAAY;QAE7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAe,CAAC;YACzC,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;IAkBY,gBAAM,GAAnB,UAAoB,MAA6B;;;;;;wBAC/C,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;4BACzG,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;yBAC1C;wBAEO,WAAW,GAAiD,MAAM,YAAvD,EAAE,QAAQ,GAAuC,MAAM,SAA7C,EAAE,WAAW,GAA0B,MAAM,YAAhC,EAAE,YAAY,GAAY,MAAM,aAAlB,EAAE,KAAK,GAAK,MAAM,MAAX,CAAY;wBAErE,eAAe,GAAG,IAAI,mCAAe,CAAC;4BAC1C,KAAK,OAAA;4BACL,YAAY,cAAA;yBACb,CAAC,CAAC;wBAEG,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;wBACd,OAAO,GAAG,IAAA,6BAAa,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;wBAEtC,QAAQ,yBACT,WAAW,KACd,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GACvC,CAAC;wBAEF,WAAM,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAA;;wBAAnE,SAAmE,CAAC;wBAEpE,WAAO,IAAI,SAAS,CAAC;gCACnB,WAAW,aAAA;gCACX,OAAO,SAAA;gCACP,YAAY,cAAA;gCACZ,KAAK,OAAA;6BACN,CAAC,EAAC;;;;KACJ;IAKY,0BAAM,GAAnB,UAAoB,cAAuC;;;;;4BAC5C,WAAM,IAAI,CAAC,WAAW,EAAE,EAAA;;wBAA/B,IAAI,GAAG,SAAwB;wBAE/B,WAAW,yBACZ,IAAI,GACJ,cAAc,CAClB,CAAC;wBAEe,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;wBAAhG,QAAQ,GAAG,SAAqF;wBAEhG,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;wBACrC,WAAO,aAA8B,EAAC;;;;KACvC;IAKY,+BAAW,GAAxB;;;;;4BACoB,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAA;;wBAAtG,KAAK,GAAK,CAAA,SAA4F,CAAA,MAAjG;wBACb,WAAO,KAAsB,EAAC;;;;KAC/B;IAKY,0BAAM,GAAnB;;;;4BACE,WAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAA;;wBAAxF,SAAwF,CAAC;;;;;KAC1F;IACH,gBAAC;AAAD,CAAC,AA9FD,IA8FC;AA9FY,8BAAS"}
|
|
@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.TokenCollection = void 0;
|
|
40
|
+
var base_1 = require("@or-sdk/base");
|
|
40
41
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
41
42
|
var TokenAuth_1 = require("./TokenAuth");
|
|
42
43
|
var TokenCollection = (function () {
|
|
@@ -58,7 +59,7 @@ var TokenCollection = (function () {
|
|
|
58
59
|
case 0: return [4, this.keyValueStorage.listKeys(this.serviceName)];
|
|
59
60
|
case 1:
|
|
60
61
|
records = (_a.sent()).items;
|
|
61
|
-
return [2, records.map(function (record) { return record.key; })];
|
|
62
|
+
return [2, (0, base_1.makeList)(records.map(function (record) { return record.key; }).filter(function (key) { return key.includes('::token'); }))];
|
|
62
63
|
}
|
|
63
64
|
});
|
|
64
65
|
});
|
|
@@ -68,7 +69,10 @@ var TokenCollection = (function () {
|
|
|
68
69
|
var record;
|
|
69
70
|
return __generator(this, function (_a) {
|
|
70
71
|
switch (_a.label) {
|
|
71
|
-
case 0:
|
|
72
|
+
case 0:
|
|
73
|
+
if (!key.includes('::token'))
|
|
74
|
+
throw new Error('The Token authorization key should contain "token" type specifier.');
|
|
75
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key))];
|
|
72
76
|
case 1:
|
|
73
77
|
record = _a.sent();
|
|
74
78
|
if (!record.value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenCollection.js","sourceRoot":"","sources":["../../../src/Token/TokenCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"TokenCollection.js","sourceRoot":"","sources":["../../../src/Token/TokenCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAqD;AACrD,+DAA4D;AAC5D,yCAAwC;AAOxC;IAME,yBAAY,MAA6B;QAC/B,IAAA,KAAK,GAAgC,MAAM,MAAtC,EAAE,YAAY,GAAkB,MAAM,aAAxB,EAAE,WAAW,GAAK,MAAM,YAAX,CAAY;QAEpD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAe,CAAC;YACzC,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;IACL,CAAC;IAKY,4CAAkB,GAA/B;;;;;4BAC6B,WAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAA;;wBAAjE,OAAO,GAAK,CAAA,SAAqD,CAAA,MAA1D;wBAEtB,WAAO,IAAA,eAAQ,EAAS,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,GAAG,EAAV,CAAU,CAAC,CAAC,MAAM,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAvB,CAAuB,CAAC,CAAC,EAAC;;;;KACrG;IAKY,0CAAgB,GAA7B,UAA8B,GAAW;;;;;;wBACvC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;4BAAE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;wBACrG,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAA;;wBAA5F,MAAM,GAAG,SAAmF;wBAClG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;4BACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;yBACjD;wBAED,WAAO,IAAI,qBAAS,CAAC;gCACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gCAC7B,OAAO,EAAE,GAAG;gCACZ,YAAY,EAAE,IAAI,CAAC,iBAAiB;gCACpC,KAAK,EAAE,IAAI,CAAC,UAAU;6BACvB,CAAC,EAAC;;;;KACJ;IAeY,6CAAmB,GAAhC,UACE,MAAyC;;;;4BAElC,WAAM,qBAAS,CAAC,MAAM,CAAC;4BAC5B,YAAY,EAAE,IAAI,CAAC,iBAAiB;4BACpC,KAAK,EAAE,IAAI,CAAC,UAAU;4BACtB,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,WAAW,EAAE,MAAM,CAAC,WAAW;yBAChC,CAAC,EAAA;4BANF,WAAO,SAML,EAAC;;;;KACJ;IACH,sBAAC;AAAD,CAAC,AArED,IAqEC;AArEY,0CAAe"}
|
|
@@ -75,13 +75,13 @@ export class BasicAuth {
|
|
|
75
75
|
}
|
|
76
76
|
getAuthData() {
|
|
77
77
|
return __awaiter(this, void 0, void 0, function* () {
|
|
78
|
-
const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
|
|
78
|
+
const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
|
|
79
79
|
return value;
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
delete() {
|
|
83
83
|
return __awaiter(this, void 0, void 0, function* () {
|
|
84
|
-
yield this.keyValueStorage.deleteKey(this.serviceName, this.authKey);
|
|
84
|
+
yield this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey));
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasicAuth.js","sourceRoot":"","sources":["../../../src/Basic/BasicAuth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BasicAuth.js","sourceRoot":"","sources":["../../../src/Basic/BasicAuth.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAIpC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,OAAO,SAAS;IAKpB,YAAY,MAAuB;QACjC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAE7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC;YACzC,KAAK;YACL,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAKD,MAAM,CAAC,iBAAiB,CAAC,QAAgB,EAAE,QAAgB;QACzD,OAAO,IAAI,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC;IACzC,CAAC;IAKD,MAAM,CAAC,iBAAiB,CAAC,KAAa;QACpC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpD,OAAO;YACL,QAAQ;YACR,QAAQ;SACT,CAAC;IACJ,CAAC;IAiBD,MAAM,CAAO,MAAM,CAAC,MAA6B;;YAC/C,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;gBACzH,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;aAC1C;YAED,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YAElF,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC;gBAC1C,KAAK;gBACL,YAAY;aACb,CAAC,CAAC;YAEH,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAE5C,MAAM,QAAQ,GAAG;gBACf,SAAS,EAAE,QAAQ;gBACnB,YAAY,EAAE,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBAC7D,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACvC,CAAC;YAEF,MAAM,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEpE,OAAO,IAAI,SAAS,CAAC;gBACnB,WAAW;gBACX,OAAO;gBACP,YAAY;gBACZ,KAAK;aACN,CAAC,CAAC;QACL,CAAC;KAAA;IAKY,MAAM,CAAC,cAAyD;;YAC3E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACtC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE5E,IAAI,cAAc,CAAC,QAAQ,EAAE;gBAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;aACpC;YACD,IAAI,cAAc,CAAC,QAAQ,EAAE;gBAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;aACpC;YAED,MAAM,kBAAkB,GAAG,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC3E,MAAM,WAAW,mCACZ,IAAI,KACP,YAAY,EAAE,kBAAkB,GACjC,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAEvG,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;YACrC,OAAO,aAA8B,CAAC;QACxC,CAAC;KAAA;IAKY,WAAW;;YACtB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAC/G,OAAO,KAAsB,CAAC;QAChC,CAAC;KAAA;IAKY,MAAM;;YACjB,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3F,CAAC;KAAA;CACF"}
|
|
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import { makeList } from '@or-sdk/base';
|
|
10
11
|
import { KeyValueStorage } from '@or-sdk/key-value-storage';
|
|
11
12
|
import { BasicAuth } from './BasicAuth';
|
|
12
13
|
export class BasicCollection {
|
|
@@ -23,12 +24,14 @@ export class BasicCollection {
|
|
|
23
24
|
listAuthorizations() {
|
|
24
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
26
|
const { items: records } = yield this.keyValueStorage.listKeys(this.serviceName);
|
|
26
|
-
return records.map((record) => record.key);
|
|
27
|
+
return makeList(records.map((record) => record.key).filter(key => key.includes('::basic')));
|
|
27
28
|
});
|
|
28
29
|
}
|
|
29
30
|
getAuthorization(key) {
|
|
30
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
|
|
32
|
+
if (!key.includes('::basic'))
|
|
33
|
+
throw new Error('The Token authorization key should contain "basic" type specifier.');
|
|
34
|
+
const record = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key));
|
|
32
35
|
if (!record.value) {
|
|
33
36
|
throw new Error('Authorization does not exist');
|
|
34
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasicCollection.js","sourceRoot":"","sources":["../../../src/Basic/BasicCollection.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"BasicCollection.js","sourceRoot":"","sources":["../../../src/Basic/BasicCollection.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxC,MAAM,OAAO,eAAe;IAM1B,YAAY,MAA6B;QACvC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAEpD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC;YACzC,KAAK;YACL,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAKY,kBAAkB;;YAC7B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEjF,OAAO,QAAQ,CAAS,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC;KAAA;IAKY,gBAAgB,CAAC,GAAW;;YACvC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;YACpH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;YACnG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YAED,OAAO,IAAI,SAAS,CAAC;gBACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,OAAO,EAAE,GAAG;gBACZ,YAAY,EAAE,IAAI,CAAC,iBAAiB;gBACpC,KAAK,EAAE,IAAI,CAAC,UAAU;aACvB,CAAC,CAAC;QACL,CAAC;KAAA;IAcY,mBAAmB,CAC9B,MAAyC;;YAEzC,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC;gBAC5B,YAAY,EAAE,IAAI,CAAC,iBAAiB;gBACpC,KAAK,EAAE,IAAI,CAAC,UAAU;gBACtB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;QACL,CAAC;KAAA;CACF"}
|