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

package/dist/cjs/Basic/BasicCollection.js

@@ -1,4 +1,15 @@
 "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) {
@@ -39,18 +50,33 @@ 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 BasicAuth_1 = require("./BasicAuth");
+var createAuthKey_1 = require("./utils/createAuthKey");
+var uuid_1 = require("uuid");
 var BasicCollection = (function () {
     function BasicCollection(params) {
-        var token = params.token, discoveryUrl = params.discoveryUrl, serviceName = params.serviceName;
-        this.localToken = token;
-        this.localDiscoveryUrl = discoveryUrl;
-        this.serviceName = serviceName;
+        var token = params.token, discoveryUrl = params.discoveryUrl, serviceName = params.serviceName, accountId = params.accountId;
+        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;
@@ -66,41 +92,104 @@ var BasicCollection = (function () {
     };
     BasicCollection.prototype.getAuthorization = function (key) {
         return __awaiter(this, void 0, void 0, function () {
-            var record;
+            var record, authRecord;
             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 Token authorization key should contain "basic" type specifier.');
+                            throw new Error('The basic authorization key should contain "basic" type specifier.');
                         return [4, this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key))];
                     case 1:
                         record = _a.sent();
                         if (!record.value) {
-                            throw new Error('Authorization does not exist');
+                            throw new Error('Authorization does not exist.');
                         }
-                        return [2, new BasicAuth_1.BasicAuth({
-                                serviceName: this.serviceName,
-                                authKey: key,
-                                discoveryUrl: this.localDiscoveryUrl,
-                                token: this.localToken,
-                            })];
+                        authRecord = record.value;
+                        if (!authRecord.auth_name || !authRecord.access_token || !authRecord.date_created) {
+                            throw new Error('Authorization does not exist or invalid.');
+                        }
+                        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,
+                            })];
+                    case 1:
+                        response = _b.sent();
+                        updatedData = response.value;
+                        return [2, __assign(__assign({}, updatedData), { key: basicAuth.key })];
+                }
+            });
+        });
+    };
+    BasicCollection.prototype.deleteAuthorization = function (authKey) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    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()];
+                    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];
                 }
             });
         });

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

@@ -1 +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"}
+{"version":3,"file":"BasicCollection.js","sourceRoot":"","sources":["../../../src/Basic/BasicCollection.ts"],"names":[],"mappings":"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"}

package/dist/cjs/Basic/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasicCollection = void 0;
+var BasicCollection_1 = require("./BasicCollection");
+Object.defineProperty(exports, "BasicCollection", { enumerable: true, get: function () { return BasicCollection_1.BasicCollection; } });
+__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Basic/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AAExB,0CAAwB"}

package/dist/cjs/OAuth/OAuth.js

