@or-sdk/authorizer 0.24.14-beta.971.0 → 0.24.14-beta.976.0

package/dist/cjs/Basic/BasicAuth.js

@@ -0,0 +1,162 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasicAuth = void 0;
+var key_value_storage_1 = require("@or-sdk/key-value-storage");
+var uuid_1 = require("uuid");
+var createAuthKey_1 = require("./utils/createAuthKey");
+var BasicAuth = (function () {
+    function BasicAuth(params) {
+        var token = params.token, discoveryUrl = params.discoveryUrl, authKey = params.authKey, serviceName = params.serviceName;
+        this.authKey = authKey;
+        this.serviceName = serviceName;
+        this.keyValueStorage = new key_value_storage_1.KeyValueStorage({
+            token: token,
+            discoveryUrl: discoveryUrl,
+        });
+    }
+    BasicAuth.encodeAccessToken = function (username, password) {
+        return btoa("".concat(username, ":").concat(password));
+    };
+    BasicAuth.decodeAccessToken = function (token) {
+        var _a = atob(token).split(':'), username = _a[0], password = _a[1];
+        return {
+            username: username,
+            password: password,
+        };
+    };
+    BasicAuth.create = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var serviceName, authName, username, password, discoveryUrl, token, keyValueStorage, id, authKey, authData;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(params.serviceName && params.authName && params.username && params.password && params.discoveryUrl && params.token)) {
+                            throw new Error('Invalid config passed');
+                        }
+                        serviceName = params.serviceName, authName = params.authName, username = params.username, password = params.password, discoveryUrl = params.discoveryUrl, token = params.token;
+                        keyValueStorage = new key_value_storage_1.KeyValueStorage({
+                            token: token,
+                            discoveryUrl: discoveryUrl,
+                        });
+                        id = (0, uuid_1.v4)();
+                        authKey = (0, createAuthKey_1.createAuthKey)(id, authName);
+                        authData = {
+                            auth_name: authName,
+                            access_token: BasicAuth.encodeAccessToken(username, password),
+                            date_created: new Date().toISOString(),
+                        };
+                        return [4, keyValueStorage.setValueByKey(serviceName, authKey, authData)];
+                    case 1:
+                        _a.sent();
+                        return [2, new BasicAuth({
+                                serviceName: serviceName,
+                                authKey: authKey,
+                                discoveryUrl: discoveryUrl,
+                                token: token,
+                            })];
+                }
+            });
+        });
+    };
+    BasicAuth.prototype.update = function (newCredentials) {
+        return __awaiter(this, void 0, void 0, function () {
+            var data, _a, username, password, updatedAccessToken, updatedData, response, updatedRecord;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4, this.getAuthData()];
+                    case 1:
+                        data = _b.sent();
+                        _a = BasicAuth.decodeAccessToken(data.access_token), username = _a.username, password = _a.password;
+                        if (newCredentials.username) {
+                            username = newCredentials.username;
+                        }
+                        if (newCredentials.password) {
+                            password = newCredentials.password;
+                        }
+                        updatedAccessToken = BasicAuth.encodeAccessToken(username, password);
+                        updatedData = __assign(__assign({}, data), { access_token: updatedAccessToken });
+                        return [4, this.keyValueStorage.setValueByKey(this.serviceName, this.authKey, updatedData)];
+                    case 2:
+                        response = _b.sent();
+                        updatedRecord = response.value;
+                        return [2, updatedRecord];
+                }
+            });
+        });
+    };
+    BasicAuth.prototype.getAuthData = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var value;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
+                    case 1:
+                        value = (_a.sent()).value;
+                        return [2, value];
+                }
+            });
+        });
+    };
+    BasicAuth.prototype.delete = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, this.authKey)];
+                    case 1:
+                        _a.sent();
+                        return [2];
+                }
+            });
+        });
+    };
+    return BasicAuth;
+}());
+exports.BasicAuth = BasicAuth;
+//# sourceMappingURL=BasicAuth.js.map

