Skip to content

Commit 7303d70

Browse files
committed
fix(merge): import staging's new code from this branch's module homes
- Snowflake's keyless server reads parseTokenServiceAccountSecretBlob from token-service-accounts/secret-blob, where this branch moved it; the old token-service-accounts/server import no longer exports it, and reaching it pulled every token validator into the lib/auth graph (about 48 modules on each Platform route). - The new Bitbucket, DocuSign and Microsoft app docs pages import Callout and Steps from @sim/emcn-docs, as every other docs page here does. - Regenerated block names (github_v3) and the Platform permission catalog.
1 parent 8fb3a3c commit 7303d70

6 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎apps/docs/content/docs/integrations/bitbucket-service-account.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Bitbucket access tokens
33
description: Connect Bitbucket Cloud to Sim with a workspace, project, or repository access token instead of a personal account
44
---
55

6-
import { Callout } from '@/components/ui/callout'
7-
import { Step, Steps } from '@/components/ui/steps'
6+
import { Callout } from '@sim/emcn-docs/callout'
7+
import { Step, Steps } from '@sim/emcn-docs/steps'
88

99
Connect Bitbucket Cloud with an access token when a workflow should act as an integration rather than as the person who connected it. An access token belongs to a workspace, project, or repository, not to a user, so it keeps working when people leave and its reach is limited to what it was created for.
1010

‎apps/docs/content/docs/integrations/docusign-service-account.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: DocuSign JWT Grant
33
description: Connect DocuSign to Sim with an integration key and RSA keypair that acts as one DocuSign user, instead of a personal OAuth connection
44
---
55

6-
import { Callout } from '@/components/ui/callout'
7-
import { Step, Steps } from '@/components/ui/steps'
6+
import { Callout } from '@sim/emcn-docs/callout'
7+
import { Step, Steps } from '@sim/emcn-docs/steps'
88

99
Connect DocuSign with JWT Grant when a workflow should keep working without anyone signing in again. Sim signs a short-lived assertion with your app's RSA private key, exchanges it for an access token that acts as one DocuSign user, and repeats that every hour. DocuSign issues no refresh token for JWT Grant, so nothing expires as long as the key and the user's consent stay in place.
1010

‎apps/docs/content/docs/integrations/microsoft-app-credentials.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Microsoft app credentials
33
description: Run Microsoft Entra ID, SharePoint, Dataverse, and Dynamics 365 blocks as an app registration with a client secret, a certificate, or a keyless federated credential that trusts Sim
44
---
55

6-
import { Callout } from '@/components/ui/callout'
7-
import { Step, Steps } from '@/components/ui/steps'
6+
import { Callout } from '@sim/emcn-docs/callout'
7+
import { Step, Steps } from '@sim/emcn-docs/steps'
88

99
A Microsoft app credential signs in as a Microsoft Entra app registration instead of a person (the OAuth 2.0 client credentials flow). One credential works for the **Azure AD** (Microsoft Entra ID), **SharePoint**, **Microsoft Dataverse**, and **Dynamics 365** blocks. Connecting a Microsoft account through OAuth keeps working exactly as before; the app credential is an additional option in the same account picker.
1010

‎apps/sim/lib/block-metadata/names.generated.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ export const REGISTERED_BLOCK_NAMES: Readonly<Record<string, string>> = {
485485
generic_webhook: 'Webhook Trigger',
486486
github: 'GitHub (Legacy)',
487487
github_v2: 'GitHub',
488+
github_v3: 'GitHub',
488489
gitlab: 'GitLab',
489490
gitlab_v2: 'GitLab',
490491
gmail: 'Gmail (Legacy)',
@@ -892,6 +893,7 @@ export const HIDDEN_FROM_TOOLBAR_BLOCK_TYPES: readonly string[] = [
892893
'flint',
893894
'gamma',
894895
'github',
896+
'github_v2',
895897
'gitlab',
896898
'gmail',
897899
'google_calendar',

‎apps/sim/lib/credentials/snowflake-service-account.server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from '@/lib/credentials/principal'
1010
import { parseServiceAccountConfig } from '@/lib/credentials/service-account-config'
1111
import { SNOWFLAKE_SERVICE_ACCOUNT_PROVIDER_ID } from '@/lib/credentials/token-service-accounts/descriptors'
12-
import { parseTokenServiceAccountSecretBlob } from '@/lib/credentials/token-service-accounts/server'
12+
import { parseTokenServiceAccountSecretBlob } from '@/lib/credentials/token-service-accounts/secret-blob'
1313
import { validateSnowflakeWorkloadIdentity } from '@/lib/credentials/token-service-accounts/validators/snowflake'
1414
import { WORKLOAD_IDENTITY_AUDIENCES } from '@/lib/credentials/workload-identity/audiences'
1515
import {

‎apps/sim/platform/fixtures/settings/permission-catalog.generated.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3644,7 +3644,7 @@
36443644
]
36453645
},
36463646
{
3647-
"type": "github_v2",
3647+
"type": "github_v3",
36483648
"name": "GitHub",
36493649
"description": "Interact with GitHub or trigger workflows from GitHub events",
36503650
"category": "tools",

0 commit comments

Comments
 (0)