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

package/dist/esm/Basic/BasicCollection.js

@@ -7,111 +7,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { makeList } from '@or-sdk/base';
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
-import { createAuthKey } from './utils/createAuthKey';
-import { v4 as uuidv4 } from 'uuid';
+import { BasicAuth } from './BasicAuth';
 export class BasicCollection {
     constructor(params) {
-        const { token, discoveryUrl, serviceName, accountId } = params;
-        this.serviceName = serviceName || '';
+        const { token, discoveryUrl, serviceName } = params;
+        this.localToken = token;
+        this.localDiscoveryUrl = discoveryUrl;
+        this.serviceName = serviceName;
         this.keyValueStorage = new KeyValueStorage({
             token,
             discoveryUrl,
-            accountId,
         });
     }
-    init(serviceName) {
-        if (!serviceName)
-            throw new Error('Service name is required.');
-        this.serviceName = serviceName;
-    }
-    static encodeAccessToken(username, password) {
-        return btoa(`${username}:${password}`);
-    }
-    static decodeAccessToken(token) {
-        const [username, password] = atob(token).split(':');
-        return {
-            username,
-            password,
-        };
-    }
     listAuthorizations() {
         return __awaiter(this, void 0, void 0, function* () {
             const { items: records } = yield this.keyValueStorage.listKeys(this.serviceName);
-            return makeList(records.map((record) => record.key).filter(key => key.includes('::basic')));
+            return records.map((record) => record.key);
         });
     }
     getAuthorization(key) {
         return __awaiter(this, void 0, void 0, function* () {
-            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.');
-            const record = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key));
+            const record = yield this.keyValueStorage.getValueByKey(this.serviceName, key);
             if (!record.value) {
-                throw new Error('Authorization does not exist.');
+                throw new Error('Authorization does not exist');
             }
-            const authRecord = record.value;
-            if (!authRecord.auth_name || !authRecord.access_token || !authRecord.date_created) {
-                throw new Error('Authorization does not exist or invalid.');
-            }
-            return {
-                auth_name: authRecord.auth_name,
-                access_token: authRecord.access_token,
-                date_created: authRecord.date_created,
-                key,
-            };
+            return new BasicAuth({
+                serviceName: this.serviceName,
+                authKey: key,
+                discoveryUrl: this.localDiscoveryUrl,
+                token: this.localToken,
+            });
         });
     }
     createAuthorization(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { authName, password, username } = params;
-            if (!authName || !username || !password) {
-                throw new Error('Invalid authorization config passed.');
-            }
-            if (!this.serviceName)
-                throw new Error('Service name is not defined.');
-            const id = uuidv4();
-            const authKey = createAuthKey(id, authName);
-            const authData = {
-                auth_name: authName,
-                access_token: BasicCollection.encodeAccessToken(username, password),
-                date_created: new Date().toISOString(),
-            };
-            yield this.keyValueStorage.setValueByKey(this.serviceName, encodeURIComponent(authKey), authData);
-            return Object.assign(Object.assign({}, authData), { key: authKey });
-        });
-    }
-    updateAuthorization(basicAuth, newCredentials) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!basicAuth || !basicAuth.key || !basicAuth.access_token) {
-                throw new Error('Authorization is invalid.');
-            }
-            if (!this.serviceName)
-                throw new Error('Service name is not defined.');
-            let { username, password } = BasicCollection.decodeAccessToken(basicAuth.access_token);
-            if (newCredentials.username) {
-                username = newCredentials.username;
-            }
-            if (newCredentials.password) {
-                password = newCredentials.password;
-            }
-            const access_token = BasicCollection.encodeAccessToken(username, password);
-            const response = yield this.keyValueStorage.setValueByKey(this.serviceName, encodeURIComponent(basicAuth.key), {
-                auth_name: basicAuth.auth_name,
-                date_created: basicAuth.date_created,
-                access_token,
+            return yield BasicAuth.create({
+                discoveryUrl: this.localDiscoveryUrl,
+                token: this.localToken,
+                serviceName: this.serviceName,
+                authName: params.authName,
+                password: params.password,
+                username: params.username,
             });
-            const updatedData = response.value;
-            return Object.assign(Object.assign({}, updatedData), { key: basicAuth.key });
-        });
-    }
-    deleteAuthorization(authKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.serviceName)
-                throw new Error('Service name is not defined.');
-            yield this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(authKey));
         });
     }
 }

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

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