@@ -50,6 +50,8 @@ 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");
@@ -60,7 +62,7 @@ var createAuthKey_1 = require("./utils/createAuthKey");
 var OAuth = (function () {
     function OAuth(params) {
         this.status = constants_1.AuthStatus.READY;
-        var token = params.token, discoveryUrl = params.discoveryUrl, authKey = params.authKey, serviceName = params.serviceName, keyValueCollection = params.keyValueCollection, eventManagerUrl = params.eventManagerUrl, providersAccountId = params.providersAccountId;
+        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.');
         }
@@ -73,6 +75,7 @@ var OAuth = (function () {
         this.keyValueStorage = new key_value_storage_1.KeyValueStorage({
             token: token,
             discoveryUrl: discoveryUrl,
+            accountId: accountId,
         });
         this.providers = new providers_1.Providers({
             token: token,
@@ -83,7 +86,7 @@ var OAuth = (function () {
     }
     OAuth.create = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var appId, authName, discoveryUrl, scope, serviceName, token, accountId, eventManagerUrl, providersAccountId, keyValueCollection, keyValueStorage, providers, services, currentServiceData, apps, currentApp, serviceDefinition, id, authKey, additionalBodyData, additionalHeaders, emUrl, redirectProviderUrl, authConfigs, formattedScope, configs, tempAuthData, authDataExpire, authUrl, additionalParams, formattedScope, authorizeUrl, newOAuth;
+            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 _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -99,10 +102,34 @@ var OAuth = (function () {
                         }
                         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:
                         keyValueCollection = params.keyValueCollection || serviceName;
                         keyValueStorage = new key_value_storage_1.KeyValueStorage({
                             token: token,
                             discoveryUrl: discoveryUrl,
+                            accountId: accountId,
                         });
                         providers = new providers_1.Providers({
                             token: token,
@@ -117,26 +144,11 @@ var OAuth = (function () {
                                     type: 'list',
                                 },
                             })];
-                    case 1:
+                    case 7:
                         services = _b.sent();
-                        if (!(!eventManagerUrl && discoveryUrl)) return [3, 3];
-                        return [4, providers.getServiceUrl()];
-                    case 2:
-                        eventManagerUrl = _b.sent();
-                        _b.label = 3;
-                    case 3:
-                        if (!(!accountId && discoveryUrl)) return [3, 5];
-                        return [4, providers.getCurrentAccountId()];
-                    case 4:
-                        accountId = _b.sent();
-                        _b.label = 5;
-                    case 5:
-                        if (!providersAccountId && discoveryUrl) {
-                            providersAccountId = providers.providersAccountId;
-                        }
                         currentServiceData = services[serviceName];
                         return [4, keyValueStorage.getValueByKey(keyValueCollection, '__authorizer_apps')];
-                    case 6:
+                    case 8:
                         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);
@@ -144,10 +156,7 @@ var OAuth = (function () {
                         authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection, accountId || null);
                         additionalBodyData = {};
                         additionalHeaders = {};
-                        return [4, providers.getServiceUrl()];
-                    case 7:
-                        emUrl = _b.sent();
-                        redirectProviderUrl = "".concat(emUrl, "/http/").concat(providers.providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
+                        redirectProviderUrl = "".concat(eventManagerUrl, "/http/").concat(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);
@@ -172,7 +181,7 @@ var OAuth = (function () {
                         };
                         authDataExpire = Date.now() + constants_1.TEMPORARY_DATA_EXPIRATION_TIME;
                         return [4, keyValueStorage.setValueByKey('__authorizer_temp-uuid', id, tempAuthData, authDataExpire)];
-                    case 8:
+                    case 9:
                         _b.sent();
                         authUrl = new URL(serviceDefinition.authorizeUri);
                         additionalParams = JSON.parse(serviceDefinition.authRequestAdditionalParams);
@@ -190,6 +199,7 @@ var OAuth = (function () {
                         }
                         authorizeUrl = authUrl.href;
                         newOAuth = new OAuth({
+                            accountId: accountId,
                             authKey: authKey,
                             discoveryUrl: discoveryUrl,
                             eventManagerUrl: eventManagerUrl,

package/dist/cjs/OAuth/OAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"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"}

package/dist/cjs/OAuth/OAuthCollection.js

@@ -53,22 +53,32 @@ var key_value_storage_1 = require("@or-sdk/key-value-storage");
 var OAuth_1 = require("./OAuth");
 var OAuthCollection = (function () {
     function OAuthCollection(params) {
-        var token = params.token, discoveryUrl = params.discoveryUrl, serviceName = params.serviceName, keyValueCollection = params.keyValueCollection;
+        var token = params.token, discoveryUrl = params.discoveryUrl, accountId = params.accountId, serviceName = params.serviceName, keyValueCollection = params.keyValueCollection;
         this.localToken = token;
+        this.localAccountId = accountId;
         this.localDiscoveryUrl = discoveryUrl;
-        this.serviceName = serviceName;
-        this.keyValueCollection = keyValueCollection || serviceName;
+        this.serviceName = serviceName || '';
+        this.keyValueCollection = keyValueCollection || serviceName || '';
         this.keyValueStorage = new key_value_storage_1.KeyValueStorage({
-            token: token,
-            discoveryUrl: discoveryUrl,
+            token: this.localToken,
+            discoveryUrl: this.localDiscoveryUrl,
+            accountId: this.localAccountId,
         });
     }
+    OAuthCollection.prototype.init = function (params) {
+        var serviceName = params.serviceName, keyValueCollection = params.keyValueCollection;
+        this.serviceName = serviceName || this.serviceName;
+        this.keyValueCollection = keyValueCollection || this.keyValueCollection || this.serviceName;
+        if (!this.serviceName) {
+            throw new Error('Service Name is required.');
+        }
+    };
     OAuthCollection.prototype.listAuthorizations = function () {
         return __awaiter(this, void 0, void 0, function () {
             var records;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.keyValueStorage.listKeys(this.keyValueCollection)];
+                    case 0: return [4, this.keyValueStorage.listKeys(this.keyValueCollection || '')];
                     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('::oauth'); }))];
@@ -125,6 +135,7 @@ var OAuthCollection = (function () {
                     case 0: return [4, OAuth_1.OAuth.create({
                             discoveryUrl: this.localDiscoveryUrl,
                             token: this.localToken,
+                            accountId: this.localAccountId,
                             appId: params.appId,
                             keyValueCollection: this.keyValueCollection,
                             scope: params.scope,

package/dist/cjs/OAuth/OAuthCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"OAuthCollection.js","sourceRoot":"","sources":["../../../src/OAuth/OAuthCollection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OAuthCollection.js","sourceRoot":"","sources":["../../../src/OAuth/OAuthCollection.ts"],"names":[],"mappings":"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"}

package/dist/cjs/OAuth/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthCollection = exports.OAuth = void 0;
+var OAuth_1 = require("./OAuth");
+Object.defineProperty(exports, "OAuth", { enumerable: true, get: function () { return OAuth_1.OAuth; } });
+var OAuthCollection_1 = require("./OAuthCollection");
+Object.defineProperty(exports, "OAuthCollection", { enumerable: true, get: function () { return OAuthCollection_1.OAuthCollection; } });
+__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

package/dist/cjs/OAuth/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/OAuth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AAExB,0CAAwB"}

package/dist/cjs/OAuth/types.js.map

@@ -1 +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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/OAuth/types.ts"],"names":[],"mappings":";;;AAwJA,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"}