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

package/dist/types/Token/TokenCollection.d.ts

@@ -1,14 +1,14 @@
 import { List } from '@or-sdk/base';
-import { TokenAuth } from './TokenAuth';
-import { TokenCollectionConfig, CreateTokenAuthInCollectionConfig } from './types';
+import { TokenCollectionConfig, CreateTokenAuthInCollectionConfig, TokenAuthData } from './types';
 export declare class TokenCollection {
-    private readonly serviceName;
+    private serviceName;
     private readonly keyValueStorage;
-    private readonly localToken;
-    private readonly localDiscoveryUrl;
     constructor(params: TokenCollectionConfig);
+    init(serviceName: string): void;
     listAuthorizations(): Promise<List<string>>;
-    getAuthorization(key: string): Promise<TokenAuth>;
-    createAuthorization(params: CreateTokenAuthInCollectionConfig): Promise<TokenAuth>;
+    getAuthorization(key: string): Promise<TokenAuthData>;
+    createAuthorization(params: CreateTokenAuthInCollectionConfig): Promise<TokenAuthData>;
+    updateAuthorization(tokenAuth: TokenAuthData, newCredentials: Record<string, unknown>): Promise<TokenAuthData>;
+    deleteAuthorization(key: string): Promise<void>;
 }
 //# sourceMappingURL=TokenCollection.d.ts.map