package/dist/cjs/Basic/BasicAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BasicAuth.js","sourceRoot":"","sources":["../../../src/Basic/BasicAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA4D;AAE5D,6BAAoC;AAIpC,uDAAsD;AAEtD;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;IAKM,2BAAiB,GAAxB,UAAyB,QAAgB,EAAE,QAAgB;QACzD,OAAO,IAAI,CAAC,UAAG,QAAQ,cAAI,QAAQ,CAAE,CAAC,CAAC;IACzC,CAAC;IAKM,2BAAiB,GAAxB,UAAyB,KAAa;QAC9B,IAAA,KAAuB,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAA5C,QAAQ,QAAA,EAAE,QAAQ,QAA0B,CAAC;QACpD,OAAO;YACL,QAAQ,UAAA;YACR,QAAQ,UAAA;SACT,CAAC;IACJ,CAAC;IAiBY,gBAAM,GAAnB,UAAoB,MAA6B;;;;;;wBAC/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;4BACzH,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;yBAC1C;wBAEO,WAAW,GAAwD,MAAM,YAA9D,EAAE,QAAQ,GAA8C,MAAM,SAApD,EAAE,QAAQ,GAAoC,MAAM,SAA1C,EAAE,QAAQ,GAA0B,MAAM,SAAhC,EAAE,YAAY,GAAY,MAAM,aAAlB,EAAE,KAAK,GAAK,MAAM,MAAX,CAAY;wBAE5E,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,GAAG;4BACf,SAAS,EAAE,QAAQ;4BACnB,YAAY,EAAE,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC;4BAC7D,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;yBACvC,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,cAAyD;;;;;4BAC9D,WAAM,IAAI,CAAC,WAAW,EAAE,EAAA;;wBAA/B,IAAI,GAAG,SAAwB;wBACjC,KAAyB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,EAArE,QAAQ,cAAA,EAAE,QAAQ,cAAA,CAAoD;wBAE5E,IAAI,cAAc,CAAC,QAAQ,EAAE;4BAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;yBACpC;wBACD,IAAI,cAAc,CAAC,QAAQ,EAAE;4BAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;yBACpC;wBAEK,kBAAkB,GAAG,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;wBACrE,WAAW,yBACZ,IAAI,KACP,YAAY,EAAE,kBAAkB,GACjC,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,AAxHD,IAwHC;AAxHY,8BAAS"}

package/dist/cjs/Basic/BasicCollection.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -48,35 +37,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicCollection = void 0;
-var base_1 = require("@or-sdk/base");
 var key_value_storage_1 = require("@or-sdk/key-value-storage");
-var createAuthKey_1 = require("./utils/createAuthKey");
-var uuid_1 = require("uuid");
+var BasicAuth_1 = require("./BasicAuth");
 var BasicCollection = (function () {
     function BasicCollection(params) {
-        var token = params.token, discoveryUrl = params.discoveryUrl, serviceName = params.serviceName, accountId = params.accountId;
-        this.serviceName = serviceName || '';
+        var token = params.token, discoveryUrl = params.discoveryUrl, serviceName = params.serviceName;
+        this.localToken = token;
+        this.localDiscoveryUrl = discoveryUrl;
+        this.serviceName = serviceName;
         this.keyValueStorage = new key_value_storage_1.KeyValueStorage({
             token: token,
             discoveryUrl: discoveryUrl,
-            accountId: accountId,
         });
     }
-    BasicCollection.prototype.init = function (serviceName) {
-        if (!serviceName)
-            throw new Error('Service name is required.');
-        this.serviceName = serviceName;
-    };
-    BasicCollection.encodeAccessToken = function (username, password) {
-        return btoa("".concat(username, ":").concat(password));
-    };
-    BasicCollection.decodeAccessToken = function (token) {
-        var _a = atob(token).split(':'), username = _a[0], password = _a[1];
-        return {
-            username: username,
-            password: password,
-        };
-    };
     BasicCollection.prototype.listAuthorizations = function () {
         return __awaiter(this, void 0, void 0, function () {
             var records;
@@ -85,111 +58,45 @@ var BasicCollection = (function () {
                     case 0: return [4, this.keyValueStorage.listKeys(this.serviceName)];
                     case 1:
                         records = (_a.sent()).items;
-                        return [2, (0, base_1.makeList)(records.map(function (record) { return record.key; }).filter(function (key) { return key.includes('::basic'); }))];
+                        return [2, records.map(function (record) { return record.key; })];
                 }
             });
         });
     };
     BasicCollection.prototype.getAuthorization = function (key) {
         return __awaiter(this, void 0, void 0, function () {
-            var record, authRecord;
+            var record;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!this.serviceName)
-                            throw new Error('Service name is not defined.');
-                        if (!key.includes('::basic'))
-                            throw new Error('The basic authorization key should contain "basic" type specifier.');
-                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key))];
+                    case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, key)];
                     case 1:
                         record = _a.sent();
                         if (!record.value) {
-                            throw new Error('Authorization does not exist.');
-                        }
-                        authRecord = record.value;
-                        if (!authRecord.auth_name || !authRecord.access_token || !authRecord.date_created) {
-                            throw new Error('Authorization does not exist or invalid.');
+                            throw new Error('Authorization does not exist');
                         }
