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.

Sign up for GitHub

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(da): remove prompt suggestion in ai-plugin, fix registration id mismatch #12859

Merged
merged 1 commit into from
Dec 6, 2024
Merged

fix(da): remove prompt suggestion in ai-plugin, fix registration id mismatch #12859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions packages/fx-core/src/component/configManager/actionInjector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { Utils } from "@microsoft/m365-spec-parser";
import { ConstantString, Utils } from "@microsoft/m365-spec-parser";
import fs from "fs-extra";
import { parseDocument } from "yaml";
import { InjectAPIKeyActionFailedError, InjectOAuthActionFailedError } from "../../error/common";
Expand Down Expand Up @@ -105,7 +105,9 @@ export class ActionInjector {
.filter((item: string | undefined) => {
return !!item;
});
const defaultEnvName = Utils.getSafeRegistrationIdEnvName(`${authName}_CONFIGURATION_ID`);
const defaultEnvName = Utils.getSafeRegistrationIdEnvName(
`${authName}_${ConstantString.RegistrationIdPostfix}`
);
const registrationIdEnvName = this.findNextAvailableEnvName(
defaultEnvName,
existingConfigurationIdEnvNames
Expand Down Expand Up @@ -187,7 +189,9 @@ export class ActionInjector {
return !!item;
});
const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
const defaultEnvName = Utils.getSafeRegistrationIdEnvName(`${authName}_REGISTRATION_ID`);
const defaultEnvName = Utils.getSafeRegistrationIdEnvName(
`${authName}_${ConstantString.RegistrationIdPostfix}`
);
const registrationIdEnvName = this.findNextAvailableEnvName(
defaultEnvName,
existingRegistrationIdEnvNames
Expand Down
3 changes: 3 additions & 0 deletions packages/fx-core/src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ export class CopilotGptManifestUtils {
gptManifest.conversation_starters.push(starter);
}
}

delete actionManifest.capabilities.conversation_starters;
await fs.writeJson(actionPath, actionManifest, { spaces: 4 });
}

const updateGptManifestRes = await copilotGptManifestUtils.writeCopilotGptManifestFile(
Expand Down
5 changes: 2 additions & 3 deletions packages/fx-core/src/component/generator/apiSpec/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
AdaptiveCardGenerator,
ErrorResult as ApiSpecErrorResult,
ErrorType as ApiSpecErrorType,
ConstantString,
ErrorType,
InvalidAPIInfo,
ListAPIResult,
Expand Down Expand Up @@ -1553,10 +1554,8 @@ async function updatePromptSuggestions(specItems: SpecObject[], manifestPath: st
}
}

const EnvNamePostfix = "REGISTRATION_ID";

export function getEnvName(authName: string): string {
return Utils.getSafeRegistrationIdEnvName(`${authName}_${EnvNamePostfix}`);
return Utils.getSafeRegistrationIdEnvName(`${authName}_${ConstantString.RegistrationIdPostfix}`);
}

export async function copyKiotaFolder(specPath: string, projectPath: string): Promise<void> {
Expand Down
2 changes: 1 addition & 1 deletion packages/fx-core/tests/core/FxCore.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4123,7 +4123,7 @@ describe("copilotPlugin", async () => {
apiSpecPath: "./appPackage/apiSpecificationFiles/openapi.json",
},
writeToEnvironmentFile: {
configurationId: "OAUTHAUTH_CONFIGURATION_ID",
configurationId: "OAUTHAUTH_REGISTRATION_ID",
},
},
{
Expand Down
Loading