Remove legacy code

packages/browser/src/__legacy__/client.ts → packages/browser/src/AsgardeoSPAClient.ts

@@ -17,7 +17,7 @@
  */
 
 import {
-  AsgardeoAuthClient,
+  AsgardeoJavaScriptClient,
   AsgardeoAuthException,
   AuthClientConfig,
   IsomorphicCrypto,
@@ -28,7 +28,7 @@ import {
   User,
   createPackageComponentLogger,
 } from '@asgardeo/javascript';
-import WorkerFile from '../web.worker';
+import WorkerFile from './web.worker';
 import {MainThreadClient, WebWorkerClient} from './clients';
 import {Hooks, REFRESH_ACCESS_TOKEN_ERR0R} from './constants';
 import {AuthenticationHelper, SPAHelper} from './helpers';
@@ -45,7 +45,7 @@ import {
   WebWorkerClientConfig,
   WebWorkerClientInterface,
 } from './models';
-import {BrowserStorage} from './models/storage';
+import {BrowserStorage} from './models/browser-storage';
 import {SPAUtils} from './utils';
 
 const logger: ReturnType<typeof createPackageComponentLogger> = createPackageComponentLogger(
@@ -366,7 +366,7 @@ export class AsgardeoSPAClient {
         this._client = await MainThreadClient(
           this._instanceId,
           mergedConfig,
-          (authClient: AsgardeoAuthClient<MainThreadClientConfig>, spaHelper: SPAHelper<MainThreadClientConfig>) => {
+          (authClient: AsgardeoJavaScriptClient<MainThreadClientConfig>, spaHelper: SPAHelper<MainThreadClientConfig>) => {
             return new this._authHelper(authClient, spaHelper);
           },
         );
@@ -405,7 +405,7 @@ export class AsgardeoSPAClient {
             ...webWorkerClientConfig,
           },
           this._worker,
-          (authClient: AsgardeoAuthClient<WebWorkerClientConfig>, spaHelper: SPAHelper<WebWorkerClientConfig>) => {
+          (authClient: AsgardeoJavaScriptClient<WebWorkerClientConfig>, spaHelper: SPAHelper<WebWorkerClientConfig>) => {
             return new this._authHelper(authClient, spaHelper);
           },
         )) as WebWorkerClientInterface;
@@ -914,7 +914,7 @@ export class AsgardeoSPAClient {
    *
    * @link https://github.com/asgardeo/asgardeo-auth-js-sdk/tree/master#getIdToken
    *
-   * @memberof AsgardeoAuthClient
+   * @memberof AsgardeoJavaScriptClient
    *
    * @preserve
    */
@@ -1276,7 +1276,7 @@ export class AsgardeoSPAClient {
    * ```
    * @link https://github.com/asgardeo/asgardeo-auth-spa-sdk/tree/master/lib#reInitialize
    *
-   * @memberof AsgardeoAuthClient
+   * @memberof AsgardeoJavaScriptClient
    *
    * @preserve
    */
@@ -1298,6 +1298,6 @@ export class AsgardeoSPAClient {
    * @param sessionId - The session ID of the session to be cleared. If not provided, the current session will be cleared.
    */
   public clearSession(sessionId?: string): void {
-    AsgardeoAuthClient.clearSession(sessionId);
+    AsgardeoJavaScriptClient.clearSession(sessionId);
   }
 }

packages/browser/src/clients/index.ts

@@ -0,0 +1,2 @@
+export * from './mainThreadClient';
+export * from './webWorkerClient';

packages/browser/src/__legacy__/clients/main-thread-client.ts → packages/browser/src/clients/mainThreadClient.ts

@@ -17,7 +17,7 @@
  */
 
 import {
-  AsgardeoAuthClient,
+  AsgardeoJavaScriptClient,
   AuthClientConfig,
   User,
   IsomorphicCrypto,
@@ -35,13 +35,13 @@ import {SILENT_SIGN_IN_STATE, TOKEN_REQUEST_CONFIG_KEY} from '../constants';
 import {AuthenticationHelper} from '../helpers/authentication-helper';
 import {SessionManagementHelper} from '../helpers/session-management-helper';
 import {SPAHelper} from '../helpers/spa-helper';
-import {FetchHttpClient} from '../../FetchHttpClient';
+import {FetchHttpClient} from '../FetchHttpClient';
 import {HttpError, HttpRequestConfig, HttpResponse, MainThreadClientConfig, MainThreadClientInterface} from '../models';
 import {SPACustomGrantConfig} from '../models/request-custom-grant';
-import {BrowserStorage} from '../models/storage';
+import {BrowserStorage} from '../models/browser-storage';
 import {LocalStore, MemoryStore, SessionStore} from '../stores';
 import {SPAUtils} from '../utils';
-import {SPACryptoUtils} from '../utils/crypto-utils';
+import {SPACryptoUtils} from '../DefaultCrypto';
 
 const initiateStore = (store: BrowserStorage | undefined): Storage => {
   switch (store) {
@@ -60,15 +60,14 @@ export const MainThreadClient = async (
   instanceId: number,
   config: AuthClientConfig<MainThreadClientConfig>,
   getAuthHelper: (
-    authClient: AsgardeoAuthClient<MainThreadClientConfig>,
+    authClient: AsgardeoJavaScriptClient<MainThreadClientConfig>,
     spaHelper: SPAHelper<MainThreadClientConfig>,
   ) => AuthenticationHelper<MainThreadClientConfig>,
 ): Promise<MainThreadClientInterface> => {
   const _store: Storage = initiateStore(config.storage as BrowserStorage);
   const _cryptoUtils: SPACryptoUtils = new SPACryptoUtils();
-  const _authenticationClient = new AsgardeoAuthClient<MainThreadClientConfig>();
-  await _authenticationClient.initialize(config, _store, _cryptoUtils, instanceId);
-
+  const _authenticationClient = new AsgardeoJavaScriptClient<MainThreadClientConfig>(config, _store, _cryptoUtils, instanceId);
+
   const _spaHelper = new SPAHelper<MainThreadClientConfig>(_authenticationClient);
   const _dataLayer = _authenticationClient.getStorageManager();
   const _sessionManagementHelper = await SessionManagementHelper(

packages/browser/src/__legacy__/clients/web-worker-client.ts → packages/browser/src/clients/webWorkerClient.ts

@@ -17,7 +17,7 @@
  */
 
 import {
-  AsgardeoAuthClient,
+  AsgardeoJavaScriptClient,
   AsgardeoAuthException,
   AuthClientConfig,
   User,
@@ -79,10 +79,10 @@ interface HttpClientCallbacks {
   requestFinishCallback: () => void;
 }
 import {SPACustomGrantConfig} from '../models/request-custom-grant';
-import {BrowserStorage} from '../models/storage';
+import {BrowserStorage} from '../models/browser-storage';
 import {LocalStore, MemoryStore, SessionStore} from '../stores';
 import {SPAUtils} from '../utils';
-import {SPACryptoUtils} from '../utils/crypto-utils';
+import {SPACryptoUtils} from '../DefaultCrypto';
 
 const initiateStore = (store: BrowserStorage | undefined): Storage => {
   switch (store) {
@@ -102,7 +102,7 @@ export const WebWorkerClient = async (
   config: AuthClientConfig<WebWorkerClientConfig>,
   webWorker: new () => Worker,
   getAuthHelper: (
-    authClient: AsgardeoAuthClient<WebWorkerClientConfig>,
+    authClient: AsgardeoJavaScriptClient<WebWorkerClientConfig>,
     spaHelper: SPAHelper<WebWorkerClientConfig>,
   ) => AuthenticationHelper<WebWorkerClientConfig>,
 ): Promise<WebWorkerClientInterface> => {
@@ -119,8 +119,7 @@ export const WebWorkerClient = async (
 
   const _store: Storage = initiateStore(config.storage as BrowserStorage);
   const _cryptoUtils: SPACryptoUtils = new SPACryptoUtils();
-  const _authenticationClient = new AsgardeoAuthClient<WebWorkerClientConfig>();
-  await _authenticationClient.initialize(config, _store, _cryptoUtils, instanceId);
+  const _authenticationClient = new AsgardeoJavaScriptClient<WebWorkerClientConfig>(config, _store, _cryptoUtils, instanceId);
   const _spaHelper = new SPAHelper<WebWorkerClientConfig>(_authenticationClient);
 
   const _sessionManagementHelper = await SessionManagementHelper(

packages/browser/src/constants/index.ts

@@ -0,0 +1,6 @@
+export * from './message-types';
+export * from './storage';
+export * from './hooks';
+export * from './session-management';
+export * from './parameters';
+export * from './errors';

packages/browser/src/__legacy__/helpers/authentication-helper.ts → packages/browser/src/helpers/authentication-helper.ts

@@ -17,7 +17,7 @@
  */
 
 import {
-  AsgardeoAuthClient,
+  AsgardeoJavaScriptClient,
   AsgardeoAuthException,
   AuthClientConfig,
   User,
@@ -56,17 +56,17 @@ import {
   WebWorkerClientConfig,
 } from '../models';
 import {SPACustomGrantConfig} from '../models/request-custom-grant';
-import {BrowserStorage} from '../models/storage';
+import {BrowserStorage} from '../models/browser-storage';
 import {SPAUtils} from '../utils';
 
 export class AuthenticationHelper<T extends MainThreadClientConfig | WebWorkerClientConfig> {
-  protected _authenticationClient: AsgardeoAuthClient<T>;
+  protected _authenticationClient: AsgardeoJavaScriptClient<T>;
   protected _storageManager: StorageManager<T>;
   protected _spaHelper: SPAHelper<T>;
   protected _instanceId: number;
   protected _isTokenRefreshing: boolean;
 
-  public constructor(authClient: AsgardeoAuthClient<T>, spaHelper: SPAHelper<T>) {
+  public constructor(authClient: AsgardeoJavaScriptClient<T>, spaHelper: SPAHelper<T>) {
     this._authenticationClient = authClient;
     this._storageManager = this._authenticationClient.getStorageManager();
     this._spaHelper = spaHelper;

packages/browser/src/helpers/index.ts

@@ -0,0 +1,3 @@
+export * from './authentication-helper';
+export * from './spa-helper';
+export * from './session-management-helper';

packages/browser/src/__legacy__/helpers/session-management-helper.ts → packages/browser/src/helpers/session-management-helper.ts

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-import {AsgardeoAuthClient, ExtendedAuthorizeRequestUrlParams, OIDCRequestConstants} from '@asgardeo/javascript';
+import {AsgardeoJavaScriptClient, ExtendedAuthorizeRequestUrlParams, OIDCRequestConstants} from '@asgardeo/javascript';
 import {
   CHECK_SESSION_SIGNED_IN,
   CHECK_SESSION_SIGNED_OUT,
@@ -30,7 +30,7 @@ import {
   STATE_QUERY,
 } from '../constants';
 import {AuthorizationInfo, Message, SessionManagementHelperInterface} from '../models';
-import {BrowserStorage} from '../models/storage';
+import {BrowserStorage} from '../models/browser-storage';
 import {SPAUtils} from '../utils';
 
 export const SessionManagementHelper = (() => {
@@ -242,7 +242,7 @@ export const SessionManagementHelper = (() => {
         const signOutURL = await _signOut();
         // Clearing user session data before redirecting to the signOutURL because user has been already logged
         // out by the initial logout request in the single logout flow.
-        await AsgardeoAuthClient.clearSession();
+        await AsgardeoJavaScriptClient.clearSession();
         parent.location.href = signOutURL;
         window.location.href = 'about:blank';