@or-sdk/authorizer 0.24.14-beta.944.0 → 0.24.14-beta.976.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 +2 -6
- package/dist/cjs/Basic/BasicCollection.js.map +1 -1
- package/dist/cjs/OAuth/OAuth.js +49 -75
- package/dist/cjs/OAuth/OAuth.js.map +1 -1
- package/dist/cjs/OAuth/OAuthCollection.js +4 -8
- 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 +2 -6
- 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 +2 -5
- package/dist/esm/Basic/BasicCollection.js.map +1 -1
- package/dist/esm/OAuth/OAuth.js +35 -57
- package/dist/esm/OAuth/OAuth.js.map +1 -1
- package/dist/esm/OAuth/OAuthCollection.js +4 -7
- 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 +2 -5
- package/dist/esm/Token/TokenCollection.js.map +1 -1
- package/dist/types/Basic/BasicCollection.d.ts +1 -2
- 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 +2 -3
- package/dist/types/OAuth/OAuthCollection.d.ts.map +1 -1
- package/dist/types/OAuth/types.d.ts +0 -5
- package/dist/types/OAuth/types.d.ts.map +1 -1
- package/dist/types/Token/TokenCollection.d.ts +1 -2
- package/dist/types/Token/TokenCollection.d.ts.map +1 -1
- package/package.json +4 -6
- package/src/Basic/BasicAuth.ts +2 -3
- package/src/Basic/BasicCollection.ts +4 -5
- package/src/OAuth/OAuth.ts +51 -105
- package/src/OAuth/OAuthCollection.ts +8 -9
- package/src/OAuth/types.ts +2 -27
- package/src/Token/TokenAuth.ts +2 -2
- package/src/Token/TokenCollection.ts +4 -5
|
@@ -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,
|
|
139
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, 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,
|
|
151
|
+
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, 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,7 +37,6 @@ 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");
|
|
41
40
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
42
41
|
var BasicAuth_1 = require("./BasicAuth");
|
|
43
42
|
var BasicCollection = (function () {
|
|
@@ -59,7 +58,7 @@ var BasicCollection = (function () {
|
|
|
59
58
|
case 0: return [4, this.keyValueStorage.listKeys(this.serviceName)];
|
|
60
59
|
case 1:
|
|
61
60
|
records = (_a.sent()).items;
|
|
62
|
-
return [2,
|
|
61
|
+
return [2, records.map(function (record) { return record.key; })];
|
|
63
62
|
}
|
|
64
63
|
});
|
|
65
64
|
});
|
|
@@ -69,10 +68,7 @@ var BasicCollection = (function () {
|
|
|
69
68
|
var record;
|
|
70
69
|
return __generator(this, function (_a) {
|
|
71
70
|
switch (_a.label) {
|
|
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))];
|
|
71
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, key)];
|
|
76
72
|
case 1:
|
|
77
73
|
record = _a.sent();
|
|
78
74
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+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,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,GAAG,EAAV,CAAU,CAAC,EAAC;;;;KAC5C;IAKY,0CAAgB,GAA7B,UAA8B,GAAW;;;;;4BACxB,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,EAAA;;wBAAxE,MAAM,GAAG,SAA+D;wBAC9E,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,AApED,IAoEC;AApEY,0CAAe"}
|
package/dist/cjs/OAuth/OAuth.js
CHANGED
|
@@ -49,9 +49,7 @@ 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");
|
|
53
52
|
var event_manager_1 = require("@or-sdk/event-manager");
|
|
54
|
-
var discovery_1 = require("@or-sdk/discovery");
|
|
55
53
|
var base_1 = require("@or-sdk/base");
|
|
56
54
|
var uuid_1 = require("uuid");
|
|
57
55
|
var constants_1 = require("../constants");
|
|
@@ -62,13 +60,7 @@ var createAuthKey_1 = require("./utils/createAuthKey");
|
|
|
62
60
|
var OAuth = (function () {
|
|
63
61
|
function OAuth(params) {
|
|
64
62
|
this.status = constants_1.AuthStatus.READY;
|
|
65
|
-
var
|
|
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
|
-
}
|
|
63
|
+
var token = params.token, discoveryUrl = params.discoveryUrl, authKey = params.authKey, serviceName = params.serviceName, keyValueCollection = params.keyValueCollection;
|
|
72
64
|
this.authKey = authKey;
|
|
73
65
|
this.serviceName = serviceName;
|
|
74
66
|
this.keyValueCollection = keyValueCollection || serviceName;
|
|
@@ -76,85 +68,64 @@ var OAuth = (function () {
|
|
|
76
68
|
token: token,
|
|
77
69
|
discoveryUrl: discoveryUrl,
|
|
78
70
|
});
|
|
79
|
-
this.
|
|
71
|
+
this.eventManager = new event_manager_1.EventManager({
|
|
80
72
|
token: token,
|
|
81
73
|
discoveryUrl: discoveryUrl,
|
|
82
|
-
|
|
83
|
-
|
|
74
|
+
requestAccountId: true,
|
|
75
|
+
requestProvidersAccountId: true,
|
|
84
76
|
});
|
|
85
77
|
}
|
|
86
78
|
OAuth.create = function (params) {
|
|
87
79
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
|
-
var
|
|
80
|
+
var serviceName, authName, discoveryUrl, token, appId, scope, keyValueCollection, keyValueStorage, eventManager, serviceDefinitionProviderRoute, services, currentServiceData, apps, currentApp, serviceDefinition, id, authKey, additionalBodyData, additionalHeaders, emUrl, redirectProviderUrl, authConfigs, formattedScope, configs, tempAuthData, authDataExpire, authUrl, additionalParams, formattedScope, authorizeUrl, newOAuth;
|
|
89
81
|
var _a;
|
|
90
82
|
return __generator(this, function (_b) {
|
|
91
83
|
switch (_b.label) {
|
|
92
84
|
case 0:
|
|
93
85
|
if (!(params.serviceName &&
|
|
94
86
|
params.authName &&
|
|
87
|
+
params.discoveryUrl &&
|
|
95
88
|
params.token &&
|
|
96
|
-
params.appId)
|
|
97
|
-
(
|
|
98
|
-
params.providersAccountId &&
|
|
99
|
-
params.eventManagerUrl))) {
|
|
100
|
-
throw new Error('Invalid OAuth config passed');
|
|
89
|
+
params.appId)) {
|
|
90
|
+
throw new Error('Invalid config passed');
|
|
101
91
|
}
|
|
102
|
-
|
|
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:
|
|
92
|
+
serviceName = params.serviceName, authName = params.authName, discoveryUrl = params.discoveryUrl, token = params.token, appId = params.appId, scope = params.scope;
|
|
127
93
|
keyValueCollection = params.keyValueCollection || serviceName;
|
|
128
94
|
keyValueStorage = new key_value_storage_1.KeyValueStorage({
|
|
129
95
|
token: token,
|
|
130
96
|
discoveryUrl: discoveryUrl,
|
|
131
97
|
});
|
|
132
|
-
|
|
98
|
+
eventManager = new event_manager_1.EventManager({
|
|
133
99
|
token: token,
|
|
134
100
|
discoveryUrl: discoveryUrl,
|
|
135
|
-
|
|
136
|
-
|
|
101
|
+
requestAccountId: true,
|
|
102
|
+
requestProvidersAccountId: true,
|
|
137
103
|
});
|
|
138
|
-
return [4,
|
|
104
|
+
return [4, eventManager.init()];
|
|
105
|
+
case 1:
|
|
106
|
+
_b.sent();
|
|
107
|
+
serviceDefinitionProviderRoute = "http/".concat(eventManager.providersAccountId).concat(constants_1.SERVICE_PROVIDER_PATH);
|
|
108
|
+
return [4, eventManager.makeRequest({
|
|
139
109
|
method: 'GET',
|
|
140
|
-
route:
|
|
110
|
+
route: serviceDefinitionProviderRoute,
|
|
141
111
|
params: {
|
|
142
112
|
type: 'list',
|
|
143
113
|
},
|
|
144
114
|
})];
|
|
145
|
-
case
|
|
115
|
+
case 2:
|
|
146
116
|
services = _b.sent();
|
|
147
117
|
currentServiceData = services[serviceName];
|
|
148
118
|
return [4, keyValueStorage.getValueByKey(keyValueCollection, '__authorizer_apps')];
|
|
149
|
-
case
|
|
119
|
+
case 3:
|
|
150
120
|
apps = _b.sent();
|
|
151
121
|
currentApp = apps.value.find(function (app) { return app.value.appId === appId; }).value;
|
|
152
122
|
serviceDefinition = new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment);
|
|
153
123
|
id = (0, uuid_1.v4)();
|
|
154
|
-
authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection,
|
|
124
|
+
authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection, eventManager.currentAccountId);
|
|
155
125
|
additionalBodyData = {};
|
|
156
126
|
additionalHeaders = {};
|
|
157
|
-
|
|
127
|
+
emUrl = eventManager.serviceUrl;
|
|
128
|
+
redirectProviderUrl = "".concat(emUrl, "/http/").concat(eventManager.providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
|
|
158
129
|
authConfigs = __assign(__assign({}, additionalBodyData), { grant_type: 'authorization_code', redirect_uri: redirectProviderUrl, appId: appId });
|
|
159
130
|
if (scope) {
|
|
160
131
|
formattedScope = (0, formatScope_1.formatScope)(scope, serviceDefinition.scopeType);
|
|
@@ -175,11 +146,11 @@ var OAuth = (function () {
|
|
|
175
146
|
serviceConfigName: serviceName,
|
|
176
147
|
name: authName,
|
|
177
148
|
displayServiceName: serviceDefinition.displayServiceName,
|
|
178
|
-
accountId:
|
|
149
|
+
accountId: eventManager.currentAccountId,
|
|
179
150
|
};
|
|
180
151
|
authDataExpire = Date.now() + constants_1.TEMPORARY_DATA_EXPIRATION_TIME;
|
|
181
152
|
return [4, keyValueStorage.setValueByKey('__authorizer_temp-uuid', id, tempAuthData, authDataExpire)];
|
|
182
|
-
case
|
|
153
|
+
case 4:
|
|
183
154
|
_b.sent();
|
|
184
155
|
authUrl = new URL(serviceDefinition.authorizeUri);
|
|
185
156
|
additionalParams = JSON.parse(serviceDefinition.authRequestAdditionalParams);
|
|
@@ -197,11 +168,9 @@ var OAuth = (function () {
|
|
|
197
168
|
}
|
|
198
169
|
authorizeUrl = authUrl.href;
|
|
199
170
|
newOAuth = new OAuth({
|
|
171
|
+
serviceName: serviceName,
|
|
200
172
|
authKey: authKey,
|
|
201
173
|
discoveryUrl: discoveryUrl,
|
|
202
|
-
eventManagerUrl: eventManagerUrl,
|
|
203
|
-
providersAccountId: providersAccountId,
|
|
204
|
-
serviceName: serviceName,
|
|
205
174
|
token: token,
|
|
206
175
|
});
|
|
207
176
|
newOAuth.status = constants_1.AuthStatus.PENDING;
|
|
@@ -233,17 +202,21 @@ var OAuth = (function () {
|
|
|
233
202
|
};
|
|
234
203
|
OAuth.prototype.getServiceDefinition = function (currentApp) {
|
|
235
204
|
return __awaiter(this, void 0, void 0, function () {
|
|
236
|
-
var services, currentServiceData;
|
|
205
|
+
var serviceDefinitionProviderRoute, services, currentServiceData;
|
|
237
206
|
return __generator(this, function (_a) {
|
|
238
207
|
switch (_a.label) {
|
|
239
|
-
case 0: return [4, this.
|
|
240
|
-
method: 'GET',
|
|
241
|
-
route: constants_1.SERVICE_PROVIDER_PATH,
|
|
242
|
-
params: {
|
|
243
|
-
type: 'list',
|
|
244
|
-
},
|
|
245
|
-
})];
|
|
208
|
+
case 0: return [4, this.eventManager.init()];
|
|
246
209
|
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:
|
|
247
220
|
services = _a.sent();
|
|
248
221
|
currentServiceData = services[this.serviceName];
|
|
249
222
|
return [2, new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment)];
|
|
@@ -266,7 +239,7 @@ var OAuth = (function () {
|
|
|
266
239
|
_a.label = 1;
|
|
267
240
|
case 1:
|
|
268
241
|
if (!(spentTime < pollTimeout)) return [3, 4];
|
|
269
|
-
return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection,
|
|
242
|
+
return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, this.authKey)];
|
|
270
243
|
case 2:
|
|
271
244
|
record = _a.sent();
|
|
272
245
|
if (record.value) {
|
|
@@ -294,14 +267,14 @@ var OAuth = (function () {
|
|
|
294
267
|
};
|
|
295
268
|
OAuth.prototype.getAuthData = function () {
|
|
296
269
|
return __awaiter(this, void 0, void 0, function () {
|
|
297
|
-
var value, authData, refreshedAuthData;
|
|
270
|
+
var value, authData, expired, refreshedAuthData;
|
|
298
271
|
return __generator(this, function (_a) {
|
|
299
272
|
switch (_a.label) {
|
|
300
273
|
case 0:
|
|
301
274
|
if (this.status !== constants_1.AuthStatus.READY) {
|
|
302
275
|
throw new Error('This authorization is not ready');
|
|
303
276
|
}
|
|
304
|
-
return [4, this.keyValueStorage.getValueByKey(this.serviceName,
|
|
277
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
305
278
|
case 1:
|
|
306
279
|
value = (_a.sent()).value;
|
|
307
280
|
if (!value) {
|
|
@@ -312,13 +285,14 @@ var OAuth = (function () {
|
|
|
312
285
|
if (!authData.expires_in) {
|
|
313
286
|
return [2, authData];
|
|
314
287
|
}
|
|
315
|
-
|
|
288
|
+
expired = (0, isExpired_1.isExpired)(authData.created_at, authData.expires_in);
|
|
289
|
+
if (!expired) {
|
|
316
290
|
return [2, authData];
|
|
317
291
|
}
|
|
318
292
|
return [4, this.refresh()];
|
|
319
293
|
case 2:
|
|
320
294
|
_a.sent();
|
|
321
|
-
return [4, this.keyValueStorage.getValueByKey(this.serviceName,
|
|
295
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
322
296
|
case 3:
|
|
323
297
|
refreshedAuthData = (_a.sent()).value;
|
|
324
298
|
return [2, refreshedAuthData];
|
|
@@ -331,7 +305,7 @@ var OAuth = (function () {
|
|
|
331
305
|
var value, authData, appId, currentApp, serviceDefinition;
|
|
332
306
|
return __generator(this, function (_a) {
|
|
333
307
|
switch (_a.label) {
|
|
334
|
-
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName,
|
|
308
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
335
309
|
case 1:
|
|
336
310
|
value = (_a.sent()).value;
|
|
337
311
|
if (!value) {
|
|
@@ -350,9 +324,9 @@ var OAuth = (function () {
|
|
|
350
324
|
return [4, this.getServiceDefinition(currentApp)];
|
|
351
325
|
case 3:
|
|
352
326
|
serviceDefinition = _a.sent();
|
|
353
|
-
return [4, this.
|
|
327
|
+
return [4, this.eventManager.makeRequest({
|
|
354
328
|
method: 'POST',
|
|
355
|
-
route:
|
|
329
|
+
route: new URL(authData.redirect_uri).pathname,
|
|
356
330
|
data: {
|
|
357
331
|
refreshTokenUrl: authData.refreshUri,
|
|
358
332
|
sendDataType: serviceDefinition.requestDataType,
|
|
@@ -377,7 +351,7 @@ var OAuth = (function () {
|
|
|
377
351
|
if (this.status !== constants_1.AuthStatus.READY) {
|
|
378
352
|
throw new Error('This authorization is not ready');
|
|
379
353
|
}
|
|
380
|
-
return [4, this.keyValueStorage.getValueByKey(this.serviceName,
|
|
354
|
+
return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
|
|
381
355
|
case 1:
|
|
382
356
|
value = (_a.sent()).value;
|
|
383
357
|
if (!value) {
|
|
@@ -402,7 +376,7 @@ var OAuth = (function () {
|
|
|
402
376
|
return __awaiter(this, void 0, void 0, function () {
|
|
403
377
|
return __generator(this, function (_a) {
|
|
404
378
|
switch (_a.label) {
|
|
405
|
-
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName,
|
|
379
|
+
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, this.authKey)];
|
|
406
380
|
case 1:
|
|
407
381
|
_a.sent();
|
|
408
382
|
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,7 +48,6 @@ 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");
|
|
52
51
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
53
52
|
var OAuth_1 = require("./OAuth");
|
|
54
53
|
var OAuthCollection = (function () {
|
|
@@ -71,7 +70,7 @@ var OAuthCollection = (function () {
|
|
|
71
70
|
case 0: return [4, this.keyValueStorage.listKeys(this.keyValueCollection)];
|
|
72
71
|
case 1:
|
|
73
72
|
records = (_a.sent()).items;
|
|
74
|
-
return [2,
|
|
73
|
+
return [2, records.map(function (record) { return record.key; })];
|
|
75
74
|
}
|
|
76
75
|
});
|
|
77
76
|
});
|
|
@@ -85,10 +84,10 @@ var OAuthCollection = (function () {
|
|
|
85
84
|
case 1:
|
|
86
85
|
appsStorageRecord = _a.sent();
|
|
87
86
|
if (!appsStorageRecord.value) {
|
|
88
|
-
return [2,
|
|
87
|
+
return [2, []];
|
|
89
88
|
}
|
|
90
89
|
appsRecords = appsStorageRecord.value;
|
|
91
|
-
return [2,
|
|
90
|
+
return [2, appsRecords.map(function (record) { return (__assign({ name: record.label }, record.value)); })];
|
|
92
91
|
}
|
|
93
92
|
});
|
|
94
93
|
});
|
|
@@ -98,10 +97,7 @@ var OAuthCollection = (function () {
|
|
|
98
97
|
var record;
|
|
99
98
|
return __generator(this, function (_a) {
|
|
100
99
|
switch (_a.label) {
|
|
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))];
|
|
100
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, key)];
|
|
105
101
|
case 1:
|
|
106
102
|
record = _a.sent();
|
|
107
103
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA4D;AAC5D,iCAAgC;AAIhC;IAOE,yBAAY,MAA6B;QAC/B,IAAA,KAAK,GAAoD,MAAM,MAA1D,EAAE,YAAY,GAAsC,MAAM,aAA5C,EAAE,WAAW,GAAyB,MAAM,YAA/B,EAAE,kBAAkB,GAAK,MAAM,mBAAX,CAAY;QAExE,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,IAAI,WAAW,CAAC;QAC5D,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,CAC5D,IAAI,CAAC,kBAAkB,CACxB,EAAA;;wBAFc,OAAO,GAAK,CAAA,SAE1B,CAAA,MAFqB;wBAItB,WAAO,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,GAAG,EAAV,CAAU,CAAC,EAAC;;;;KAC5C;IAKY,uCAAa,GAA1B;;;;;4BAC4B,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAChE,IAAI,CAAC,kBAAkB,EACvB,mBAAmB,CACpB,EAAA;;wBAHK,iBAAiB,GAAG,SAGzB;wBAED,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE;4BAC5B,WAAO,EAAE,EAAC;yBACX;wBAEK,WAAW,GAAG,iBAAiB,CAAC,KAGpC,CAAC;wBAEH,WAAO,WAAW,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,YACjC,IAAI,EAAE,MAAM,CAAC,KAAK,IACf,MAAM,CAAC,KAAK,EACf,EAHiC,CAGjC,CAAC,EAAC;;;;KACL;IAKY,0CAAgB,GAA7B,UAA8B,GAAW;;;;;4BACxB,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACrD,IAAI,CAAC,kBAAkB,EACvB,GAAG,CACJ,EAAA;;wBAHK,MAAM,GAAG,SAGd;wBACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;4BACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;yBACtD;wBAED,WAAO,IAAI,aAAK,CAAC;gCACf,WAAW,EAAE,IAAI,CAAC,WAAW;gCAC7B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gCAC3C,OAAO,EAAE,GAAG;gCACZ,YAAY,EAAE,IAAI,CAAC,iBAAiB;gCACpC,KAAK,EAAE,IAAI,CAAC,UAAU;6BACvB,CAAC,EAAC;;;;KACJ;IAwBY,6CAAmB,GAAhC,UACE,MAAqC;;;;4BAE9B,WAAM,aAAK,CAAC,MAAM,CAAC;4BACxB,YAAY,EAAE,IAAI,CAAC,iBAAiB;4BACpC,KAAK,EAAE,IAAI,CAAC,UAAU;4BACtB,KAAK,EAAE,MAAM,CAAC,KAAK;4BACnB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;4BAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;4BACnB,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;yBAC1B,CAAC,EAAA;4BARF,WAAO,SAQL,EAAC;;;;KACJ;IACH,sBAAC;AAAD,CAAC,AA/GD,IA+GC;AA/GY,0CAAe"}
|
|
@@ -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":";;;AA2HA,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,
|
|
117
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, 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,
|
|
129
|
+
case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, 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,
|
|
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;;wBAAlF,KAAK,GAAK,CAAA,SAAwE,CAAA,MAA7E;wBACb,WAAO,KAAsB,EAAC;;;;KAC/B;IAKY,0BAAM,GAAnB;;;;4BACE,WAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAApE,SAAoE,CAAC;;;;;KACtE;IACH,gBAAC;AAAD,CAAC,AA9FD,IA8FC;AA9FY,8BAAS"}
|
|
@@ -37,7 +37,6 @@ 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");
|
|
41
40
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
42
41
|
var TokenAuth_1 = require("./TokenAuth");
|
|
43
42
|
var TokenCollection = (function () {
|
|
@@ -59,7 +58,7 @@ var TokenCollection = (function () {
|
|
|
59
58
|
case 0: return [4, this.keyValueStorage.listKeys(this.serviceName)];
|
|
60
59
|
case 1:
|
|
61
60
|
records = (_a.sent()).items;
|
|
62
|
-
return [2,
|
|
61
|
+
return [2, records.map(function (record) { return record.key; })];
|
|
63
62
|
}
|
|
64
63
|
});
|
|
65
64
|
});
|
|
@@ -69,10 +68,7 @@ var TokenCollection = (function () {
|
|
|
69
68
|
var record;
|
|
70
69
|
return __generator(this, function (_a) {
|
|
71
70
|
switch (_a.label) {
|
|
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))];
|
|
71
|
+
case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, key)];
|
|
76
72
|
case 1:
|
|
77
73
|
record = _a.sent();
|
|
78
74
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+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,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,GAAG,EAAV,CAAU,CAAC,EAAC;;;;KAC5C;IAKY,0CAAgB,GAA7B,UAA8B,GAAW;;;;;4BACxB,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,EAAA;;wBAAxE,MAAM,GAAG,SAA+D;wBAC9E,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,AApED,IAoEC;AApEY,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,
|
|
78
|
+
const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, 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,
|
|
84
|
+
yield this.keyValueStorage.deleteKey(this.serviceName, 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":"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"}
|
|
@@ -7,7 +7,6 @@ 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';
|
|
11
10
|
import { KeyValueStorage } from '@or-sdk/key-value-storage';
|
|
12
11
|
import { BasicAuth } from './BasicAuth';
|
|
13
12
|
export class BasicCollection {
|
|
@@ -24,14 +23,12 @@ export class BasicCollection {
|
|
|
24
23
|
listAuthorizations() {
|
|
25
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
25
|
const { items: records } = yield this.keyValueStorage.listKeys(this.serviceName);
|
|
27
|
-
return
|
|
26
|
+
return records.map((record) => record.key);
|
|
28
27
|
});
|
|
29
28
|
}
|
|
30
29
|
getAuthorization(key) {
|
|
31
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
-
|
|
33
|
-
throw new Error('The Token authorization key should contain "basic" type specifier.');
|
|
34
|
-
const record = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key));
|
|
31
|
+
const record = yield this.keyValueStorage.getValueByKey(this.serviceName, key);
|
|
35
32
|
if (!record.value) {
|
|
36
33
|
throw new Error('Authorization does not exist');
|
|
37
34
|
}
|
|
@@ -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":";;;;;;;;;AACA,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,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,CAAC;KAAA;IAKY,gBAAgB,CAAC,GAAW;;YACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC/E,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"}
|