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

package/src/OAuth/OAuth.ts

@@ -1,7 +1,5 @@
 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';
@@ -35,26 +33,11 @@ export class OAuth {
   private readonly serviceName: string;
   private readonly keyValueCollection: string;
   private readonly keyValueStorage: KeyValueStorage;
-  private readonly providers: Providers;
+  private readonly eventManager: EventManager;
 
   constructor(params: OAuthConfig) {
-    const {
-      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;
@@ -65,18 +48,17 @@ export class OAuth {
       discoveryUrl,
     });
 
-    this.providers = new Providers({
+    this.eventManager = new EventManager({
       token,
       discoveryUrl,
-      eventManagerUrl,
-      providersAccountId,
+      requestAccountId: true,
+      requestProvidersAccountId: true,
     });
   }
 
   /**
    * Creates a new auth record in specified collection with the given config.
-   * @returns Object with OAuth instance connected to created auth and authorizerUrl
-   *            to redirect the user to for completing authorization
+   * @returns Object with OAuth instance connected to created auth and authorizerUrl to redirect the user to for completing authorization
    *
    * ```typescript
    *  const {
@@ -88,12 +70,10 @@ export class OAuth {
    *   serviceName: '__authorization_service_test_service',
    *   authName: 'my-auth-name',
    *   appId: 'my-app-id',
-   *   keyValueCollection: 'custom_collection_name' // Pass this if you using custom name for key-value collection
-   *                                                // that differs from serviceName
+   *   keyValueCollection: 'custom_collection_name' // Pass this if you using custom name for key-value collection that differs from serviceName
    * });
    *
-   * // if you want to use returned instance, you must call a method that returns a promise
-   * // that will be resolved when the user completes authorization process
+   * // if you want to use returned instance, you must call a method that returns a promise that will be resolved when the user completes authorization process
    * // if not, you can omit this step
    * try {
    *   await instance.waitForCompletion()
@@ -105,58 +85,19 @@ export class OAuth {
   static async create(
     params: CreateOAuthConfig
   ): Promise<CreateOAuthResult> {
-
-    if (!(
-      params.serviceName &&
-      params.authName &&
-      params.token &&
-      params.appId
-    ) || !(
-      params.discoveryUrl ||
-        (
-          params.accountId &&
-          params.providersAccountId &&
-          params.eventManagerUrl
-        )
-    )) {
-      throw new Error('Invalid OAuth config passed');
+    if (
+      !(
+        params.serviceName &&
+        params.authName &&
+        params.discoveryUrl &&
+        params.token &&
+        params.appId
+      )
+    ) {
+      throw new Error('Invalid config passed');
     }
 
-    const {
-      appId,
-      authName,
-      discoveryUrl,
-      scope,
-      serviceName,
-      token,
-    } = params;
-
-    let {
-      accountId,
-      eventManagerUrl,
-      providersAccountId,
-    } = params;
-
-
-    // If AccountID, EventManagerURL or Providers Account ID are not available, fetch them from Discovery
-    if (discoveryUrl && !(accountId && eventManagerUrl && providersAccountId)) {
-      const discovery = new Discovery({
-        token,
-        discoveryUrl,
-      });
-
-      if (!accountId) {
-        accountId = await discovery.getCurrentAccountId();
-      }
-
-      if (!eventManagerUrl) {
-        eventManagerUrl = await discovery.getServiceUrl(EVENT_MANAGER_SERVICE_KEY);
-      }
-
-      if (!providersAccountId) {
-        providersAccountId = await discovery.getProvidersAccountId();
-      }
-    }
+    const { serviceName, authName, discoveryUrl, token, appId, scope } = params;
 
     const keyValueCollection = params.keyValueCollection || serviceName;
 
@@ -165,24 +106,27 @@ export class OAuth {
       discoveryUrl,
     });
 
-    const providers = new Providers({
+    const eventManager = new EventManager({
       token,
       discoveryUrl,
-      eventManagerUrl,
-      providersAccountId,
+      requestAccountId: true,
+      requestProvidersAccountId: true,
     });
 
-    const services = await providers.makeRequest<{
+    await eventManager.init();
+
+    const serviceDefinitionProviderRoute = `http/${eventManager.providersAccountId}${SERVICE_PROVIDER_PATH}`;
+
+    const services = await eventManager.makeRequest<{
       [key: string]: ServiceDefinitionConfig;
     }>({
       method: 'GET',
-      route: SERVICE_PROVIDER_PATH,
+      route: serviceDefinitionProviderRoute,
       params: {
         type: 'list',
       },
     });
 
-
     const currentServiceData = services[serviceName];
 
     const apps = await keyValueStorage.getValueByKey(
@@ -190,7 +134,6 @@ export class OAuth {
       '__authorizer_apps'
     );
 
-    // eslint-disable-next-line
     const currentApp: OAuthApp = (apps.value as any).find(
       (app: { label: string; value: OAuthApp; }) => app.value.appId === appId
     ).value;
@@ -202,14 +145,14 @@ export class OAuth {
     );
 
     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}`;
 
-    // eslint-disable-next-line
     const authConfigs: any = {
       ...additionalBodyData,
       grant_type: 'authorization_code',
@@ -238,7 +181,7 @@ export class OAuth {
       serviceConfigName: serviceName,
       name: authName,
       displayServiceName: serviceDefinition.displayServiceName,
-      accountId: accountId,
+      accountId: eventManager.currentAccountId,
     };
 
     const authDataExpire = Date.now() + TEMPORARY_DATA_EXPIRATION_TIME;
@@ -270,11 +213,9 @@ export class OAuth {
     const authorizeUrl = authUrl.href;
 
     const newOAuth = new OAuth({
+      serviceName,
       authKey,
       discoveryUrl,
-      eventManagerUrl,
-      providersAccountId,
-      serviceName,
       token,
     });
 
@@ -310,12 +251,15 @@ export class OAuth {
   }
 
   private async getServiceDefinition(currentApp: OAuthApp): Promise<ServiceDefinition> {
+    await this.eventManager.init();
+
+    const serviceDefinitionProviderRoute = `http/${this.eventManager.providersAccountId}${SERVICE_PROVIDER_PATH}`;
 
-    const services = await this.providers.makeRequest<{
+    const services = await this.eventManager.makeRequest<{
       [key: string]: ServiceDefinitionConfig;
     }>({
       method: 'GET',
-      route: SERVICE_PROVIDER_PATH,
+      route: serviceDefinitionProviderRoute,
       params: {
         type: 'list',
       },
@@ -355,7 +299,7 @@ export class OAuth {
       while (spentTime < pollTimeout) {
         const record = await this.keyValueStorage.getValueByKey(
           this.keyValueCollection,
-          encodeURIComponent(this.authKey)
+          this.authKey
         );
 
         if (record.value) {
@@ -393,7 +337,7 @@ export class OAuth {
 
     const { value } = await this.keyValueStorage.getValueByKey(
       this.serviceName,
-      encodeURIComponent(this.authKey)
+      this.authKey
     );
 
     if (!value) {
@@ -407,14 +351,16 @@ export class OAuth {
       return authData;
     }
 
-    if (!isExpired(authData.created_at, authData.expires_in)) {
+    const expired = isExpired(authData.created_at, authData.expires_in);
+
+    if (!expired) {
       return authData;
     }
 
     await this.refresh();
 
     const { value: refreshedAuthData } =
-      await this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
+      await this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
 
     return refreshedAuthData as OAuthData;
   }
@@ -425,7 +371,7 @@ export class OAuth {
   public async refresh(): Promise<void> {
     const { value } = await this.keyValueStorage.getValueByKey(
       this.serviceName,
-      encodeURIComponent(this.authKey)
+      this.authKey
     );
 
     if (!value) {
@@ -446,9 +392,9 @@ export class OAuth {
 
     const serviceDefinition = await this.getServiceDefinition(currentApp);
 
-    await this.providers.makeRequest({
+    await this.eventManager.makeRequest({
       method: 'POST',
-      route: OAUTH_REDIRECT_PROVIDER_PATH,
+      route: new URL(authData.redirect_uri).pathname,
       data: {
         refreshTokenUrl: authData.refreshUri,
         sendDataType: serviceDefinition.requestDataType,
@@ -473,7 +419,7 @@ export class OAuth {
 
     const { value } = await this.keyValueStorage.getValueByKey(
       this.serviceName,
-      encodeURIComponent(this.authKey)
+      this.authKey
     );
 
     if (!value) {
@@ -505,7 +451,7 @@ export class OAuth {
   public async delete(): Promise<void> {
     await this.keyValueStorage.deleteKey(
       this.serviceName,
-      encodeURIComponent(this.authKey)
+      this.authKey
     );
 
     this.status = AuthStatus.DELETED;

package/src/OAuth/OAuthCollection.ts

@@ -1,4 +1,4 @@
-import { Token, List, makeList } from '@or-sdk/base';
+import { Token } from '@or-sdk/base';
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
 import { OAuth } from './OAuth';
 
@@ -27,25 +27,25 @@ export class OAuthCollection {
   /**
    * Returns array of auth keys from this collection
    */
-  public async listAuthorizations(): Promise<List<string>> {
+  public async listAuthorizations(): Promise<string[]> {
     const { items: records } = await this.keyValueStorage.listKeys(
       this.keyValueCollection
     );
 
-    return makeList<string>(records.map((record) => record.key).filter(key => key.includes('::oauth')));
+    return records.map((record) => record.key);
   }
 
   /**
    * Returns array of OAuth applications for this service
    */
-  public async listOAuthApps(): Promise<List<OAuthApp>> {
+  public async listOAuthApps(): Promise<OAuthApp[]> {
     const appsStorageRecord = await this.keyValueStorage.getValueByKey(
       this.keyValueCollection,
       '__authorizer_apps'
     );
 
     if (!appsStorageRecord.value) {
-      return makeList<OAuthApp>([]);
+      return [];
     }
 
     const appsRecords = appsStorageRecord.value as Array<{
@@ -53,20 +53,19 @@ export class OAuthCollection {
       value: Omit<OAuthApp, 'name'>;
     }>;
 
-    return makeList<OAuthApp>(appsRecords.map((record) => ({
+    return appsRecords.map((record) => ({
       name: record.label,
       ...record.value,
-    })));
+    }));
   }
 
   /**
    * Returns OAuth instance for given key
    */
   public async getAuthorization(key: string): Promise<OAuth> {
-    if (!key.includes('::oauth')) throw new Error('The OAuth authorization key should contain "oauth" type specifier.');
     const record = await this.keyValueStorage.getValueByKey(
       this.keyValueCollection,
-      encodeURIComponent(key)
+      key
     );
     if (!record.value) {
       throw new Error('This authorization does not exist');

package/src/OAuth/types.ts

@@ -10,8 +10,6 @@ export type OAuthConfig = {
   serviceName: string;
   keyValueCollection?: string;
   authKey: string;
-  eventManagerUrl?: string;
-  providersAccountId?: string;
 };
 
 export type OAuthData = {
@@ -31,8 +29,7 @@ export type OAuthData = {
 
 export type CreateOAuthConfig = {
   /**
-   * Name of OAuth service definition.
-   * If service definition is not found in global library, it will be taken from local library
+   * Name of OAuth service definition. If service definition is not found in global library, it will be taken from local library
    */
   serviceName: string;
 
@@ -58,31 +55,10 @@ export type CreateOAuthConfig = {
    */
   token: Token;
 
-  /*
-   * URL of Discovery API
-   */
   discoveryUrl: string;
-
-  /*
-   * URL of Event manager API
-   */
-  eventManagerUrl?: string;
-
-  /*
-   * Account ID of current account
-   */
-  accountId?: string;
-
-  /*
-   * Account ID of provider account
-   */
-  providersAccountId?: string;
 };
 
-export type CreateOAuthInCollectionConfig = Omit<CreateOAuthConfig, 'discoveryUrl' |
-'serviceName' |
-'token' |
-'keyValueCollection'>;
+export type CreateOAuthInCollectionConfig = Omit<CreateOAuthConfig, 'discoveryUrl' | 'serviceName' | 'token' | 'keyValueCollection'>;
 
 export type CreateOAuthResult = {
   authorizeUrl: string;
@@ -140,7 +116,6 @@ export type ServiceDefinitionConfig = {
   scopeType: ScopeType;
   authRequestAdditionalParams: string;
   codeExchangeRequestAdditionalParams: string;
-  // eslint-disable-next-line
   environments?: Record<string, any>;
   authLinkAdditionalParams?: Record<string, string>[];
   displayServiceName?: string;

package/src/Token/TokenAuth.ts

@@ -89,7 +89,7 @@ export class TokenAuth {
    * Returns authorization data
    */
   public async getAuthData(): Promise<TokenAuthData> {
-    const { value } = await this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(this.authKey));
+    const { value } = await this.keyValueStorage.getValueByKey(this.serviceName, this.authKey);
     return value as TokenAuthData;
   }
 
@@ -97,6 +97,6 @@ export class TokenAuth {
    * Deletes authorization from collection
    */
   public async delete(): Promise<void> {
-    await this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(this.authKey));
+    await this.keyValueStorage.deleteKey(this.serviceName, this.authKey);
   }
 }

package/src/Token/TokenCollection.ts

@@ -1,4 +1,4 @@
-import { Token, makeList, List } from '@or-sdk/base';
+import { Token } from '@or-sdk/base';
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
 import { TokenAuth } from './TokenAuth';
 
@@ -28,18 +28,17 @@ export class TokenCollection {
   /**
    * Returns array of auth keys from this collection
    */
-  public async listAuthorizations(): Promise<List<string>> {
+  public async listAuthorizations(): Promise<string[]> {
     const { items: records } = await this.keyValueStorage.listKeys(this.serviceName);
 
-    return makeList<string>(records.map((record) => record.key).filter(key => key.includes('::token')));
+    return records.map((record) => record.key);
   }
 
   /**
    * Returns TokenAuth instance for given key
    */
   public async getAuthorization(key: string): Promise<TokenAuth> {
-    if (!key.includes('::token')) throw new Error('The Token authorization key should contain "token" type specifier.');
-    const record = await this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key));
+    const record = await this.keyValueStorage.getValueByKey(this.serviceName, key);
     if (!record.value) {
       throw new Error('Authorization does not exist');
     }