From ef5a3d72fcbf4bbc1e1491bb1362bb75fe03bd9e Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:15:00 +0530 Subject: [PATCH 1/4] docs: Update package.nls.json --- packages/fx-core/resource/package.nls.json | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/fx-core/resource/package.nls.json b/packages/fx-core/resource/package.nls.json index ee432db736..c1ac6af8e4 100644 --- a/packages/fx-core/resource/package.nls.json +++ b/packages/fx-core/resource/package.nls.json @@ -508,29 +508,29 @@ "core.common.RemoteRefNotSupported": "Remote reference is not supported: %s.", "core.common.MissingOperationId": "Missing operationIds: %s.", "core.common.NoSupportedApi": "No supported API is found in the OpenAPI description document: only GET and POST methods are supported, additionally, there can be at most 5 required parameter, and no auth is allowed. \nFor more information visit: \"https://aka.ms/build-api-based-message-extension\".", - "core.common.UrlProtocolNotSupported": "Server url is not correct: protocol %s is not supported, you should use https protocol instead.", - "core.common.RelativeServerUrlNotSupported": "Server url is not correct: relative server url is not supported.", - "core.common.ErrorFetchApiSpec": "Your OpenAPI description document should be accessible without authentication, otherwise download and start from a local copy.", + "core.common.UrlProtocolNotSupported": "Server url is incorrect: protocol %s is not supported, use https protocol.", + "core.common.RelativeServerUrlNotSupported": "Server url is incorrect: relative server url is not supported.", + "core.common.ErrorFetchApiSpec": "Your OpenAPI description document should be accessible without authentication. If not, download and use a local copy.", "core.common.SendingApiRequest": "Sending API request: %s. Request body: %s", "core.common.ReceiveApiResponse": "Received API response: %s.", - "core.importAddin.label": "Import an Existing Outlook Add-ins", - "core.importAddin.detail": "Upgrade an Add-ins project to the latest app manifest and project structure", - "core.importOfficeAddin.label": "Import an Existing Office Add-ins", - "core.officeContentAddin.label": "Content Add-in", + "core.importAddin.label": "Import Existing Outlook Add-ins", + "core.importAddin.detail": "Upgrade Add-ins project to the latest app manifest and project structure", + "core.importOfficeAddin.label": "Import Existing Office Add-ins", + "core.officeContentAddin.label": "Content Add-ins", "core.officeContentAddin.detail": "Create new objects for Excel or PowerPoint", "core.newTaskpaneAddin.label": "Taskpane", "core.newTaskpaneAddin.detail": "Customize the Ribbon with a button and embed content in the Taskpane", "core.summary.actionDescription": "Action %s%s", "core.summary.lifecycleDescription": "Lifecycle stage: %s(%s step(s) in total). The following actions will be executed: %s", - "core.summary.lifecycleNotExecuted": "%s Lifecycle stage %s was not executed.", - "core.summary.lifecycleSucceeded": "%s Lifecycle stage %s was executed successfully.", - "core.summary.lifecycleFailed": "%s Lifecycle stage %s failed.", - "core.summary.actionNotExecuted": "%s was not executed.", - "core.summary.actionFailed": "%s failed.", - "core.summary.actionSucceeded": "%s was executed successfully.", + "core.summary.lifecycleNotExecuted": "%s Lifecycle stage %s not executed.", + "core.summary.lifecycleSucceeded": "%s Lifecycle stage %s executed successfully.", + "core.summary.lifecycleFailed": "%s Lifecycle stage %s didn't complete successfully.", + "core.summary.actionNotExecuted": "%s wasn't executed.", + "core.summary.actionFailed": "%s didn't complete successfully.", + "core.summary.actionSucceeded": "%s executed successfully.", "core.summary.createdEnvFile": "Environment file was created at", - "core.copilot.addAPI.success": "%s have(has) been successfully added to %s", - "core.copilot.addAPI.InjectAPIKeyActionFailed": "Inject API key action to teamsapp.yaml file failed, please make sure that file contains teamsApp/create action in provision section.", + "core.copilot.addAPI.success": "%s successfully added to %s", + "core.copilot.addAPI.InjectAPIKeyActionFailed": "Unable to inject API key action to teamsapp.yaml file. Make sure the file contains teamsApp/create action in provision section.", "ui.select.LoadingOptionsPlaceholder": "Loading options ...", "ui.select.LoadingDefaultPlaceholder": "Loading default value ...", "error.aad.manifest.NameIsMissing": "name is missing\n", @@ -538,16 +538,16 @@ "error.aad.manifest.RequiredResourceAccessIsMissing": "requiredResourceAccess is missing\n", "error.aad.manifest.Oauth2PermissionsIsMissing": "oauth2Permissions is missing\n", "error.aad.manifest.PreAuthorizedApplicationsIsMissing": "preAuthorizedApplications is missing\n", - "error.aad.manifest.ResourceAppIdIsMissing": "Some item(s) in requiredResourceAccess misses resourceAppId property.", - "error.aad.manifest.ResourceAccessIdIsMissing": "Some item(s) in resourceAccess misses id property.", + "error.aad.manifest.ResourceAppIdIsMissing": "Some requiredResourceAccess item(s) are missing the resourceAppId property.", + "error.aad.manifest.ResourceAccessIdIsMissing": "Some resourceAccess item(s) are missing id property.", "error.aad.manifest.ResourceAccessShouldBeArray": "resourceAccess should be an array.", "error.aad.manifest.RequiredResourceAccessShouldBeArray": "requiredResourceAccess should be an array.", "error.aad.manifest.AccessTokenAcceptedVersionIs1": "accessTokenAcceptedVersion is 1\n", "error.aad.manifest.OptionalClaimsIsMissing": "optionalClaims is missing\n", "error.aad.manifest.OptionalClaimsMissingIdtypClaim": "optionalClaims access token doesn't contain idtyp claim\n", "error.aad.manifest.AADManifestIssues": "Microsoft Entra manifest has following issues that may potentially break the Teams App:\n", - "error.aad.manifest.DeleteOrUpdatePermissionFailed": "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable is changed for selected environment. Ensure your permission id(s) are identical with the actual Microsoft Entra application and try again.\n", - "error.aad.manifest.HostNameNotOnVerifiedDomain": "Unable to set identifierUri because the value is not on verified domain: %s", + "error.aad.manifest.DeleteOrUpdatePermissionFailed": "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable has changed for selected environment. Ensure your permission id(s) match the actual Microsoft Entra application and try again.\n", + "error.aad.manifest.HostNameNotOnVerifiedDomain": "Unable to set identifierUri as the value is not on verified domain: %s", "error.aad.manifest.UnknownResourceAppId": "Unknown resourceAppId %s", "error.aad.manifest.UnknownResourceAccessType": "Unknown resourceAccess: %s", "error.aad.manifest.UnknownResourceAccessId": "Unknown resourceAccess id: %s, if you're using permission as resourceAccess id, please try to use permission id instead.", From 6a5f15f77ae6ba6f86a8a318e2c48a39cafd88b5 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:04:55 +0530 Subject: [PATCH 2/4] Update aadAppClient.test.ts --- .../fx-core/tests/component/driver/aad/aadAppClient.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/tests/component/driver/aad/aadAppClient.test.ts b/packages/fx-core/tests/component/driver/aad/aadAppClient.test.ts index 0dc5567465..bf68d1e766 100644 --- a/packages/fx-core/tests/component/driver/aad/aadAppClient.test.ts +++ b/packages/fx-core/tests/component/driver/aad/aadAppClient.test.ts @@ -492,7 +492,7 @@ describe("AadAppClient", async () => { expect(err.source).equals("AadAppClient"); expect(err.name).equals("DeleteOrUpdatePermissionFailed"); expect(err.message).equals( - "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable is changed for selected environment. Ensure your permission id(s) are identical with the actual Microsoft Entra application and try again.\n" + "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable has changed for selected environment. Ensure your permission id(s) match the actual Microsoft Entra application and try again.\n" ); } ); @@ -519,7 +519,7 @@ describe("AadAppClient", async () => { expect(err.source).equals("AadAppClient"); expect(err.name).equals("HostNameNotOnVerifiedDomain"); expect(err.message).equals( - "Unable to set identifierUri because the value is not on verified domain: Mocked error message" + "Unable to set identifierUri as the value is not on verified domain: Mocked error message" ); expect(err.helpLink).equals("https://aka.ms/teamsfx-multi-tenant"); } From c6664c95ed86b201f9423d3835f22cdbf3ab366e Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:10:40 +0530 Subject: [PATCH 3/4] Update aadManifestHelper.test.ts --- .../tests/component/driver/aad/aadManifestHelper.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts b/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts index 5f87ea368c..2417586a8c 100644 --- a/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts +++ b/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts @@ -172,7 +172,7 @@ describe("Microsoft Entra manifest helper Test", () => { .expect(() => { AadManifestHelper.processRequiredResourceAccessInManifest(manifestWithInvalidSting); }) - .to.throw("Some item(s) in requiredResourceAccess misses resourceAppId property."); + .to.throw("Some requiredResourceAccess item(s) are missing resourceAppId property."); }); it("processRequiredResourceAccessInManifest with no resourceAccess id", async () => { @@ -193,7 +193,7 @@ describe("Microsoft Entra manifest helper Test", () => { .expect(() => { AadManifestHelper.processRequiredResourceAccessInManifest(manifestWithInvalidSting); }) - .to.throw("Some item(s) in resourceAccess misses id property."); + .to.throw("Some resourceAccess item(s) are missing id property."); }); it("processRequiredResourceAccessInManifest with no requiredResourceAccess", async () => { From 5c5154c52d5687d3cad1c76331d2cddc855b29d9 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:31:36 +0530 Subject: [PATCH 4/4] Update aadManifestHelper.test.ts --- .../tests/component/driver/aad/aadManifestHelper.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts b/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts index 2417586a8c..2a2fe38e6e 100644 --- a/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts +++ b/packages/fx-core/tests/component/driver/aad/aadManifestHelper.test.ts @@ -172,7 +172,7 @@ describe("Microsoft Entra manifest helper Test", () => { .expect(() => { AadManifestHelper.processRequiredResourceAccessInManifest(manifestWithInvalidSting); }) - .to.throw("Some requiredResourceAccess item(s) are missing resourceAppId property."); + .to.throw("Some requiredResourceAccess item(s) are missing the resourceAppId property."); }); it("processRequiredResourceAccessInManifest with no resourceAccess id", async () => {