package/dist/types/Token/TokenCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TokenCollection.d.ts","sourceRoot":"","sources":["../../../src/Token/TokenCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EACL,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAE/B,MAAM,EAAE,qBAAqB;IAe5B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAS3C,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IA4BjD,mBAAmB,CAC9B,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,SAAS,CAAC;CAStB"}
+{"version":3,"file":"TokenCollection.d.ts","sourceRoot":"","sources":["../../../src/Token/TokenCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAE,MAAM,cAAc,CAAC;AAK9C,OAAO,EACL,qBAAqB,EACrB,iCAAiC,EACjC,aAAa,EACd,MAAM,SAAS,CAAC;AAEjB,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;gBAEtC,MAAM,EAAE,qBAAqB;IAelC,IAAI,CAAC,WAAW,EAAE,MAAM;IAUlB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAS3C,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAoCrD,mBAAmB,CAC9B,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,aAAa,CAAC;IA2BZ,mBAAmB,CAC9B,SAAS,EAAE,aAAa,EACxB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACtC,OAAO,CAAC,aAAa,CAAC;IAyBZ,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK7D"}

package/dist/types/Token/index.d.ts

@@ -0,0 +1,3 @@
+export { TokenCollection } from './TokenCollection';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/Token/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Token/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,cAAc,SAAS,CAAC"}

package/dist/types/Token/types.d.ts

@@ -7,6 +7,7 @@ export declare type TokenAuthConfig = {
 };
 export declare type TokenAuthData = {
     auth_name: string;
+    key: string;
     date_created: string;
     [credentialKey: string]: string;
 };
@@ -22,5 +23,6 @@ export declare type TokenCollectionConfig = {
     token: Token;
     discoveryUrl: string;
     serviceName: string;
+    accountId?: string;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/Token/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/Token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,oBAAY,eAAe,GAAG;IAI5B,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAIlB,YAAY,EAAE,MAAM,CAAC;IAKrB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,oBAAY,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IAKjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAKrC,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,oBAAY,iCAAiC,GAAG,IAAI,CAAC,qBAAqB,EAAE,aAAa,GAAG,cAAc,GAAG,OAAO,CAAC,CAAC;AAEtH,oBAAY,qBAAqB,GAAG;IAIlC,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/Token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,oBAAY,eAAe,GAAG;IAI5B,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IAIZ,YAAY,EAAE,MAAM,CAAC;IAKrB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,oBAAY,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IAKjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAKrC,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,oBAAY,iCAAiC,GAAG,IAAI,CAAC,qBAAqB,EAAE,aAAa,GAAG,cAAc,GAAG,OAAO,CAAC,CAAC;AAEtH,oBAAY,qBAAqB,GAAG;IAIlC,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/dist/types/index.d.ts

@@ -1,8 +1,5 @@
-export { BasicAuth } from './Basic/BasicAuth';
-export { BasicCollection } from './Basic/BasicCollection';
-export { TokenAuth } from './Token/TokenAuth';
-export { TokenCollection } from './Token/TokenCollection';
-export { OAuth } from './OAuth/OAuth';
-export { OAuthCollection } from './OAuth/OAuthCollection';
+export { BasicCollection } from './Basic/index';
+export { TokenCollection } from './Token/index';
+export { OAuth, OAuthCollection } from './OAuth/index';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEvD,cAAc,SAAS,CAAC"}

package/package.json

@@ -1,9 +1,40 @@
 {
   "name": "@or-sdk/authorizer",
-  "version": "0.24.14-beta.944.0",
+  "version": "0.24.14-beta.971.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "Basic": [
+        "dist/types/Basic/index.d.ts"
+      ],
+      "OAuth": [
+        "dist/types/OAuth/index.d.ts"
+      ],
+      "Token": [
+        "dist/types/Token/index.d.ts"
+      ]
+    }
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./Basic": {
+      "import": "./dist/esm/Basic/index.js",
+      "require": "./dist/cjs/Basic/index.js"
+    },
+    "./OAuth": {
+      "import": "./dist/esm/OAuth/index.js",
+      "require": "./dist/cjs/OAuth/index.js"
+    },
+    "./Token": {
+      "import": "./dist/esm/Token/index.js",
+      "require": "./dist/cjs/Token/index.js"
+    }
+  },
   "scripts": {
     "build": "pnpm clean && pnpm build:esm && pnpm build:cjs",
     "build:cjs": "tsc --project tsconfig.json",
@@ -21,7 +52,7 @@
     "@or-sdk/discovery": "^1.6.1",
     "@or-sdk/event-manager": "^0.24.8",
     "@or-sdk/key-value-storage": "^0.25.8",
-    "@or-sdk/providers": "^0.2.2-beta.944.0",
+    "@or-sdk/providers": "^0.2.2-beta.971.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

package/src/Basic/BasicCollection.ts

@@ -1,6 +1,8 @@
-import { Token, List, makeList } from '@or-sdk/base';
+import { List, makeList } from '@or-sdk/base';
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
-import { BasicAuth } from './BasicAuth';
+import { BasicAuthData } from './types';
+import { createAuthKey } from './utils/createAuthKey';
+import { v4 as uuidv4 } from 'uuid';
 
 import {
   BasicCollectionConfig,
@@ -8,23 +10,50 @@ import {
 } from './types';
 
 export class BasicCollection {
-  private readonly serviceName: string;
+  private serviceName: string;
   private readonly keyValueStorage: KeyValueStorage;
-  private readonly localToken: Token;
-  private readonly localDiscoveryUrl: string;
 
   constructor(params: BasicCollectionConfig) {
-    const { token, discoveryUrl, serviceName } = params;
+    const { token, discoveryUrl, serviceName, accountId } = params;
 
-    this.localToken = token;
-    this.localDiscoveryUrl = discoveryUrl;
-    this.serviceName = serviceName;
+    this.serviceName = serviceName || '';
     this.keyValueStorage = new KeyValueStorage({
       token,
       discoveryUrl,
+      accountId,
     });
   }
 
+
+  /**
+   * Allows to explicitly (re-)set authorization service name
+   */
+  public init(serviceName: string) {
+    if (!serviceName) throw new Error('Service name is required.');
+
+    this.serviceName = serviceName;
+  }
+
+
+  /**
+   * Encodes username and password into Basic authorization token
+   */
+  static encodeAccessToken(username: string, password: string): string {
+    return btoa(`${username}:${password}`);
+  }
+
+  /**
+   * Decodes base64 encoded token and parses it to username and password
+   */
+  static decodeAccessToken(token: string): {username: string; password: string;} {
+    const [username, password] = atob(token).split(':');
+    return {
+      username,
+      password,
+    };
+  }
+
+
   /**
    * Returns array of auth keys from this collection
    */
@@ -34,30 +63,42 @@ export class BasicCollection {
     return makeList<string>(records.map((record) => record.key).filter(key => key.includes('::basic')));
   }
 
+
   /**
    * Returns BasicAuth instance for given key
    */
-  public async getAuthorization(key: string): Promise<BasicAuth> {
-    if (!key.includes('::basic')) throw new Error('The Token authorization key should contain "basic" type specifier.');
+  public async getAuthorization(key: string): Promise<BasicAuthData> {
+    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 = await this.keyValueStorage.getValueByKey(this.serviceName, encodeURIComponent(key));
+
     if (!record.value) {
-      throw new Error('Authorization does not exist');
+      throw new Error('Authorization does not exist.');
     }
 
-    return new BasicAuth({
-      serviceName: this.serviceName,
-      authKey: key,
-      discoveryUrl: this.localDiscoveryUrl,
-      token: this.localToken,
-    });
+
+    const authRecord = record.value as Omit<BasicAuthData, 'key'>;
+
+    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,
+    } as BasicAuthData;
   }
 
+
   /**
    * Creates a new auth record in current collection with the given config.
    * @returns BasicAuth instance connected to created auth
    *
    * ```typescript
-   * const basicAuthInstance = await basicCollectionInstance.createAuthorization({
+   * const basicAuthData = await basicCollectionInstance.createAuthorization({
    *   authName: 'my-auth-name',
    *   username: 'user',
    *   password: 'pass'
@@ -66,14 +107,83 @@ export class BasicCollection {
    */
   public async createAuthorization(
     params: CreateBasicAuthInCollectionConfig
-  ): Promise<BasicAuth> {
-    return await BasicAuth.create({
-      discoveryUrl: this.localDiscoveryUrl,
-      token: this.localToken,
-      serviceName: this.serviceName,
-      authName: params.authName,
-      password: params.password,
-      username: params.username,
-    });
+  ): Promise<BasicAuthData> {
+
+    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(),
+    } as Omit<BasicAuthData, 'key'>;
+
+    await this.keyValueStorage.setValueByKey(this.serviceName, encodeURIComponent(authKey), authData);
+
+    return {
+      ...authData,
+      key: authKey,
+    } as BasicAuthData;
+  }
+
+
+  /**
+   * Returns array of auth keys from this collection
+   */
+  public async updateAuthorization(
+    basicAuth: BasicAuthData,
+    newCredentials: { username?: string; password?: string; }
+  ): Promise<BasicAuthData> {
+    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 = await this.keyValueStorage.setValueByKey(
+      this.serviceName,
+      encodeURIComponent(basicAuth.key),
+      {
+        auth_name: basicAuth.auth_name,
+        date_created: basicAuth.date_created,
+        access_token,
+      }
+    );
+
+    const updatedData = response.value as Omit<BasicAuthData, 'key'>;
+    return {
+      ...updatedData,
+      key: basicAuth.key,
+    } as BasicAuthData;
+  }
+
+
+  /**
+   * Deletes authorization from collection
+   */
+  public async deleteAuthorization(authKey: string): Promise<void> {
+    if (!this.serviceName) throw new Error('Service name is not defined.');
+    await this.keyValueStorage.deleteKey(this.serviceName, encodeURIComponent(authKey));
   }
 }
+

package/src/Basic/index.ts

@@ -0,0 +1,3 @@
+export { BasicCollection } from './BasicCollection';
+
+export * from './types';

package/src/Basic/types.ts

@@ -14,6 +14,7 @@ export type BasicAuthConfig = {
 };
 
 export type BasicAuthData = {
+  key: string;
   auth_name: string;
 
   /**
@@ -50,5 +51,6 @@ export type BasicCollectionConfig = {
    * function which return token
    */
   discoveryUrl: string;
-  serviceName: string;
+  accountId?: string;
+  serviceName?: string;
 };

package/src/OAuth/OAuth.ts

@@ -39,6 +39,7 @@ export class OAuth {
 
   constructor(params: OAuthConfig) {
     const {
+      accountId,
       authKey,
       discoveryUrl,
       eventManagerUrl,
@@ -63,6 +64,7 @@ export class OAuth {
     this.keyValueStorage = new KeyValueStorage({
       token,
       discoveryUrl,
+      accountId,
     });
 
     this.providers = new Providers({
@@ -163,6 +165,7 @@ export class OAuth {
     const keyValueStorage = new KeyValueStorage({
       token,
       discoveryUrl,
+      accountId,
     });
 
     const providers = new Providers({
@@ -270,6 +273,7 @@ export class OAuth {
     const authorizeUrl = authUrl.href;
 
     const newOAuth = new OAuth({
+      accountId,
       authKey,
       discoveryUrl,
       eventManagerUrl,

package/src/OAuth/OAuthCollection.ts

@@ -2,34 +2,60 @@ import { Token, List, makeList } from '@or-sdk/base';
 import { KeyValueStorage } from '@or-sdk/key-value-storage';
 import { OAuth } from './OAuth';
 
-import { OAuthCollectionConfig, CreateOAuthInCollectionConfig, CreateOAuthResult, OAuthApp } from './types';
+import {
+  CreateOAuthInCollectionConfig,
+  CreateOAuthResult,
+  OAuthCollectionConfig,
+  OAuthApp,
+  OAuthCollectionInitConfig,
+} from './types';
 
 export class OAuthCollection {
-  private readonly serviceName: string;
-  private readonly keyValueCollection: string;
-  private readonly keyValueStorage: KeyValueStorage;
+  private serviceName: string;
+  private keyValueCollection: string;
+  private keyValueStorage: KeyValueStorage;
+  private localAccountId: string | undefined;
   private readonly localToken: Token;
   private readonly localDiscoveryUrl: string;
 
   constructor(params: OAuthCollectionConfig) {
-    const { token, discoveryUrl, serviceName, keyValueCollection } = params;
+    const { token, discoveryUrl, accountId, 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,
-      discoveryUrl,
+      token: this.localToken,
+      discoveryUrl: this.localDiscoveryUrl,
+      accountId: this.localAccountId,
     });
   }
 
+
+  /**
+   * Allows to explicitly (re)initialize collection parameters
+   */
+  public init(params: OAuthCollectionInitConfig): void {
+    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.');
+    }
+  }
+
+
   /**
    * Returns array of auth keys from this collection
    */
   public async listAuthorizations(): Promise<List<string>> {
     const { items: records } = await this.keyValueStorage.listKeys(
-      this.keyValueCollection
+      this.keyValueCollection || ''
     );
 
     return makeList<string>(records.map((record) => record.key).filter(key => key.includes('::oauth')));
@@ -59,6 +85,7 @@ export class OAuthCollection {
     })));
   }
 
+
   /**
    * Returns OAuth instance for given key
    */
@@ -81,6 +108,7 @@ export class OAuthCollection {
     });
   }
 
+
   /**
    * Creates a new auth record in current collection with the given config.
    * @returns Object with OAuth instance connected to created auth and authorizerUrl to redirect the user to for completing authorization
@@ -109,6 +137,7 @@ export class OAuthCollection {
     return await OAuth.create({
       discoveryUrl: this.localDiscoveryUrl,
       token: this.localToken,
+      accountId: this.localAccountId,
       appId: params.appId,
       keyValueCollection: this.keyValueCollection,
       scope: params.scope,

package/src/OAuth/index.ts

@@ -0,0 +1,4 @@
+export { OAuth } from './OAuth';
+export { OAuthCollection } from './OAuthCollection';
+
+export * from './types';

package/src/OAuth/types.ts

@@ -10,6 +10,7 @@ export type OAuthConfig = {
   serviceName: string;
   keyValueCollection?: string;
   authKey: string;
+  accountId?: string;
   eventManagerUrl?: string;
   providersAccountId?: string;
 };
@@ -120,13 +121,16 @@ export type OAuthCollectionConfig = {
    */
   token: Token;
   discoveryUrl: string;
-  serviceName: string;
+  accountId?: string;
+  serviceName?: string;
   /**
    * Pass this if your using custom name for key-value collection that differs from serviceName
    */
   keyValueCollection?: string;
 };
 
+export type OAuthCollectionInitConfig = Pick<OAuthCollectionConfig, 'serviceName' | 'keyValueCollection'>;
+
 export type ServiceDefinitionConfig = {
   serviceName: string;
   requestDataType: string;