refactor(credentials): read a reconnect's stored mode and cloud through one per-provider map

Author: waleedlatif1

apps/sim/lib/credentials/application/prepare-workload-identity.ts

@@ -11,10 +11,7 @@ import {
   type GoogleStoredDelegation,
   storedGoogleDelegation,
 } from '@/lib/credentials/google-workload-identity.server'
-import {
-  storedMicrosoftAppAuthType,
-  storedMicrosoftAppCloud,
-} from '@/lib/credentials/microsoft-app-service-account.server'
+import { storedMicrosoftAppReconnectFields } from '@/lib/credentials/microsoft-app-service-account.server'
 import type { MicrosoftCloudId } from '@/lib/credentials/microsoft-clouds'
 import { storedSnowflakeAuthType } from '@/lib/credentials/snowflake-service-account.server'
 import {
@@ -73,11 +70,10 @@ function authTypeOnly<P extends WorkloadIdentityProvider>(
 }
 
 function storedMicrosoftAppReconnect(decrypted: string): ReconnectFields<'microsoft'> {
-  const reconnectAuthType = storedMicrosoftAppAuthType(decrypted)
-  const reconnectCloud = storedMicrosoftAppCloud(decrypted)
+  const { authType, cloud } = storedMicrosoftAppReconnectFields(decrypted)
   return {
-    ...(reconnectAuthType ? { reconnectAuthType } : {}),
-    ...(reconnectCloud ? { reconnectCloud } : {}),
+    ...(authType ? { reconnectAuthType: authType } : {}),
+    ...(cloud ? { reconnectCloud: cloud } : {}),
   }
 }
 

apps/sim/lib/credentials/microsoft-app-service-account.server.ts

@@ -497,25 +497,21 @@ async function verifyDataverseApplicationUser(environmentUrl: string, token: str
   )
 }
 
-/** The auth mode a decrypted Microsoft app credential secret holds, or undefined when it is not one. */
-export function storedMicrosoftAppAuthType(
-  decrypted: string
-): 'federated' | 'client_secret' | 'certificate' | undefined {
-  try {
-    const parsed = storedSecretSchema.safeParse(JSON.parse(decrypted))
-    return parsed.success ? parsed.data.config.authType : undefined
-  } catch {
-    return undefined
-  }
-}
-
-/** The stored national cloud, for a reconnect to reopen on; absent for a global credential. */
-export function storedMicrosoftAppCloud(decrypted: string): MicrosoftCloudId | undefined {
+/**
+ * The auth mode and national cloud a decrypted Microsoft app credential secret holds, for a
+ * reconnect to reopen on: empty when it is not one, and no cloud for a global credential.
+ */
+export function storedMicrosoftAppReconnectFields(decrypted: string): {
+  authType?: MicrosoftAppConfig['authType']
+  cloud?: MicrosoftCloudId
+} {
   try {
     const parsed = storedSecretSchema.safeParse(JSON.parse(decrypted))
-    return parsed.success ? parsed.data.config.cloud : undefined
+    if (!parsed.success) return {}
+    const { authType, cloud } = parsed.data.config
+    return cloud ? { authType, cloud } : { authType }
   } catch {
-    return undefined
+    return {}
   }
 }