vscode cursor ws and oauth support (#506)

* vscode cursor ws and oauth support

* rebase axios update

Author: xavluiz

package.json

@@ -1,7 +1,7 @@
 {
   "name": "swdc-vscode",
   "displayName": "Code Time",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "publisher": "softwaredotcom",
   "description": "Code Time is an open source plugin that provides programming metrics right in Visual Studio Code.",
   "author": {

src/DataController.ts

@@ -12,8 +12,14 @@ import {
 import {initializeWebsockets} from './websockets';
 import {SummaryManager} from './managers/SummaryManager';
 import { updateFlowModeStatus } from './managers/FlowManager';
+import { AuthProvider } from './auth/AuthProvider';
 
 let currentUser: any | null = null;
+let authProvider: AuthProvider | null = null;
+
+export function initializeAuthProvider(provider: AuthProvider) {
+  authProvider = provider;
+}
 
 export async function getCachedSlackIntegrations() {
   currentUser = await getCachedUser();
@@ -66,6 +72,11 @@ export async function authenticationCompleteHandler(user: any, override_jwt: any
     setItem('name', user.email);
     setItem('updatedAt', new Date().getTime());
 
+    setItem('logging_in', false);
+    // ensure the session is updated
+    if (authProvider) {
+      authProvider.updateSession(getItem('jwt'), user);
+    }
     // update the login status
     showInformationMessage('Successfully logged on to Code Time');
 

src/auth/AuthProvider.ts

@@ -5,7 +5,7 @@ import {
 } from "vscode";
 import { v4 as uuid } from 'uuid';
 import { app_url } from "../Constants";
-import { getAuthQueryObject, logIt } from "../Util";
+import { getAuthQueryObject, getBooleanItem, logIt, setItem } from "../Util";
 import { authenticationCompleteHandler, getUser } from "../DataController";
 
 export const AUTH_TYPE = 'codetime_auth';
@@ -33,7 +33,6 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
   private _pendingStates: string[] = [];
   private _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: EventEmitter<void> }>();
   private _uriHandler = new UriEventHandler();
-  private _authenticating = false;
 
   constructor(private readonly context: ExtensionContext) {
     this._disposable = Disposable.from(
@@ -68,7 +67,7 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
     return [];
   }
 
-  public async updateSession(jwtToken: string): Promise<AuthenticationSession> {
+  public async updateSession(jwtToken: string, user: any = null): Promise<AuthenticationSession> {
     let session: AuthenticationSession = {
       id: uuid(),
       accessToken: jwtToken,
@@ -79,9 +78,11 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
       scopes: []
     }
     try {
-      // const userinfo: { name: string, email: string } = await this.getUserInfo(token);
-      const user = await getUser(jwtToken);
-      await authenticationCompleteHandler(user, jwtToken);
+      const sessionUpdate = !!user
+      if (!user) {
+        user = await getUser(jwtToken);
+        await authenticationCompleteHandler(user, jwtToken);
+      }
 
       session = {
         id: uuid(),
@@ -95,7 +96,11 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
 
       await this.context.secrets.store(SESSIONS_KEY, JSON.stringify([session]))
 
-      this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] });
+      if (sessionUpdate) {
+        this._sessionChangeEmitter.fire({ added: [], removed: [], changed: [session] });
+      } else {
+        this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] });
+      }
     } catch (e: any) {
       if (e.message) {
         logIt(`Error creating session: ${e?.message}`);
@@ -153,6 +158,7 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
       title: "Signing in to Software.com...",
       cancellable: true
     }, async (_, token) => {
+      setItem('logging_in', true);
       const stateId = uuid();
 
       this._pendingStates.push(stateId);
@@ -175,13 +181,26 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
       try {
         return await Promise.race([
           codeExchangePromise.promise,
+          // 2 minute timeout
           new Promise<string>((_, reject) => setTimeout(() => reject('Cancelled'), 120000)),
+          // websocket login check
+          new Promise<string>((_, reject) => {
+            const interval = setInterval(async () => {
+              if (getBooleanItem('logging_in') === false) {
+                clearInterval(interval);
+                reject('Cancelled');
+              }
+            }, 1500);
+          }),
+          // cancel button
           promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('Login Cancelled'); }).promise
         ]);
       } finally {
         this._pendingStates = this._pendingStates.filter(n => n !== stateId);
         codeExchangePromise?.cancel.fire();
         this._codeExchangePromises.delete(scopeString);
+        // reset logging_in flag
+        setItem('logging_in', false);
       }
     });
   }

src/extension.ts

@@ -3,7 +3,7 @@
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
 import {window, ExtensionContext, commands, authentication} from 'vscode';
-import {getUser} from './DataController';
+import {getUser, initializeAuthProvider} from './DataController';
 import {onboardInit} from './user/OnboardManager';
 import {
   getVersion,
@@ -69,6 +69,7 @@ export async function activate(ctx: ExtensionContext) {
   const authProvider:AuthProvider = new AuthProvider(ctx);
   storageManager = LocalStorageManager.getInstance(ctx);
   initializeSession(storageManager);
+  initializeAuthProvider(authProvider);
 
   // add the code time commands
   ctx.subscriptions.push(createCommands(ctx, kpmController, storageManager));