Merge pull request #35 from syetalabs/global-types

feat: Typings for GSI client
wavezync · Jan 27, 2023 · 9c3f5ed · 9c3f5ed
2 parents 4d8d60e + 6a5bab5
commit 9c3f5ed
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/@types/globals.d.ts → src/@types/globals.ts b/src/@types/globals.d.ts → src/@types/globals.ts
@@ -1,11 +1,17 @@
-import { CodeClient } from "../interfaces/oauth2";
+import type {
+  CodeClient,
+  CodeClientConfig,
+  OverridableTokenClientConfig,
+  TokenClientConfig,
+  TokenResponse,
+} from "../interfaces/oauth2";
 
-import {
+import type {
   IdConfiguration,
   MomentListener,
   GsiButtonConfiguration,
   RevocationCallback,
-} from "@/interfaces/accounts";
+} from "../interfaces/accounts";
 
 declare global {
   interface Window {
@@ -51,3 +57,5 @@ declare global {
     };
   }
 }
+
+export default {};
diff --git a/src/composables/useCodeClient.ts b/src/composables/useCodeClient.ts
@@ -129,7 +129,8 @@ export default function useCodeClient(
     });
 
     client = window.google?.accounts.oauth2.initCodeClient({
-      client_id: clientId,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      client_id: clientId!,
       scope: computedScopes,
       callback: (response: CodeResponse) => {
         if (response.error) return onError?.(response);

diff --git a/src/composables/useTokenClient.ts b/src/composables/useTokenClient.ts
@@ -111,7 +111,8 @@ export default function useTokenClient(
       : scopeValue;
 
     client = window.google?.accounts.oauth2.initTokenClient({
-      client_id: clientId,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      client_id: clientId!,
       scope: `openid email profile ${scopes}`,
       callback: (response: TokenResponse) => {
         if (response.error) return onError?.(response);

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -82,5 +82,6 @@ export type {
   AuthCodeFlowErrorResponse,
   AuthCodeFlowSuccessResponse,
 };
+export * from "./@types/globals";
 
 export default plugin;
diff --git a/tsconfig.json b/tsconfig.json
@@ -18,6 +18,9 @@
       "DOM.Iterable",
       "ESNext"
     ],
+    "typeRoots": [
+      "./src/@types"
+    ],
     "strict": true,
     "removeComments": false
   },