improvement(credentials): simplify and clean up the review-round changes

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/integrations/[block]/integration-block-detail.tsx

@@ -175,8 +175,8 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
   const [oauthOpen, setOAuthOpen] = useState(false)
   const [personalTokenOpen, setPersonalTokenOpen] = useState(false)
   const isGitLab = integration.slug === 'gitlab'
-  const personalTokenAvailable =
-    isGitLab && (availability?.state === 'ready' || availability?.state === 'limited')
+  const deploymentAvailable = availability?.state === 'ready' || availability?.state === 'limited'
+  const personalTokenAvailable = isGitLab && deploymentAvailable
 
   const { data: credentials = [], isPending: credentialsLoading } = useWorkspaceCredentials({
     workspaceId,
@@ -211,12 +211,8 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
     serviceName: oauthService?.serviceName,
     serviceIcon: oauthService?.serviceIcon,
   })
-  const serviceAccountDeploymentAvailable =
-    availability?.state === 'ready' || availability?.state === 'limited'
   const hasServiceAccount =
-    serviceAccountDeploymentAvailable &&
-    Boolean(serviceAccountTarget) &&
-    !serviceAccountTarget?.hidden
+    deploymentAvailable && Boolean(serviceAccountTarget) && !serviceAccountTarget?.hidden
   const serviceAccountConnectLabel = serviceAccountTarget?.label ?? 'Add service account'
   const hasHandledConnectQueryRef = useRef(false)
 
@@ -280,6 +276,8 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
       : []),
   ]
 
+  const singleConnectOption = connectOptions.length === 1 ? connectOptions[0] : undefined
+
   const handleSelectConnectOption = (value: string) => {
     if (value === CONNECT_MODE.oauth) setOAuthOpen(true)
     else if (value === CONNECT_MODE.serviceAccount) setServiceAccountOpen(true)
@@ -308,22 +306,18 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
               onChange={handleSelectConnectOption}
               matchTriggerWidth={false}
             />
-          ) : personalTokenAvailable ? (
-            <Chip variant='primary' leftIcon={Plus} onClick={() => setPersonalTokenOpen(true)}>
-              Add personal token
+          ) : singleConnectOption ? (
+            <Chip
+              variant='primary'
+              leftIcon={Plus}
+              onClick={() => handleSelectConnectOption(singleConnectOption.value)}
+            >
+              {singleConnectOption.value === CONNECT_MODE.oauth
+                ? 'Add to Sim'
+                : singleConnectOption.label}
             </Chip>
           ) : oauthService ? (
-            oauthAvailable ? (
-              <Chip variant='primary' leftIcon={Plus} onClick={() => setOAuthOpen(true)}>
-                Add to Sim
-              </Chip>
-            ) : hasServiceAccount ? (
-              <Chip variant='primary' leftIcon={Plus} onClick={() => setServiceAccountOpen(true)}>
-                {serviceAccountConnectLabel}
-              </Chip>
-            ) : (
-              <Chip disabled>Unavailable</Chip>
-            )
+            <Chip disabled>Unavailable</Chip>
           ) : chatEnabled ? (
             <Chip variant='primary' leftIcon={Plus} onClick={handleAddInChat}>
               Add to Sim

apps/sim/lib/credentials/token-service-accounts/validators/gitlab.ts

@@ -1,4 +1,4 @@
-import { toArray, toRecord } from '@sim/utils/object'
+import { toRecord } from '@sim/utils/object'
 import {
   type SecureFetchResponse,
   secureFetchWithValidation,
@@ -62,27 +62,17 @@ export async function validateGitLabServiceAccount(
       { step: 'verify' }
     )
   }
-  let body: unknown
-  try {
-    body = await response.json()
-  } catch {
-    throw new TokenServiceAccountValidationError('provider_unavailable', 502, {
-      step: 'verify',
-      reason: 'GitLab returned a malformed token lookup',
-    })
-  }
-  const token = toRecord(body)
+  const token = toRecord(await response.json().catch(() => null))
   if (typeof token.active !== 'boolean' || !Array.isArray(token.scopes)) {
     throw new TokenServiceAccountValidationError('provider_unavailable', 502, {
       step: 'verify',
       reason: 'GitLab returned an unexpected token lookup',
     })
   }
-  const scopes = toArray(token.scopes)
   if (
-    token.active !== true ||
+    !token.active ||
     token.revoked === true ||
-    !scopes.some((scope) => API_SCOPES.has(String(scope)))
+    !token.scopes.some((scope) => API_SCOPES.has(String(scope)))
   ) {
     throw new TokenServiceAccountValidationError('invalid_credentials', 400, {
       step: 'verify',

apps/sim/tools/whatsapp/whatsapp.test.ts

@@ -28,6 +28,7 @@ describe('WhatsApp request URL and headers', () => {
     'refuses a phone number ID that would leave its path segment (%s)',
     (phoneNumberId) => {
       expect(() => buildMessagesUrl(phoneNumberId)).toThrow(/phoneNumberId/)
+      expect(() => buildMediaUploadUrl(phoneNumberId)).toThrow(/phoneNumberId/)
     }
   )
 })