refactor: define a interface for workspace config

Author: cimandef

src/commands/login/oauth2/index.ts

@@ -6,10 +6,7 @@ import * as vscode from "vscode";
 import { isUserConnected } from "../../../credentials";
 import { base64UrlSafeEncode } from "../../utils";
 import { clientId, createCredentials } from "../createCredentials";
-import {
-  getAvailablePort,
-  startLocalServerForCallback,
-} from "./callbackServer";
+import { getAvailablePort, startLocalServerForCallback } from "./callbackServer";
 
 function authorizeUrl(clientId: string, redirectUri: URL, state: string): URL {
   const baseUrl = new URL("/oauth2/authorize", GlobalArgs.aqoraUrl());

src/credentials.ts

@@ -5,10 +5,7 @@ import { DateTime } from "luxon";
 import { credentialsPath, isAccessible } from "./dirs";
 import { GlobalArgs } from "./globalArgs";
 import { gql } from "./graphql";
-import {
-  Refresh_TokenMutation,
-  Refresh_TokenMutationVariables,
-} from "./graphql/graphql";
+import { Refresh_TokenMutation, Refresh_TokenMutationVariables } from "./graphql/graphql";
 import { CamelToSnakeCaseNested } from "./utils";
 
 const EXPIRATION_PADDING_SEC = 60;

src/dirs.ts

@@ -21,7 +21,7 @@ class SystemError extends Error {
 }
 
 export async function configDir(): Promise<string> {
-  console.log("READDDDDDD")
+  console.log("READDDDDDD");
   const paths = xdgAppPaths({ name: PATH_SUFFIX });
 
   if (await isAccessible(paths.data())) {
@@ -39,7 +39,6 @@ export async function configDir(): Promise<string> {
   }
 }
 
-
 export async function isAccessible(path: string): Promise<boolean> {
   try {
     await fs.access(path, fs.constants.R_OK);

src/globalArgs.ts

@@ -6,6 +6,12 @@ import { configDir } from "./dirs";
 
 export type AqoraProjectType = "submission" | "use_case";
 
+interface AqoraWorkspaceConfig {
+  url?: URL;
+  noPrompt?: boolean;
+  configHome?: string;
+}
+
 export interface AqoraProject {
   readonly project: {
     readonly name: string;
@@ -36,10 +42,11 @@ export interface GlobalArgsProps {
 }
 
 export const GlobalArgs: GlobalArgsProps = (() => {
-  const config = workspace.getConfiguration();
-  console.log("AQORA CONFIG", config.get("aqora"));
-  const url = new URL(config.get<string>("aqora.url") || "https://aqora.io");
-  const noPrompt = config.get<boolean>("aqora.noPrompt") ?? true;
+  const config = workspace
+    .getConfiguration()
+    .get<AqoraWorkspaceConfig>("aqora");
+  const url = config?.url || new URL("https://aqora.io");
+  const noPrompt = config?.noPrompt ?? true;
 
   let extensionPath: string | undefined;
 
@@ -85,8 +92,8 @@ export const GlobalArgs: GlobalArgsProps = (() => {
   const isAqoraProject = async (customPath?: string): Promise<boolean> => {
     const project = await getAqoraProject(customPath);
     return (
-      project?.tool.aqora.type === "use_case" ||
-      project?.tool.aqora.type === "submission"
+      project?.tool.aqora.type === "use_case"
+      || project?.tool.aqora.type === "submission"
     );
   };
 
@@ -97,8 +104,7 @@ export const GlobalArgs: GlobalArgsProps = (() => {
     get noPrompt() {
       return noPrompt;
     },
-    getConfigHome: async () =>
-      config.get<string>("aqora.configHome") || (await configDir()),
+    getConfigHome: async () => config.get<string>("aqora.configHome") || (await configDir()),
     aqoraUrl: () => new URL(url),
     graphqlUrl: () => new URL("/graphql", url),
     isAqoraProject,