Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(standalone): Passing Appsettings to standalone designer services #6210

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ const DesignerEditor = () => {
canonicalLocation,
language,
queryClient,
settingsData?.properties ?? {},
dispatch
),
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down Expand Up @@ -445,6 +446,7 @@ const getDesignerServices = (
location: string,
locale: string | undefined,
queryClient: QueryClient,
appSettings: Record<string, string>,
dispatch: AppDispatch
): any => {
const siteResourceId = new ArmParser(workflowId).topmostResourceId;
Expand Down Expand Up @@ -473,7 +475,15 @@ const getDesignerServices = (
tenantId,
httpClient,
},
workflowAppDetails: { appName, identity: workflowApp?.identity as any },
workflowAppDetails: isHybrid
? {
appName,
identity: {
principalId: appSettings['WORKFLOWAPP_AAD_OBJECTID'],
tenantId: appSettings['WORKFLOWAPP_AAD_TENANTID'],
},
}
: { appName, identity: workflowApp?.identity as any },
readConnections: () => Promise.resolve(connectionsData),
writeConnection: addConnection as any,
connectionCreationClients: {
Expand Down Expand Up @@ -504,7 +514,7 @@ const getDesignerServices = (
const artifactService = new ArtifactService({
...armServiceParams,
siteResourceId,
integrationAccountCallbackUrl: undefined,
integrationAccountCallbackUrl: appSettings['WORKFLOW_INTEGRATION_ACCOUNT_CALLBACK_URL'],
});
const appService = new BaseAppServiceService({
baseUrl: armUrl,
Expand Down
Loading