-                        return [2, {
-                                auth_name: authRecord.auth_name,
-                                access_token: authRecord.access_token,
-                                date_created: authRecord.date_created,
-                                key: key,
-                            }];
-                }
-            });
-        });
-    };
-    BasicCollection.prototype.createAuthorization = function (params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var authName, password, username, id, authKey, authData;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        authName = params.authName, password = params.password, username = params.username;
-                        if (!authName || !username || !password) {
-                            throw new Error('Invalid authorization config passed.');
-                        }
-                        if (!this.serviceName)
-                            throw new Error('Service name is not defined.');
-                        id = (0, uuid_1.v4)();
-                        authKey = (0, createAuthKey_1.createAuthKey)(id, authName);
-                        authData = {
-                            auth_name: authName,
-                            access_token: BasicCollection.encodeAccessToken(username, password),
-                            date_created: new Date().toISOString(),
-                        };
-                        return [4, this.keyValueStorage.setValueByKey(this.serviceName, encodeURIComponent(authKey), authData)];
-                    case 1:
-                        _a.sent();
-                        return [2, __assign(__assign({}, authData), { key: authKey })];
-                }
-            });
-        });
-    };
-    BasicCollection.prototype.updateAuthorization = function (basicAuth, newCredentials) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, username, password, access_token, response, updatedData;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!basicAuth || !basicAuth.key || !basicAuth.access_token) {
-                            throw new Error('Authorization is invalid.');
-                        }
-                        if (!this.serviceName)
-                            throw new Error('Service name is not defined.');
-                        _a = BasicCollection.decodeAccessToken(basicAuth.access_token), username = _a.username, password = _a.password;
-                        if (newCredentials.username) {
-                            username = newCredentials.username;
-                        }
-                        if (newCredentials.password) {
-                            password = newCredentials.password;
-                        }
-                        access_token = BasicCollection.encodeAccessToken(username, password);
-                        return [4, this.keyValueStorage.setValueByKey(this.serviceName, encodeURIComponent(basicAuth.key), {
-                                auth_name: basicAuth.auth_name,
-                                date_created: basicAuth.date_created,
-                                access_token: access_token,
+                        return [2, new BasicAuth_1.BasicAuth({
+                                serviceName: this.serviceName,
+                                authKey: key,
+                                discoveryUrl: this.localDiscoveryUrl,
+                                token: this.localToken,
                             })];
-                    case 1:
-                        response = _b.sent();
-                        updatedData = response.value;
-                        return [2, __assign(__assign({}, updatedData), { key: basicAuth.key })];
                 }
             });
         });
     };
-    BasicCollection.prototype.deleteAuthorization = function (authKey) {
+    BasicCollection.prototype.createAuthorization = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!this.serviceName)
-                            throw new Error('Service name is not defined.');
-                        return [4, this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(authKey))];
-                    case 1:
-                        _a.sent();
-                        return [2];
+                    case 0: return [4, BasicAuth_1.BasicAuth.create({
+                            discoveryUrl: this.localDiscoveryUrl,
+                            token: this.localToken,
+                            serviceName: this.serviceName,
+                            authName: params.authName,
+                            password: params.password,
+                            username: params.username,
+                        })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });

