fix(credentials): keep GitLab personal tokens available after GitLab moves to gitlab_v2

Personal-token visibility resolved the GitLab integration by the legacy block
type, so hiding that block and renaming its catalog entry hid every existing
personal token and refused new ones. It now resolves the current GitLab
version, and the integration page lists personal tokens beside saved GitLab
credentials.

Author: waleedlatif1

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

@@ -175,7 +175,7 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
   const [oauthOpen, setOAuthOpen] = useState(false)
   const [personalTokenOpen, setPersonalTokenOpen] = useState(false)
   const personalTokenAvailable =
-    integration.type === 'gitlab' &&
+    integration.slug === 'gitlab' &&
     (availability?.state === 'ready' || availability?.state === 'limited')
 
   const { data: credentials = [], isPending: credentialsLoading } = useWorkspaceCredentials({
@@ -191,16 +191,21 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
    * `providerId`s instead hides it from all of them.
    */
   const connectedCredentials = useMemo(() => {
-    if (integration.type === 'gitlab')
-      return credentials.filter((c) => c.type === 'personal_token' && c.providerId === 'gitlab')
-    if (!oauthService) return []
-    return credentials.filter(
-      (c) =>
-        (c.type === 'oauth' || c.type === 'service_account') &&
-        c.providerId &&
-        credentialProviderMatchesService(c.providerId, oauthService)
-    )
-  }, [credentials, oauthService, integration.type])
+    const serviceCredentials = oauthService
+      ? credentials.filter(
+          (c) =>
+            (c.type === 'oauth' || c.type === 'service_account') &&
+            c.providerId &&
+            credentialProviderMatchesService(c.providerId, oauthService)
+        )
+      : []
+    if (integration.slug !== 'gitlab') return serviceCredentials
+    // GitLab also has personal tokens, which Copilot acts with on the person's behalf.
+    return [
+      ...credentials.filter((c) => c.type === 'personal_token' && c.providerId === 'gitlab'),
+      ...serviceCredentials,
+    ]
+  }, [credentials, oauthService, integration.slug])
   const [serviceAccountOpen, setServiceAccountOpen] = useState(false)
   const serviceAccountTarget = useServiceAccountConnectTarget({
     serviceAccountProviderId: oauthService?.serviceAccountProviderId,

apps/sim/lib/integrations/credential-visibility.server.test.ts

@@ -235,6 +235,21 @@ describe('integration credential visibility', () => {
     expect(disabled.isCredentialVisible(credential)).toBe(false)
   })
 
+  it('keeps GitLab personal tokens visible after the GitLab block moves to a new version', () => {
+    getIntegrationAvailabilityMock.mockReturnValue([
+      availability('gitlab_v2', 'ready', { oauthAvailable: false, serviceAccountAvailable: true }),
+    ])
+    const visibility = createIntegrationCredentialVisibility({
+      allowedIntegrationTypes: new Set(['gitlab_v2']),
+      blockVisibility: null,
+      oauthServices: SERVICES,
+    })
+
+    expect(visibility.isCredentialVisible({ providerId: 'gitlab', type: 'personal_token' })).toBe(
+      true
+    )
+  })
+
   it('leaves non-integration credentials visible', () => {
     const visibility = createIntegrationCredentialVisibility({
       allowedIntegrationTypes: new Set(),

apps/sim/lib/integrations/credential-visibility.server.ts

@@ -13,6 +13,7 @@ import { getGitHubInstallationConfiguration } from '@/lib/oauth/github-installat
 import { GITHUB_INSTALLATION_PROVIDER_ID } from '@/lib/oauth/github-installation-types'
 import type { OAuthServiceMetadata } from '@/lib/oauth/types'
 import { getAllOAuthServices } from '@/lib/oauth/utils'
+import { resolveAccessControlBlockType } from '@/lib/permission-groups/integration-allowlist'
 import { getBlock } from '@/blocks/registry'
 import { isHiddenUnder } from '@/blocks/visibility/context'
 
@@ -157,13 +158,15 @@ export function createIntegrationCredentialVisibility({
       return oauthOwnersByProviderId.get(providerId)?.some(isManagedOAuthServiceVisible) ?? false
     }
     if (type === 'personal_token') {
+      // Personal tokens belong to the GitLab integration, whichever block version is current.
+      const gitlabType = resolveAccessControlBlockType('gitlab')
       if (
         providerId !== 'gitlab' ||
-        (allowedIntegrationTypes && !allowedIntegrationTypes.has('gitlab'))
+        (allowedIntegrationTypes && !allowedIntegrationTypes.has(gitlabType))
       )
         return false
-      const block = getBlock('gitlab')
-      const availability = availabilityByType.get('gitlab')
+      const block = getBlock(gitlabType)
+      const availability = availabilityByType.get(gitlabType)
       if (!block || block.hideFromToolbar || isHiddenUnder(blockVisibility, block) || !availability)
         return false
       const state = resolveIntegrationAvailabilityStateForVisibility(availability, blockVisibility)