Use meta endpoint for OAuth Provider listing

Author: hhvrc

src/hooks.client.ts

@@ -6,14 +6,16 @@ import { UserStore } from '$lib/stores/UserStore';
 
 export async function init() {
   const {
-    data: { version, commit, shortLinkUrl, turnstileSiteKey, isUserAuthenticated },
+    data: { version, commit, shortLinkUrl, turnstileSiteKey, oAuthProviders, isUserAuthenticated },
   } = await metaApi.versionGetBackendInfo();
 
   if (version != null) sessionStorage.setItem('backendVersion', String(version));
   if (commit != null) sessionStorage.setItem('backendCommit', String(commit));
   if (shortLinkUrl != null) sessionStorage.setItem('shortLinkUrl', String(shortLinkUrl));
   if (turnstileSiteKey != null)
     sessionStorage.setItem('turnstileSiteKey', String(turnstileSiteKey));
+  if (oAuthProviders != null)
+    sessionStorage.setItem('oAuthProviders', JSON.stringify(oAuthProviders));
 
   // init client-side stores
   initializeDarkModeStore();

src/lib/api/index.ts

@@ -7,7 +7,6 @@ import {
   Configuration as ConfigurationV1,
   HubManagementApi as HubManagementV1Api,
   MetaApi,
-  OAuthApi,
   PublicShockerSharesApi,
   SessionsApi,
   ShockerSharesApi as ShockerSharesV1Api,

src/lib/api/internal/v1/.openapi-generator/FILES

@@ -4,7 +4,6 @@ apis/AdminApi.ts
 apis/HubEndpointsApi.ts
 apis/HubManagementApi.ts
 apis/MetaApi.ts
-apis/OAuthApi.ts
 apis/PublicShockerSharesApi.ts
 apis/SessionsApi.ts
 apis/ShockerSharesApi.ts

src/lib/api/internal/v1/apis/OAuthApi.ts

@@ -6,7 +6,6 @@ export * from './AdminApi';
 export * from './HubEndpointsApi';
 export * from './HubManagementApi';
 export * from './MetaApi';
-export * from './OAuthApi';
 export * from './PublicShockerSharesApi';
 export * from './SessionsApi';
 export * from './ShockerSharesApi';

src/lib/api/internal/v1/apis/index.ts

@@ -55,6 +55,12 @@ export interface BackendInfoResponse {
      * @memberof BackendInfoResponse
      */
     turnstileSiteKey: string | null;
+    /**
+     * 
+     * @type {Array<string>}
+     * @memberof BackendInfoResponse
+     */
+    oAuthProviders: Array<string>;
     /**
      * 
      * @type {boolean}
@@ -73,6 +79,7 @@ export function instanceOfBackendInfoResponse(value: object): value is BackendIn
     if (!('frontendUrl' in value) || value['frontendUrl'] === undefined) return false;
     if (!('shortLinkUrl' in value) || value['shortLinkUrl'] === undefined) return false;
     if (!('turnstileSiteKey' in value) || value['turnstileSiteKey'] === undefined) return false;
+    if (!('oAuthProviders' in value) || value['oAuthProviders'] === undefined) return false;
     if (!('isUserAuthenticated' in value) || value['isUserAuthenticated'] === undefined) return false;
     return true;
 }
@@ -93,6 +100,7 @@ export function BackendInfoResponseFromJSONTyped(json: any, ignoreDiscriminator:
         'frontendUrl': json['frontendUrl'],
         'shortLinkUrl': json['shortLinkUrl'],
         'turnstileSiteKey': json['turnstileSiteKey'],
+        'oAuthProviders': json['oAuthProviders'],
         'isUserAuthenticated': json['isUserAuthenticated'],
     };
 }
@@ -114,6 +122,7 @@ export function BackendInfoResponseToJSONTyped(value?: BackendInfoResponse | nul
         'frontendUrl': value['frontendUrl'],
         'shortLinkUrl': value['shortLinkUrl'],
         'turnstileSiteKey': value['turnstileSiteKey'],
+        'oAuthProviders': value['oAuthProviders'],
         'isUserAuthenticated': value['isUserAuthenticated'],
     };
 }

src/lib/api/internal/v1/models/BackendInfoResponse.ts

@@ -3,13 +3,8 @@ import type { LoginOkResponse, OAuthFinalizeRequest, OAuthSignupData } from './m
 import {
   TransformLoginOkResponse,
   TransformOAuthSignupData,
-  ValidateStringArray,
 } from './transformers';
 
-export function OAuthListProviders(): Promise<string[]> {
-  return GetJson<string[]>('/1/oauth/providers', 200, ValidateStringArray);
-}
-
 export function GetOAuthAuthorizeUrl(provider: string, flow: 'LoginOrCreate' | 'Link') {
   const providerEnc = encodeURIComponent(provider);
   const flowEnc = encodeURIComponent(flow);

src/lib/api/next/oauth.ts

@@ -6,7 +6,6 @@
   import { page } from '$app/state';
   import { accountV1Api } from '$lib/api';
   import type { OAuthConnectionResponse } from '$lib/api/internal/v1/models';
-  import { OAuthListProviders } from '$lib/api/next/oauth';
   import Container from '$lib/components/Container.svelte';
   import { Button } from '$lib/components/ui/button';
   import * as Card from '$lib/components/ui/card';
@@ -26,7 +25,7 @@
   let queryStatus = $derived(page.url.searchParams.get('status'));
 
   // Data
-  let providers = $state<string[]>([]);
+  let providers = $state<string[]>(JSON.parse(sessionStorage.getItem('oAuthProviders') ?? '[]'));
   let connections = $state<OAuthConnectionResponse[]>([]);
 
   // Disconnect dialog
@@ -54,16 +53,7 @@
     loadingConnections = true;
 
     try {
-      const [provResp, connResp] = await Promise.all([
-        OAuthListProviders(),
-        accountV1Api.authenticatedAccountListOAuthConnections(),
-      ]);
-
-      // Normalize providers into a simple { key, label } list.
-      // We accept several possible backend shapes to be robust.
-      providers = provResp;
-
-      connections = connResp ?? [];
+      connections = await accountV1Api.authenticatedAccountListOAuthConnections();
     } catch (err) {
       await handleApiError(err);
     } finally {