Feature/ef/source control

.vscode/settings.json

@@ -7,5 +7,14 @@
   "oxc.typeAware": true,
   "oxc.fmt.configPath": ".oxfmtrc.json",
   "editor.formatOnSave": true,
-  "cSpell.words": ["isnan", "nonconstructor", "oxfmt", "oxlint", "tsgolint", "uninvoked"]
+  "cSpell.words": [
+    "isnan",
+    "nonconstructor",
+    "oxfmt",
+    "oxfmtrc",
+    "oxlint",
+    "oxlintrc",
+    "tsgolint",
+    "uninvoked"
+  ]
 }

packages/vscode-extension/package.json

@@ -23,10 +23,6 @@
   },
   "contributes": {
     "commands": [
-      {
-        "command": "ejfasting.showGreeting",
-        "title": "Hello World TS"
-      },
       {
         "command": "ejfasting.authenticate",
         "title": "Authenticate with SuperOffice"
@@ -42,6 +38,16 @@
       {
         "command": "ejfasting.script.downloadFolder",
         "title": "Download Script Folder"
+      },
+      {
+        "command": "ejfasting.scm.discardChanges",
+        "title": "Discard Changes",
+        "icon": "$(discard)"
+      },
+      {
+        "command": "ejfasting.scm.openFile",
+        "title": "Open File",
+        "icon": "$(go-to-file)"
       }
     ],
     "viewsContainers": {
@@ -58,18 +64,27 @@
         {
           "id": "ejfasting.view.scripts",
           "name": "Scripts",
-          "icon": "/resources/logo.svg"
+          "icon": "/resources/logo.svg",
+          "when": "superoffice.isAuthenticated"
         },
         {
           "id": "ejfasting.view.extraTables",
           "name": "Extra Tables Explorer",
-          "icon": "/resources/logo.svg"
+          "icon": "/resources/logo.svg",
+          "when": "superoffice.isAuthenticated"
+        },
+        {
+          "id": "ejfasting.view.empty",
+          "name": "Empty View",
+          "icon": "/resources/logo.svg",
+          "when": "!superoffice.isAuthenticated"
         }
       ]
     },
     "viewsWelcome": [
       {
-        "view": "ejfasting.view.scripts",
+        "view": "ejfasting.view.empty",
+        "when": "!superoffice.isAuthenticated",
         "contents": "You are not logged in to SuperOffice [learn more](https://docs.superoffice.com/).\n[Login](command:ejfasting.authenticate)"
       }
     ],
@@ -86,6 +101,30 @@
           "group": "0_script",
           "when": "view == ejfasting.view.scripts && viewItem == folder"
         }
+      ],
+      "scm/resourceState/context": [
+        {
+          "command": "ejfasting.scm.discardChanges",
+          "group": "inline",
+          "when": "scmProvider == superoffice"
+        },
+        {
+          "command": "ejfasting.scm.openFile",
+          "group": "inline",
+          "when": "scmProvider == superoffice"
+        }
+      ],
+      "scm/resourceState/inline": [
+        {
+          "command": "ejfasting.scm.discardChanges",
+          "group": "inline",
+          "when": "scmProvider == superoffice"
+        },
+        {
+          "command": "ejfasting.scm.openFile",
+          "group": "inline",
+          "when": "scmProvider == superoffice"
+        }
       ]
     }
   },

packages/vscode-extension/src/contributes/authenticationProvider.ts

@@ -1,23 +1,12 @@
-import {
-  authentication,
-  AuthenticationProvider,
-  AuthenticationProviderAuthenticationSessionsChangeEvent,
-  commands,
-  Disposable,
-  EventEmitter,
-  ExtensionContext,
-  window,
-} from "vscode";
-import { FileSystemService, IFileSystemService, SuoFile } from "../services/fileSystemService";
-import { AuthenticationService, IAuthenticationService } from "../services/authenticationService";
-import { v4 as uuid } from "uuid";
-import { Token } from "../services/authenticationService.types";
-import { SuperOfficeAuthenticationSession, UserClaims } from "./authenticationProvider.types";
+import { ExtensionContext } from "vscode";
+import { IFileSystemService } from "../services/fileSystemService";
+import { AuthenticationService } from "../services/authenticationService";
 import { packagePublisher } from "../extension";