package/dist/esm/OAuth/OAuth.js

@@ -8,9 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
-import { Providers } from '@or-sdk/providers';
-import { EVENT_MANAGER_SERVICE_KEY } from '@or-sdk/event-manager';
-import { Discovery } from '@or-sdk/discovery';
+import { EventManager } from '@or-sdk/event-manager';
 import { timeout } from '@or-sdk/base';
 import { v4 as uuidv4 } from 'uuid';
 import { SERVICE_PROVIDER_PATH, OAUTH_REDIRECT_PROVIDER_PATH, PREDEFINED_APP, TEMPORARY_DATA_EXPIRATION_TIME, AuthStatus, } from '../constants';
@@ -21,71 +19,47 @@ import { createAuthKey } from './utils/createAuthKey';
 export class OAuth {
     constructor(params) {
         this.status = AuthStatus.READY;
-        const { accountId, authKey, discoveryUrl, eventManagerUrl, keyValueCollection, providersAccountId, serviceName, token, } = params;
-        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');
-        }
+        const { token, discoveryUrl, authKey, serviceName, keyValueCollection } = params;
         this.authKey = authKey;
         this.serviceName = serviceName;
         this.keyValueCollection = keyValueCollection || serviceName;
         this.keyValueStorage = new KeyValueStorage({
             token,
             discoveryUrl,
-            accountId,
         });
-        this.providers = new Providers({
+        this.eventManager = new EventManager({
             token,
             discoveryUrl,
-            eventManagerUrl,
-            providersAccountId,
+            requestAccountId: true,
+            requestProvidersAccountId: true,
         });
     }
     static create(params) {
         return __awaiter(this, void 0, void 0, function* () {
             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');
-            }
-            const { appId, authName, discoveryUrl, scope, serviceName, token, } = params;
-            let { accountId, eventManagerUrl, providersAccountId, } = params;
-            if (discoveryUrl && !(accountId && eventManagerUrl && providersAccountId)) {
-                const discovery = new Discovery({
-                    token,
-                    discoveryUrl,
-                });
-                if (!accountId) {
-                    accountId = yield discovery.getCurrentAccountId();
-                }
-                if (!eventManagerUrl) {
-                    eventManagerUrl = yield discovery.getServiceUrl(EVENT_MANAGER_SERVICE_KEY);
-                }
-                if (!providersAccountId) {
-                    providersAccountId = yield discovery.getProvidersAccountId();
-                }
+                params.appId)) {
+                throw new Error('Invalid config passed');
             }
+            const { serviceName, authName, discoveryUrl, token, appId, scope } = params;
             const keyValueCollection = params.keyValueCollection || serviceName;
             const keyValueStorage = new KeyValueStorage({
                 token,
                 discoveryUrl,
-                accountId,
             });
-            const providers = new Providers({
+            const eventManager = new EventManager({
                 token,
                 discoveryUrl,
-                eventManagerUrl,
-                providersAccountId,
+                requestAccountId: true,
+                requestProvidersAccountId: true,
             });
-            const services = yield providers.makeRequest({
+            yield eventManager.init();
+            const serviceDefinitionProviderRoute = `http/${eventManager.providersAccountId}${SERVICE_PROVIDER_PATH}`;
+            const services = yield eventManager.makeRequest({
                 method: 'GET',
-                route: SERVICE_PROVIDER_PATH,
+                route: serviceDefinitionProviderRoute,
                 params: {
                     type: 'list',
                 },
@@ -95,10 +69,11 @@ export class OAuth {
             const currentApp = apps.value.find((app) => app.value.appId === appId).value;
             const serviceDefinition = new ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment);
             const id = uuidv4();
-            const authKey = createAuthKey(id, authName, keyValueCollection, accountId || null);
+            const authKey = createAuthKey(id, authName, keyValueCollection, eventManager.currentAccountId);
             const additionalBodyData = {};
             const additionalHeaders = {};
-            const redirectProviderUrl = `${eventManagerUrl}/http/${providersAccountId}${OAUTH_REDIRECT_PROVIDER_PATH}`;
+            const emUrl = eventManager.serviceUrl;
+            const redirectProviderUrl = `${emUrl}/http/${eventManager.providersAccountId}${OAUTH_REDIRECT_PROVIDER_PATH}`;
             const authConfigs = Object.assign(Object.assign({}, additionalBodyData), { grant_type: 'authorization_code', redirect_uri: redirectProviderUrl, appId });
             if (scope) {
                 const formattedScope = formatScope(scope, serviceDefinition.scopeType);
@@ -119,7 +94,7 @@ export class OAuth {
                 serviceConfigName: serviceName,
                 name: authName,
                 displayServiceName: serviceDefinition.displayServiceName,
-                accountId: accountId,
+                accountId: eventManager.currentAccountId,
             };
             const authDataExpire = Date.now() + TEMPORARY_DATA_EXPIRATION_TIME;
             yield keyValueStorage.setValueByKey('__authorizer_temp-uuid', id, tempAuthData, authDataExpire);
@@ -138,12 +113,9 @@ export class OAuth {
             }
             const authorizeUrl = authUrl.href;
             const newOAuth = new OAuth({
-                accountId,
+                serviceName,
                 authKey,
                 discoveryUrl,
-                eventManagerUrl,
-                providersAccountId,
-                serviceName,
                 token,
             });
             newOAuth.status = AuthStatus.PENDING;
@@ -166,9 +138,11 @@ export class OAuth {
     }
     getServiceDefinition(currentApp) {
         return __awaiter(this, void 0, void 0, function* () {
-            const services = yield this.providers.makeRequest({
+            yield this.eventManager.init();
+            const serviceDefinitionProviderRoute = `http/${this.eventManager.providersAccountId}${SERVICE_PROVIDER_PATH}`;
+            const services = yield this.eventManager.makeRequest({
                 method: 'GET',
-                route: SERVICE_PROVIDER_PATH,
+                route: serviceDefinitionProviderRoute,
                 params: {
                     type: 'list',
                 },
@@ -186,7 +160,7 @@ export class OAuth {
                 let spentTime = 0;
                 let isFinished = false;
                 while (spentTime < pollTimeout) {
-                    const record = yield this.keyValueStorage.getValueByKey(this.keyValueCollection, encodeURIComponent(this.authKey));
+                    const record = yield this.keyValueStorage.getValueByKey(this.keyValueCollection, this.authKey);
                     if (record.value) {
                         isFinished = true;
                         break;
@@ -208,7 +182,7 @@ export class OAuth {
             if (this.status !== AuthStatus.READY) {
                 throw new Error('This authorization is not ready');
             }
-            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
+            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
             if (!value) {
                 this.status = AuthStatus.ERROR;
                 throw new Error('Authorization record does not exist');
@@ -217,17 +191,18 @@ export class OAuth {
             if (!authData.expires_in) {
                 return authData;
             }
-            if (!isExpired(authData.created_at, authData.expires_in)) {
+            const expired = isExpired(authData.created_at, authData.expires_in);
+            if (!expired) {
                 return authData;
             }
             yield this.refresh();
-            const { value: refreshedAuthData } = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
+            const { value: refreshedAuthData } = yield this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
             return refreshedAuthData;
         });
     }
     refresh() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
+            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
             if (!value) {
                 this.status = AuthStatus.ERROR;
                 throw new Error('Authorization record does not exist');
@@ -240,9 +215,9 @@ export class OAuth {
                 throw new Error('The application used for this authorization does not exist');
             }
             const serviceDefinition = yield this.getServiceDefinition(currentApp);
-            yield this.providers.makeRequest({
+            yield this.eventManager.makeRequest({
                 method: 'POST',
-                route: OAUTH_REDIRECT_PROVIDER_PATH,
+                route: new URL(authData.redirect_uri).pathname,
                 data: {
                     refreshTokenUrl: authData.refreshUri,
                     sendDataType: serviceDefinition.requestDataType,
@@ -258,7 +233,7 @@ export class OAuth {
             if (this.status !== AuthStatus.READY) {
                 throw new Error('This authorization is not ready');
             }
-            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
+            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
             if (!value) {
                 this.status = AuthStatus.ERROR;
                 throw new Error('Authorization record does not exist');
@@ -275,7 +250,7 @@ export class OAuth {
     }
     delete() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey));
+            yield this.keyValueStorage.deleteKey(this.serviceName, this.authKey);
             this.status = AuthStatus.DELETED;
         });
     }

package/dist/esm/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/esm/OAuth/OAuthCollection.js

@@ -7,52 +7,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { makeList } from '@or-sdk/base';
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
 import { OAuth } from './OAuth';
 export class OAuthCollection {
     constructor(params) {
-        const { token, discoveryUrl, accountId, serviceName, keyValueCollection } = params;
+        const { token, discoveryUrl, serviceName, keyValueCollection } = params;
         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 KeyValueStorage({
-            token: this.localToken,
-            discoveryUrl: this.localDiscoveryUrl,
-            accountId: this.localAccountId,
+            token,
+            discoveryUrl,
         });
     }
-    init(params) {
-        const { serviceName, keyValueCollection } = params;
-        this.serviceName = serviceName || this.serviceName;
-        this.keyValueCollection = keyValueCollection || this.keyValueCollection || this.serviceName;
-        if (!this.serviceName) {
-            throw new Error('Service Name is required.');
-        }
-    }
     listAuthorizations() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { items: records } = yield this.keyValueStorage.listKeys(this.keyValueCollection || '');
-            return makeList(records.map((record) => record.key).filter(key => key.includes('::oauth')));
+            const { items: records } = yield this.keyValueStorage.listKeys(this.keyValueCollection);
+            return records.map((record) => record.key);
         });
     }
     listOAuthApps() {
         return __awaiter(this, void 0, void 0, function* () {
             const appsStorageRecord = yield this.keyValueStorage.getValueByKey(this.keyValueCollection, '__authorizer_apps');
             if (!appsStorageRecord.value) {
-                return makeList([]);
+                return [];
             }
             const appsRecords = appsStorageRecord.value;
-            return makeList(appsRecords.map((record) => (Object.assign({ name: record.label }, record.value))));
+            return appsRecords.map((record) => (Object.assign({ name: record.label }, record.value)));
         });
     }
     getAuthorization(key) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!key.includes('::oauth'))
-                throw new Error('The OAuth authorization key should contain "oauth" type specifier.');
-            const record = yield this.keyValueStorage.getValueByKey(this.keyValueCollection, encodeURIComponent(key));
+            const record = yield this.keyValueStorage.getValueByKey(this.keyValueCollection, key);
             if (!record.value) {
                 throw new Error('This authorization does not exist');
             }
@@ -70,7 +57,6 @@ export class OAuthCollection {
             return yield OAuth.create({
                 discoveryUrl: this.localDiscoveryUrl,
                 token: this.localToken,
-                accountId: this.localAccountId,
                 appId: params.appId,
                 keyValueCollection: this.keyValueCollection,
                 scope: params.scope,

package/dist/esm/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":";;;;;;;;;AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAIhC,MAAM,OAAO,eAAe;IAO1B,YAAY,MAA6B;QACvC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;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,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,CAC5D,IAAI,CAAC,kBAAkB,CACxB,CAAC;YAEF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,CAAC;KAAA;IAKY,aAAa;;YACxB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAChE,IAAI,CAAC,kBAAkB,EACvB,mBAAmB,CACpB,CAAC;YAEF,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE;gBAC5B,OAAO,EAAE,CAAC;aACX;YAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAGpC,CAAC;YAEH,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBACjC,IAAI,EAAE,MAAM,CAAC,KAAK,IACf,MAAM,CAAC,KAAK,EACf,CAAC,CAAC;QACN,CAAC;KAAA;IAKY,gBAAgB,CAAC,GAAW;;YACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACrD,IAAI,CAAC,kBAAkB,EACvB,GAAG,CACJ,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;aACtD;YAED,OAAO,IAAI,KAAK,CAAC;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,OAAO,EAAE,GAAG;gBACZ,YAAY,EAAE,IAAI,CAAC,iBAAiB;gBACpC,KAAK,EAAE,IAAI,CAAC,UAAU;aACvB,CAAC,CAAC;QACL,CAAC;KAAA;IAwBY,mBAAmB,CAC9B,MAAqC;;YAErC,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC;gBACxB,YAAY,EAAE,IAAI,CAAC,iBAAiB;gBACpC,KAAK,EAAE,IAAI,CAAC,UAAU;gBACtB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;QACL,CAAC;KAAA;CACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/OAuth/types.ts"],"names":[],"mappings":"AAwJA,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,gDAAmC,CAAA;IACnC,gDAAmC,CAAA;IACnC,sFAAyE,CAAA;IACzE,sCAAyB,CAAA;AAC3B,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/OAuth/types.ts"],"names":[],"mappings":"AA2HA,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,gDAAmC,CAAA;IACnC,gDAAmC,CAAA;IACnC,sFAAyE,CAAA;IACzE,sCAAyB,CAAA;AAC3B,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB"}

package/dist/esm/Token/TokenAuth.js

@@ -0,0 +1,66 @@
+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());
+    });
+};
+import { KeyValueStorage } from '@or-sdk/key-value-storage';
+import { v4 as uuidv4 } from 'uuid';
+import { createAuthKey } from './utils/createAuthKey';
+export class TokenAuth {
+    constructor(params) {
+        const { token, discoveryUrl, authKey, serviceName } = params;
+        this.authKey = authKey;
+        this.serviceName = serviceName;
+        this.keyValueStorage = new KeyValueStorage({
+            token,
+            discoveryUrl,
+        });
+    }
+    static create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(params.serviceName && params.authName && params.credentials && params.discoveryUrl && params.token)) {
+                throw new Error('Invalid config passed');
+            }
+            const { serviceName, authName, credentials, discoveryUrl, token } = params;
+            const keyValueStorage = new KeyValueStorage({
+                token,
+                discoveryUrl,
+            });
+            const id = uuidv4();
+            const authKey = createAuthKey(id, authName);
+            const authData = Object.assign(Object.assign({}, credentials), { auth_name: authName, date_created: new Date().toISOString() });
+            yield keyValueStorage.setValueByKey(serviceName, authKey, authData);
+            return new TokenAuth({
+                serviceName,
+                authKey,
+                discoveryUrl,
+                token,
+            });
+        });
+    }
+    update(newCredentials) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this.getAuthData();
+            const updatedData = Object.assign(Object.assign({}, data), newCredentials);
+            const response = yield this.keyValueStorage.setValueByKey(this.serviceName, this.authKey, updatedData);
+            const updatedRecord = response.value;
+            return updatedRecord;
+        });
+    }
+    getAuthData() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { value } = yield this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
+            return value;
+        });
+    }
+    delete() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.keyValueStorage.deleteKey(this.serviceName, this.authKey);
+        });
+    }
+}
+//# sourceMappingURL=TokenAuth.js.map

package/dist/esm/Token/TokenAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TokenAuth.js","sourceRoot":"","sources":["../../../src/Token/TokenAuth.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,OAAO,SAAS;IAKpB,YAAY,MAAuB;QACjC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAE7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC;YACzC,KAAK;YACL,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAkBD,MAAM,CAAO,MAAM,CAAC,MAA6B;;YAC/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;gBACzG,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;aAC1C;YAED,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YAE3E,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC;gBAC1C,KAAK;gBACL,YAAY;aACb,CAAC,CAAC;YAEH,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAE5C,MAAM,QAAQ,mCACT,WAAW,KACd,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GACvC,CAAC;YAEF,MAAM,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEpE,OAAO,IAAI,SAAS,CAAC;gBACnB,WAAW;gBACX,OAAO;gBACP,YAAY;gBACZ,KAAK;aACN,CAAC,CAAC;QACL,CAAC;KAAA;IAKY,MAAM,CAAC,cAAuC;;YACzD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAEtC,MAAM,WAAW,mCACZ,IAAI,GACJ,cAAc,CAClB,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAEvG,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;YACrC,OAAO,aAA8B,CAAC;QACxC,CAAC;KAAA;IAKY,WAAW;;YACtB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3F,OAAO,KAAsB,CAAC;QAChC,CAAC;KAAA;IAKY,MAAM;;YACjB,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACvE,CAAC;KAAA;CACF"}