diff --git a/backend/src/services/app-connection/github/github-connection-fns.ts b/backend/src/services/app-connection/github/github-connection-fns.ts index fd03fae4e..ebdd09289 100644 --- a/backend/src/services/app-connection/github/github-connection-fns.ts +++ b/backend/src/services/app-connection/github/github-connection-fns.ts @@ -7,7 +7,7 @@ import { request } from "@app/lib/config/request"; import { BadRequestError, ForbiddenRequestError, InternalServerError } from "@app/lib/errors"; import { getAppConnectionMethodName } from "@app/services/app-connection/app-connection-fns"; import { IntegrationUrls } from "@app/services/integration-auth/integration-list"; -import { getSyncedAdminIntegrationsConfig } from "@app/services/super-admin/super-admin-service"; +import { getInstanceIntegrationsConfig } from "@app/services/super-admin/super-admin-service"; import { AppConnection } from "../app-connection-enums"; import { GitHubConnectionMethod } from "./github-connection-enums"; @@ -15,7 +15,7 @@ import { TGitHubConnection, TGitHubConnectionConfig } from "./github-connection- export const getGitHubConnectionListItem = () => { const { INF_APP_CONNECTION_GITHUB_OAUTH_CLIENT_ID, INF_APP_CONNECTION_GITHUB_APP_SLUG } = getConfig(); - const { gitHubAppConnection } = getSyncedAdminIntegrationsConfig(); + const { gitHubAppConnection } = getInstanceIntegrationsConfig(); return { name: "GitHub" as const, @@ -32,7 +32,7 @@ export const getGitHubClient = (appConnection: TGitHubConnection) => { const { method, credentials } = appConnection; let client: Octokit; - const { gitHubAppConnection } = getSyncedAdminIntegrationsConfig(); + const { gitHubAppConnection } = getInstanceIntegrationsConfig(); const appId = gitHubAppConnection.appId || appCfg.INF_APP_CONNECTION_GITHUB_APP_ID; const appPrivateKey = gitHubAppConnection.privateKey || appCfg.INF_APP_CONNECTION_GITHUB_APP_PRIVATE_KEY; @@ -157,7 +157,7 @@ type TokenRespData = { export const validateGitHubConnectionCredentials = async (config: TGitHubConnectionConfig) => { const { credentials, method } = config; - const { gitHubAppConnection } = getSyncedAdminIntegrationsConfig(); + const { gitHubAppConnection } = getInstanceIntegrationsConfig(); const { INF_APP_CONNECTION_GITHUB_OAUTH_CLIENT_ID, diff --git a/backend/src/services/super-admin/super-admin-service.ts b/backend/src/services/super-admin/super-admin-service.ts index 052f4335a..3484693d1 100644 --- a/backend/src/services/super-admin/super-admin-service.ts +++ b/backend/src/services/super-admin/super-admin-service.ts @@ -94,7 +94,7 @@ let adminIntegrationsConfig: TAdminIntegrationConfig = { Object.freeze(adminIntegrationsConfig); -export const getSyncedAdminIntegrationsConfig = () => { +export const getInstanceIntegrationsConfig = () => { return adminIntegrationsConfig; }; diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubConnectionForm.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubConnectionForm.tsx index f9ff8d0e5..ea64d1751 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubConnectionForm.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubConnectionForm.tsx @@ -111,10 +111,10 @@ export const GitHubConnectionForm = ({ appConnection }: Props) => { }. This field cannot be changed after creation.`} errorText={ !isLoading && isMissingConfig - ? `Environment variables have not been configured. ${ + ? `Credentials have not been configured. ${ isInfisicalCloud() ? "Please contact Infisical." - : `See Docs to configure GitHub ${methodDetails.name} Connections.` + : `See Docs to configure Github ${methodDetails.name} Connections.` }` : error?.message }