Merge pull request #5 from commitdev/bug/incorrect-session-num

fixed issue of incorrect session number

Author: damansdhillon

src/authProviders/auth0AuthProvider.ts src/authProviders/authProvider.tssrc/authProviders/auth0AuthProvider.ts renamed to src/authProviders/authProvider.ts

@@ -1,8 +1,14 @@
 import fetch from "node-fetch";
-import { v4 as uuid } from "uuid";
 import {
+  authentication,
+  AuthenticationProvider,
+  AuthenticationProviderAuthenticationSessionsChangeEvent,
   AuthenticationSession,
+  Disposable,
   env,
+  Event,
+  EventEmitter,
+  ExtensionContext,
   ProgressLocation,
   Uri,
   window,
@@ -13,54 +19,61 @@ import {
   UserDeviceCode,
   UserInfo,
 } from "../@types/types";
-import { AuthProvider } from "../common/authProviderInterface";
 import {
   COMMIT_API_BASE_URL,
   COMMIT_APP_BASE_URL,
   COMMIT_AUTH0_DOMAIN,
+  COMMIT_AUTH_NAME,
+  COMMIT_AUTH_TYPE,
   COMMIT_CLIENT_ID,
+  COMMIT_SESSIONS_SECRET_KEY,
 } from "../common/constants";
 
-export const AUTH_TYPE = `commit-auth0`;
-const AUTH_NAME = `Commit`;
-const SESSIONS_SECRET_KEY = `${AUTH_TYPE}.sessions`;
+export class Auth0AuthProvider implements AuthenticationProvider, Disposable {
+  private _secretSessionKey: string = COMMIT_SESSIONS_SECRET_KEY;
 
-export class Auth0AuthenticationProvider extends AuthProvider {
-  private _pendingStates: string[] = [];
+  // On Session Change Event Emitter
+  private _onDidChangeSessions =
+    new EventEmitter<AuthenticationProviderAuthenticationSessionsChangeEvent>();
 
-  /**
-   * Methid get authentication type
-   * @returns string
-   */
-  getAuthType(): string {
-    return AUTH_TYPE;
+  // Disposable
+  private _disposable: Disposable;
+
+  constructor(private readonly context: ExtensionContext) {
+    this._disposable = Disposable.from(
+      authentication.registerAuthenticationProvider(
+        COMMIT_AUTH_TYPE,
+        COMMIT_AUTH_NAME,
+        this,
+        { supportsMultipleAccounts: false }
+      )
+    );
   }
 
+  dispose() {
+    this._disposable.dispose();
+  }
   /**
-   * Method to get authentication name
-   * @returns string
+   * Event to listen to session changes
    */
-  getAuthName(): string {
-    return AUTH_NAME;
+  get onDidChangeSessions(): Event<AuthenticationProviderAuthenticationSessionsChangeEvent> {
+    return this._onDidChangeSessions.event;
   }
 
-  /**
-   * Method to get session secret key
-   * @returns string
-   */
-  getSecretKey(): string {
-    return SESSIONS_SECRET_KEY;
+  async getSessions(
+    scopes?: readonly string[] | undefined
+  ): Promise<readonly AuthenticationSession[]> {
+    const allSessions = await this.context.secrets.get(this._secretSessionKey);
+    if (!allSessions) {
+      return [];
+    }
+
+    const sessions = (await JSON.parse(allSessions)) as AuthenticationSession[];
+    return sessions;
   }
 
-  /**
-   * Create a new auth session
-   * @param scopes
-   * @returns
-   */
-  public async createSession(scopes: string[]): Promise<AuthenticationSession> {
+  async createSession(scopes: string[]): Promise<AuthenticationSession> {
     try {
-      // Append the default scopes if does not include openid and email
-
       if (!scopes.includes("openid")) {
         scopes.push("openid");
       }
@@ -69,84 +82,113 @@ export class Auth0AuthenticationProvider extends AuthProvider {
         scopes.push("email");
       }
 
-      const { accessToken, expiresIn } = await this._login(scopes);
+      // Login
+      const { accessToken } = (await this._login(scopes)) as AuthDetails;
       if (!accessToken) {
-        // console.log("Invalid access token");
-        throw new Error(`Commit login failed`);
+        throw new Error("Unable to login, not access token found");
       }
 
-      const userInfo: UserInfo = await this._getUserInfo(accessToken);
+      // Get User Info
+      const userInfo = (await this._getUserInfo(accessToken)) as UserInfo;
 
+      // Create Session
       const session: AuthenticationSession = {
-        id: "commit-" + uuid(),
+        id: userInfo.id,
         accessToken: accessToken,
         account: {
-          label: `${userInfo.name} <${userInfo.email}>`,
           id: userInfo.id,
+          label: userInfo.email,
         },
         scopes: scopes,
       };
 
-      await this.getContext().secrets.store(
-        SESSIONS_SECRET_KEY,
+      // Add the session to secret storage
+      await this.context.secrets.store(
+        this._secretSessionKey,
         JSON.stringify([session])
       );
 
-      this.getOnDidChangeSessions().fire({
+      this._onDidChangeSessions.fire({
         added: [session],
         removed: [],
         changed: [],
       });
 
       return session;
-    } catch (e) {
-      window.showErrorMessage(`${e}`);
-      throw e;
+    } catch (error: any) {
+      window.showErrorMessage(error.message);
+      throw error;
     }
   }
 
-  /**
-   * Get User Info
-   * @param token
-   * @returns
-   * @private
-   */
-  private async _getUserInfo(token: string): Promise<UserInfo> {
-    // Make POST request to get user info
-    try {
-      const response = await fetch(
-        `${COMMIT_API_BASE_URL}/v1/auth.get-own-user`,
-        {
-          method: "POST",
-          headers: {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            "content-type": "application/json",
-            cookie: `helix_session_token=${token}`,
-            origin: COMMIT_APP_BASE_URL || "",
-            referer: COMMIT_APP_BASE_URL || "",
-          },
-        }
-      );
+  async removeSessions(): Promise<void> {
+    await this.context.secrets.delete(this._secretSessionKey);
+    this._onDidChangeSessions.fire({
+      added: [],
+      removed: [],
+      changed: [],
+    });
+  }
 
-      if (!response.ok) {
-        throw new Error(`Get user info invalid status: ${response.statusText}`);
-      }
+  async removeSession(sessionId: string): Promise<void> {
+    const allSessions = await this.context.secrets.get(this._secretSessionKey);
+    if (!allSessions) {
+      return;
+    }
 
-      const data = (await response.json()) as any;
-      return {
-        email: data.email,
-        id: data.id,
-        name: data.name,
-        commits: [],
-      };
-    } catch (e) {
-      throw new Error(`Get user info failed: ${e}`);
+    const sessions = (await JSON.parse(allSessions)) as AuthenticationSession[];
+    const session = sessions.find((s) => s.id === sessionId);
+    if (!session) {
+      return;
     }
+
+    await this.context.secrets.delete(this._secretSessionKey);
+    this._onDidChangeSessions.fire({
+      added: [],
+      removed: [session],
+      changed: [],
+    });
+  }
+
+  // Local Methods
+  private async _login(scopes: string[] = []) {
+    return await window.withProgress<AuthDetails>(
+      {
+        location: ProgressLocation.Notification,
+        title: "Signing in to Commit...",
+        cancellable: true,
+      },
+      async (_, __) => {
+        // Get the device Code from Auth0
+        const registerDeviceResponse = await this._registerDeviceCode(scopes);
+        const endTime = Date.now() + registerDeviceResponse.expiresIn * 1000;
+
+        // Extract the user code from the verificationUriComplete
+        const userCode =
+          registerDeviceResponse.verificationUriComplete.match(
+            /user_code=([^&]+)/
+          )?.[1];
+
+        // Show the user code in a message
+        window.showInformationMessage(
+          `Confirm Device Code: ${userCode} in your browser`
+        );
+
+        // Open the verification URL
+        await env.openExternal(
+          Uri.parse(registerDeviceResponse.verificationUriComplete)
+        );
+
+        // Poll Access Token
+        return await this._pollAccessToken(
+          endTime,
+          registerDeviceResponse.deviceCode,
+          registerDeviceResponse.interval
+        );
+      }
+    );
   }
 
-  /**
-   * Get the device code from Auth0
-   */
   private async _registerDeviceCode(scopes: string[]): Promise<UserDeviceCode> {
     try {
       const response = await fetch(`${COMMIT_AUTH0_DOMAIN}/oauth/device/code`, {
@@ -185,64 +227,39 @@ export class Auth0AuthenticationProvider extends AuthProvider {
     }
   }
 
-  /**
-   * Login to Auth0
-   */
-  private async _login(scopes: string[] = []) {
-    return await window.withProgress<AuthDetails>(
-      {
-        location: ProgressLocation.Notification,
-        title: "Signing in to Commit...",
-        cancellable: true,
-      },
-      async (_, __) => {
-        const stateId = uuid();
-
-        this._pendingStates.push(stateId);
-
-        // Get the device Code from Auth0
-        const registerDeviceResponse = await this._registerDeviceCode(scopes);
-        const endTime = Date.now() + registerDeviceResponse.expiresIn * 1000;
-
-        // Extract the user code from the verificationUriComplete
-        const userCode =
-          registerDeviceResponse.verificationUriComplete.match(
-            /user_code=([^&]+)/
-          )?.[1];
-
-        // Show the user code in a message
-        window.showInformationMessage(
-          `Confirm Device Code: ${userCode} in your browser`
-        );
-
-        // Open the verification URL
-        await env.openExternal(
-          Uri.parse(registerDeviceResponse.verificationUriComplete)
-        );
-
-        try {
-          // Poll Access Token
-          return await this._pollAccessToken(
-            endTime,
-            registerDeviceResponse.deviceCode,
-            registerDeviceResponse.interval
-          );
-        } finally {
-          this._pendingStates = this._pendingStates.filter(
-            (s) => s !== stateId
-          );
+  private async _getUserInfo(token: string): Promise<UserInfo> {
+    // Make POST request to get user info
+    try {
+      const response = await fetch(
+        `${COMMIT_API_BASE_URL}/v1/auth.get-own-user`,
+        {
+          method: "POST",
+          headers: {
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            "content-type": "application/json",
+            cookie: `helix_session_token=${token}`,
+            origin: COMMIT_APP_BASE_URL || "",
+            referer: COMMIT_APP_BASE_URL || "",
+          },
         }
+      );
+
+      if (!response.ok) {
+        throw new Error(`Get user info invalid status: ${response.statusText}`);
       }
-    );
+
+      const data = (await response.json()) as any;
+      return {
+        email: data.email,
+        id: data.id,
+        name: data.name,
+        commits: [],
+      };
+    } catch (e) {
+      throw new Error(`Get user info failed: ${e}`);
+    }
   }
 
-  /**
-   * Poll for the access token
-   * @param deviceCode
-   * @param interval
-   * @param expiresIn
-   * @returns
-   */
   private async _pollAccessToken(
     endTime: number,
     deviceCode: string,