package/dist/cjs/Basic/BasicCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"BasicCollection.js","sourceRoot":"","sources":["../../../src/Basic/BasicCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA8C;AAC9C,+DAA4D;AAE5D,uDAAsD;AACtD,6BAAoC;AAOpC;IAIE,yBAAY,MAA6B;QAC/B,IAAA,KAAK,GAA2C,MAAM,MAAjD,EAAE,YAAY,GAA6B,MAAM,aAAnC,EAAE,WAAW,GAAgB,MAAM,YAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;QAE/D,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAe,CAAC;YACzC,KAAK,OAAA;YACL,YAAY,cAAA;YACZ,SAAS,WAAA;SACV,CAAC,CAAC;IACL,CAAC;IAMM,8BAAI,GAAX,UAAY,WAAmB;QAC7B,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE/D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAMM,iCAAiB,GAAxB,UAAyB,QAAgB,EAAE,QAAgB;QACzD,OAAO,IAAI,CAAC,UAAG,QAAQ,cAAI,QAAQ,CAAE,CAAC,CAAC;IACzC,CAAC;IAKM,iCAAiB,GAAxB,UAAyB,KAAa;QAC9B,IAAA,KAAuB,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAA5C,QAAQ,QAAA,EAAE,QAAQ,QAA0B,CAAC;QACpD,OAAO;YACL,QAAQ,UAAA;YACR,QAAQ,UAAA;SACT,CAAC;IACJ,CAAC;IAMY,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;IAMY,0CAAgB,GAA7B,UAA8B,GAAW;;;;;;wBACvC,IAAI,CAAC,IAAI,CAAC,WAAW;4BAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;wBACvE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;4BAAE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;wBAErG,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAA;;wBAA5F,MAAM,GAAG,SAAmF;wBAElG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;4BACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;yBAClD;wBAGK,UAAU,GAAG,MAAM,CAAC,KAAmC,CAAC;wBAE9D,IAAI,CAAC,UAAU,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,YAAY,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE;4BACjF,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;yBAC7D;wBAED,WAAO;gCACL,SAAS,EAAE,UAAU,CAAC,SAAS;gCAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;gCACrC,YAAY,EAAE,UAAU,CAAC,YAAY;gCACrC,GAAG,KAAA;6BACa,EAAC;;;;KACpB;IAeY,6CAAmB,GAAhC,UACE,MAAyC;;;;;;wBAGjC,QAAQ,GAAyB,MAAM,SAA/B,EAAE,QAAQ,GAAe,MAAM,SAArB,EAAE,QAAQ,GAAK,MAAM,SAAX,CAAY;wBAEhD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;4BACvC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;yBACzD;wBAED,IAAI,CAAC,IAAI,CAAC,WAAW;4BAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;wBAGjE,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;wBACd,OAAO,GAAG,IAAA,6BAAa,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;wBAEtC,QAAQ,GAAG;4BACf,SAAS,EAAE,QAAQ;4BACnB,YAAY,EAAE,eAAe,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC;4BACnE,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;yBACT,CAAC;wBAEhC,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAA;;wBAAjG,SAAiG,CAAC;wBAElG,WAAO,sBACF,QAAQ,KACX,GAAG,EAAE,OAAO,GACI,EAAC;;;;KACpB;IAMY,6CAAmB,GAAhC,UACE,SAAwB,EACxB,cAAyD;;;;;;wBAEzD,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE;4BAC3D,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;yBAC9C;wBAED,IAAI,CAAC,IAAI,CAAC,WAAW;4BAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;wBAGnE,KAAyB,eAAe,CAAC,iBAAiB,CAAC,SAAS,CAAC,YAAY,CAAC,EAAhF,QAAQ,cAAA,EAAE,QAAQ,cAAA,CAA+D;wBAEvF,IAAI,cAAc,CAAC,QAAQ,EAAE;4BAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;yBACpC;wBACD,IAAI,cAAc,CAAC,QAAQ,EAAE;4BAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;yBACpC;wBAEK,YAAY,GAAG,eAAe,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;wBAC1D,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACvD,IAAI,CAAC,WAAW,EAChB,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,EACjC;gCACE,SAAS,EAAE,SAAS,CAAC,SAAS;gCAC9B,YAAY,EAAE,SAAS,CAAC,YAAY;gCACpC,YAAY,cAAA;6BACb,CACF,EAAA;;wBARK,QAAQ,GAAG,SAQhB;wBAEK,WAAW,GAAG,QAAQ,CAAC,KAAmC,CAAC;wBACjE,WAAO,sBACF,WAAW,KACd,GAAG,EAAE,SAAS,CAAC,GAAG,GACF,EAAC;;;;KACpB;IAMY,6CAAmB,GAAhC,UAAiC,OAAe;;;;;wBAC9C,IAAI,CAAC,IAAI,CAAC,WAAW;4BAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;wBACvE,WAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAA;;wBAAnF,SAAmF,CAAC;;;;;KACrF;IACH,sBAAC;AAAD,CAAC,AAhLD,IAgLC;AAhLY,0CAAe"}
+{"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

@@ -49,9 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth = void 0;
 var key_value_storage_1 = require("@or-sdk/key-value-storage");
-var providers_1 = require("@or-sdk/providers");
 var event_manager_1 = require("@or-sdk/event-manager");
-var discovery_1 = require("@or-sdk/discovery");
 var base_1 = require("@or-sdk/base");
 var uuid_1 = require("uuid");
 var constants_1 = require("../constants");
@@ -62,101 +60,72 @@ var createAuthKey_1 = require("./utils/createAuthKey");
 var OAuth = (function () {
     function OAuth(params) {
         this.status = constants_1.AuthStatus.READY;
-        var accountId = params.accountId, authKey = params.authKey, discoveryUrl = params.discoveryUrl, eventManagerUrl = params.eventManagerUrl, keyValueCollection = params.keyValueCollection, providersAccountId = params.providersAccountId, serviceName = params.serviceName, token = params.token;
-        if (!(authKey && serviceName && authKey)) {
-            throw new Error('Invalit OAuth params passed.');
-        }
-        if (!discoveryUrl && !(eventManagerUrl && providersAccountId)) {
-            throw new Error('OAuth require Discovery URL or both Event Manager URL and Providers Account ID');
-        }
+        var token = params.token, discoveryUrl = params.discoveryUrl, authKey = params.authKey, serviceName = params.serviceName, keyValueCollection = params.keyValueCollection;
         this.authKey = authKey;
         this.serviceName = serviceName;
         this.keyValueCollection = keyValueCollection || serviceName;
         this.keyValueStorage = new key_value_storage_1.KeyValueStorage({
             token: token,
             discoveryUrl: discoveryUrl,
-            accountId: accountId,
         });
-        this.providers = new providers_1.Providers({
+        this.eventManager = new event_manager_1.EventManager({
             token: token,
             discoveryUrl: discoveryUrl,
-            eventManagerUrl: eventManagerUrl,
-            providersAccountId: providersAccountId,
+            requestAccountId: true,
+            requestProvidersAccountId: true,
         });
     }
     OAuth.create = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            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;
+            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;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(params.serviceName &&
                             params.authName &&
+                            params.discoveryUrl &&
                             params.token &&
-                            params.appId) || !(params.discoveryUrl ||
-                            (params.accountId &&
-                                params.providersAccountId &&
-                                params.eventManagerUrl))) {
-                            throw new Error('Invalid OAuth config passed');
+                            params.appId)) {
+                            throw new Error('Invalid config passed');
                         }
-                        appId = params.appId, authName = params.authName, discoveryUrl = params.discoveryUrl, scope = params.scope, serviceName = params.serviceName, token = params.token;
-                        accountId = params.accountId, eventManagerUrl = params.eventManagerUrl, providersAccountId = params.providersAccountId;
-                        if (!(discoveryUrl && !(accountId && eventManagerUrl && providersAccountId))) return [3, 6];
-                        discovery = new discovery_1.Discovery({
-                            token: token,
-                            discoveryUrl: discoveryUrl,
-                        });
-                        if (!!accountId) return [3, 2];
-                        return [4, discovery.getCurrentAccountId()];
-                    case 1:
-                        accountId = _b.sent();
-                        _b.label = 2;
-                    case 2:
-                        if (!!eventManagerUrl) return [3, 4];
-                        return [4, discovery.getServiceUrl(event_manager_1.EVENT_MANAGER_SERVICE_KEY)];
-                    case 3:
-                        eventManagerUrl = _b.sent();
-                        _b.label = 4;
-                    case 4:
-                        if (!!providersAccountId) return [3, 6];
-                        return [4, discovery.getProvidersAccountId()];
-                    case 5:
-                        providersAccountId = _b.sent();
-                        _b.label = 6;
-                    case 6:
+                        serviceName = params.serviceName, authName = params.authName, discoveryUrl = params.discoveryUrl, token = params.token, appId = params.appId, scope = params.scope;
                         keyValueCollection = params.keyValueCollection || serviceName;
                         keyValueStorage = new key_value_storage_1.KeyValueStorage({
                             token: token,
                             discoveryUrl: discoveryUrl,
-                            accountId: accountId,
                         });
-                        providers = new providers_1.Providers({
+                        eventManager = new event_manager_1.EventManager({
                             token: token,
                             discoveryUrl: discoveryUrl,
-                            eventManagerUrl: eventManagerUrl,
-                            providersAccountId: providersAccountId,
+                            requestAccountId: true,
+                            requestProvidersAccountId: true,
                         });
-                        return [4, providers.makeRequest({
+                        return [4, eventManager.init()];
+                    case 1:
+                        _b.sent();
+                        serviceDefinitionProviderRoute = "http/".concat(eventManager.providersAccountId).concat(constants_1.SERVICE_PROVIDER_PATH);
+                        return [4, eventManager.makeRequest({
                                 method: 'GET',
-                                route: constants_1.SERVICE_PROVIDER_PATH,
+                                route: serviceDefinitionProviderRoute,
                                 params: {
                                     type: 'list',
                                 },
                             })];
-                    case 7:
+                    case 2:
                         services = _b.sent();
                         currentServiceData = services[serviceName];
                         return [4, keyValueStorage.getValueByKey(keyValueCollection, '__authorizer_apps')];
-                    case 8:
+                    case 3:
                         apps = _b.sent();
                         currentApp = apps.value.find(function (app) { return app.value.appId === appId; }).value;
                         serviceDefinition = new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment);
                         id = (0, uuid_1.v4)();
-                        authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection, accountId || null);
+                        authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection, eventManager.currentAccountId);
                         additionalBodyData = {};
                         additionalHeaders = {};
-                        redirectProviderUrl = "".concat(eventManagerUrl, "/http/").concat(providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
+                        emUrl = eventManager.serviceUrl;
+                        redirectProviderUrl = "".concat(emUrl, "/http/").concat(eventManager.providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
                         authConfigs = __assign(__assign({}, additionalBodyData), { grant_type: 'authorization_code', redirect_uri: redirectProviderUrl, appId: appId });
                         if (scope) {
                             formattedScope = (0, formatScope_1.formatScope)(scope, serviceDefinition.scopeType);
@@ -177,11 +146,11 @@ var OAuth = (function () {
                             serviceConfigName: serviceName,
                             name: authName,
                             displayServiceName: serviceDefinition.displayServiceName,
-                            accountId: accountId,
+                            accountId: eventManager.currentAccountId,
                         };
                         authDataExpire = Date.now() + constants_1.TEMPORARY_DATA_EXPIRATION_TIME;
                         return [4, keyValueStorage.setValueByKey('__authorizer_temp-uuid', id, tempAuthData, authDataExpire)];
-                    case 9:
+                    case 4:
                         _b.sent();
                         authUrl = new URL(serviceDefinition.authorizeUri);
                         additionalParams = JSON.parse(serviceDefinition.authRequestAdditionalParams);
@@ -199,12 +168,9 @@ var OAuth = (function () {
                         }
                         authorizeUrl = authUrl.href;
                         newOAuth = new OAuth({
-                            accountId: accountId,
+                            serviceName: serviceName,
                             authKey: authKey,
                             discoveryUrl: discoveryUrl,
-                            eventManagerUrl: eventManagerUrl,
-                            providersAccountId: providersAccountId,
-                            serviceName: serviceName,
                             token: token,
                         });
                         newOAuth.status = constants_1.AuthStatus.PENDING;
@@ -236,17 +202,21 @@ var OAuth = (function () {
     };
     OAuth.prototype.getServiceDefinition = function (currentApp) {
         return __awaiter(this, void 0, void 0, function () {
-            var services, currentServiceData;
+            var serviceDefinitionProviderRoute, services, currentServiceData;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.providers.makeRequest({
-                            method: 'GET',
-                            route: constants_1.SERVICE_PROVIDER_PATH,
-                            params: {
-                                type: 'list',
-                            },
-                        })];
+                    case 0: return [4, this.eventManager.init()];
                     case 1:
+                        _a.sent();
+                        serviceDefinitionProviderRoute = "http/".concat(this.eventManager.providersAccountId).concat(constants_1.SERVICE_PROVIDER_PATH);
+                        return [4, this.eventManager.makeRequest({
+                                method: 'GET',
+                                route: serviceDefinitionProviderRoute,
+                                params: {
+                                    type: 'list',
+                                },
+                            })];
+                    case 2:
                         services = _a.sent();
                         currentServiceData = services[this.serviceName];
                         return [2, new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment)];
@@ -269,7 +239,7 @@ var OAuth = (function () {
                         _a.label = 1;
                     case 1:
                         if (!(spentTime < pollTimeout)) return [3, 4];
-                        return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, encodeURIComponent(this.authKey))];
+                        return [4, this.keyValueStorage.getValueByKey(this.keyValueCollection, this.authKey)];
                     case 2:
                         record = _a.sent();
                         if (record.value) {
@@ -297,14 +267,14 @@ var OAuth = (function () {
     };
     OAuth.prototype.getAuthData = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var value, authData, refreshedAuthData;
+            var value, authData, expired, refreshedAuthData;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.status !== constants_1.AuthStatus.READY) {
                             throw new Error('This authorization is not ready');
                         }
-                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
+                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
                     case 1:
                         value = (_a.sent()).value;
                         if (!value) {
@@ -315,13 +285,14 @@ var OAuth = (function () {
                         if (!authData.expires_in) {
                             return [2, authData];
                         }
-                        if (!(0, isExpired_1.isExpired)(authData.created_at, authData.expires_in)) {
+                        expired = (0, isExpired_1.isExpired)(authData.created_at, authData.expires_in);
+                        if (!expired) {
                             return [2, authData];
                         }
                         return [4, this.refresh()];
                     case 2:
                         _a.sent();
-                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
+                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
                     case 3:
                         refreshedAuthData = (_a.sent()).value;
                         return [2, refreshedAuthData];
@@ -334,7 +305,7 @@ var OAuth = (function () {
             var value, authData, appId, currentApp, serviceDefinition;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
+                    case 0: return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
                     case 1:
                         value = (_a.sent()).value;
                         if (!value) {
@@ -353,9 +324,9 @@ var OAuth = (function () {
                         return [4, this.getServiceDefinition(currentApp)];
                     case 3:
                         serviceDefinition = _a.sent();
-                        return [4, this.providers.makeRequest({
+                        return [4, this.eventManager.makeRequest({
                                 method: 'POST',
-                                route: constants_1.OAUTH_REDIRECT_PROVIDER_PATH,
+                                route: new URL(authData.redirect_uri).pathname,
                                 data: {
                                     refreshTokenUrl: authData.refreshUri,
                                     sendDataType: serviceDefinition.requestDataType,
@@ -380,7 +351,7 @@ var OAuth = (function () {
                         if (this.status !== constants_1.AuthStatus.READY) {
                             throw new Error('This authorization is not ready');
                         }
-                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey))];
+                        return [4, this.keyValueStorage.getValueByKey(this.serviceName, this.authKey)];
                     case 1:
                         value = (_a.sent()).value;
                         if (!value) {
@@ -405,7 +376,7 @@ var OAuth = (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey))];
+                    case 0: return [4, this.keyValueStorage.deleteKey(this.serviceName, this.authKey)];
                     case 1:
                         _a.sent();
                         this.status = constants_1.AuthStatus.DELETED;