+import { SuperOfficeAuthenticationProvider } from "../providers/authenticationProvider";
 
 export function registerAuthenticationProvider(
   context: ExtensionContext,
-  fileSystemService: FileSystemService,
+  fileSystemService: IFileSystemService,
   authenticationService: AuthenticationService,
 ) {
   const authProvider = new SuperOfficeAuthenticationProvider(
@@ -29,244 +18,3 @@ export function registerAuthenticationProvider(
   context.subscriptions.push(authProvider);
   return authProvider;
 }
-
-export class SuperOfficeAuthenticationProvider implements AuthenticationProvider, Disposable {
-  private currentSession: SuperOfficeAuthenticationSession | undefined;
-  private _disposable: Disposable;
-  private _onDidChangeSessions =
-    new EventEmitter<AuthenticationProviderAuthenticationSessionsChangeEvent>();
-
-  constructor(
-    private context: ExtensionContext,
-    private fileSystemService: IFileSystemService,
-    private authenticationService: IAuthenticationService,
-    private packagePublisher: string,
-  ) {
-    this._disposable = Disposable.from(
-      authentication.registerAuthenticationProvider(
-        this.packagePublisher.toLowerCase(),
-        this.packagePublisher,
-        this,
-        {
-          supportsMultipleAccounts: false,
-        },
-      ),
-    );
-  }
-
-  get onDidChangeSessions() {
-    return this._onDidChangeSessions.event;
-  }
-
-  /**
-   * Check if the session is expired based on the expiresAt property
-   * @param session the authentication session to check
-   * @returns true if the session is expired, false otherwise
-   */
-  private isSessionExpired(session: SuperOfficeAuthenticationSession): boolean {
-    return session.expiresAt! < Date.now();
-  }
-
-  /**
-   * Find a session by its context identifier
-   * @returns the found session or null if not found
-   */
-  private async retrieveSessionData(): Promise<SuperOfficeAuthenticationSession[] | null> {
-    const sessionData = await this.context.secrets.get(
-      `${this.packagePublisher.toLowerCase()}.sessions`,
-    );
-    return sessionData ? JSON.parse(sessionData) : null;
-  }
-
-  /**
-   * Read .suo-file from the local workspace to get the context identifier for the session
-   * @returns the .suo-file or undefined if not found
-   */
-  private async retrieveSuoFile(): Promise<SuoFile | undefined> {
-    return await this.fileSystemService.readSuoFile();
-  }
-
-  /**
-   * Find a session by its context identifier
-   * @param sessions the list of sessions to search
-   * @param contextIdentifier the context identifier to match
-   * @returns the found session or undefined if not found
-   */
-  private findSessionByIdentifier(
-    sessions: SuperOfficeAuthenticationSession[],
-    contextIdentifier: string,
-  ): SuperOfficeAuthenticationSession | undefined {
-    return sessions.find((obj) => obj.contextIdentifier === contextIdentifier);
-  }
-  /**
-   * Get the existing sessions
-   * @param scopes
-   * @returns
-   */
-  public async getSessions(_scopes?: string[]): Promise<SuperOfficeAuthenticationSession[]> {
-    try {
-      if (this.currentSession && !this.isSessionExpired(this.currentSession)) {
-        return [this.currentSession];
-      }
-
-      const suoFile = await this.retrieveSuoFile();
-      if (!suoFile) return [];
-
-      const sessions = await this.retrieveSessionData();
-      if (!sessions) return [];
-
-      const session = this.findSessionByIdentifier(sessions, suoFile.contextIdentifier);
-      if (!session || this.isSessionExpired(session)) {
-        if (session) await this.removeSession(session.id);
-        return [];
-      }
-
-      await this.setSession(session);
-      return [session];
-    } catch (error) {
-      console.error("Failed to retrieve or parse sessions:", error);
-      return [];
-    }
-  }
-
-  /**
-   * Create a new auth session
-   * @param scopes
-   * @returns
-   */
-  public async createSession(_scopes: string[]): Promise<SuperOfficeAuthenticationSession> {
-    const environment = await this.selectEnvironment();
-
-    const tokenInformation = (await this.authenticationService.login(environment)) as Token;
-    const userClaims = this.authenticationService.getClaimsFromToken(
-      tokenInformation.id_token,
-    ) as UserClaims;
-
-    const session = this.createSessionObject(userClaims, tokenInformation);
-
-    await this.storeSessionData(session);
-    await this.setSession(session);
-
-    return session;
-  }
-
-  private async storeSessionData(session: SuperOfficeAuthenticationSession): Promise<void> {
-    await this.context.secrets.store(
-      `${this.packagePublisher.toLowerCase()}.sessions`,
-      JSON.stringify([session]),
-    );
-    await this.fileSystemService.writeSuoFile(
-      JSON.stringify({ contextIdentifier: session.contextIdentifier }),
-    );
-  }
-
-  /**
-   * Remove an existing session
-   * @param sessionId
-   */
-  public async removeSession(sessionId: string): Promise<void> {
-    const sessions = await this.getAllSessions();
-    const [updatedSessions, removedSession] = this.removeSessionById(sessions, sessionId);
-
-    await this.updateStoredSessions(updatedSessions);
-    this.fireSessionChangeEvent(removedSession);
-
-    this.currentSession = undefined;
-    await this.updateContextKey(false);
-  }
-
-  private async getAllSessions(): Promise<SuperOfficeAuthenticationSession[]> {
-    const allSessions = await this.context.secrets.get(
-      `${this.packagePublisher.toLowerCase()}.sessions`,
-    );
-    return allSessions ? JSON.parse(allSessions) : [];
-  }
-
-  private removeSessionById(
-    sessions: SuperOfficeAuthenticationSession[],
-    sessionId: string,
-  ): [SuperOfficeAuthenticationSession[], SuperOfficeAuthenticationSession | undefined] {
-    const sessionIdx = sessions.findIndex((s) => s.id === sessionId);
-    const removedSession = sessionIdx !== -1 ? sessions.splice(sessionIdx, 1)[0] : undefined;
-    return [sessions, removedSession];
-  }
-
-  private async updateStoredSessions(sessions: SuperOfficeAuthenticationSession[]): Promise<void> {
-    await this.context.secrets.store(
-      `${this.packagePublisher.toLowerCase()}.sessions`,
-      JSON.stringify(sessions),
-    );
-  }
-
-  /**
-   * Set the current session and fire the onDidChangeSessions event
-   * @param session the session to set as current
-   */
-  public async setSession(session: SuperOfficeAuthenticationSession): Promise<void> {
-    this.currentSession = session;
-    this._onDidChangeSessions.fire({ added: [session], removed: [], changed: [] });
-    await this.updateContextKey(true);
-  }
-
-  /**
-   * Update the context key to control the visibility of UI elements based on authentication state
-   * @param isAuthenticated whether the user is authenticated
-   */
-  private async updateContextKey(isAuthenticated: boolean): Promise<void> {
-    await commands.executeCommand("setContext", "superoffice.isAuthenticated", isAuthenticated);
-  }
-
-  private fireSessionChangeEvent(removedSession?: SuperOfficeAuthenticationSession): void {
-    if (removedSession) {
-      this._onDidChangeSessions.fire({ added: [], removed: [removedSession], changed: [] });
-    }
-  }
-
-  /**
-   * Prompt the user to select an environment
-   * @returns the selected environment
-   */
-  private async selectEnvironment(): Promise<string> {
-    const environment = await window.showQuickPick(["sod", "online"], {
-      placeHolder: "Select an environment",
-      canPickMany: false,
-    });
-
-    if (!environment) {
-      throw new Error("Environment selection was canceled by the user.");
-    }
-
-    return environment;
-  }
-
-  private createSessionObject(
-    claims: UserClaims,
-    tokenInformation: Token,
-  ): SuperOfficeAuthenticationSession {
-    return {
-      id: uuid(),
-      contextIdentifier: claims["http://schemes.superoffice.net/identity/ctx"],
-      accessToken: tokenInformation.access_token!,
-      refreshToken: tokenInformation.refresh_token,
-      webApiUri: claims["http://schemes.superoffice.net/identity/webapi_url"],
-      expiresAt: Date.now() + 3600 * 1000,
-      claims: claims,
-      account: {
-        label: claims["http://schemes.superoffice.net/identity/ctx"],
-        id: claims["http://schemes.superoffice.net/identity/ctx"],
-      },
-      scopes: [],
-    };
-  }
-
-  public getCurrentSession(): SuperOfficeAuthenticationSession | undefined {
-    return this.currentSession;
-  }
-
-  /**
-   * Dispose the registered services
-   */
-  public async dispose() {
-    this._disposable.dispose();
-  }
-}