@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/resource/yaml-schema/yaml.schema.json

@@ -14,7 +14,7 @@
     "version": {
       "type": "string",
       "description": "The version of the yaml file schema",
-      "const": "v1.6"
+      "const": "v1.5"
     },
     "additionalMetadata": {
       "type": "object",
@@ -59,7 +59,6 @@
           { "$ref": "#/definitions/teamsAppCreate" },
           { "$ref": "#/definitions/teamsAppValidateManifest" },
           { "$ref": "#/definitions/teamsAppValidateAppPackage" },
-          { "$ref": "#/definitions/teamsAppValidateWithTestCases" },
           { "$ref": "#/definitions/teamsAppZipAppPackage" },
           { "$ref": "#/definitions/teamsAppUpdate" },
           { "$ref": "#/definitions/teamsAppPublishAppPackage" },
@@ -807,50 +806,6 @@
         }
       }
     },
-    "teamsAppValidateWithTestCases": {
-      "type": "object",
-      "additionalProperties": false,
-      "description": "Async Valiation Tests. Refer to https://aka.ms/teamsfx-actions/teamsapp-validate for more details.",
-      "required": ["uses", "with"],
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "An optional name of this action."
-        },
-        "env": {
-          "type": "object",
-          "description": "Define environment variables for this action.",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "uses": {
-          "type": "string",
-          "description": "This action will trigger async validations for the Teams app package file. Refer to https://aka.ms/teamsfx-actions/teamsapp-validate for more details.",
-          "const": "teamsApp/validateWithTestCases"
-        },
-        "with": {
-          "type": "object",
-          "additionalProperties": false,
-          "description": "Parameters for this action",
-          "required": ["appPackagePath"],
-          "properties": {
-            "appPackagePath": {
-              "type": "string",
-              "description": "Path to zipped Teams app package file."
-            },
-            "showMessage": {
-              "type": "boolean",
-              "description": "Show message or not."
-            },
-            "showProgressBar": {
-              "type": "boolean",
-              "description": "Show progress bar or not."
-            }
-          }
-        }
-      }
-    },
     "teamsAppZipAppPackage": {
       "type": "object",
       "additionalProperties": false,
@@ -1761,15 +1716,6 @@
             "refreshUrl": {
               "type": "string",
               "description": "The refresh url of OAuth registration."
-            },
-            "isPKCEEnabled": {
-              "type": "boolean",
-              "description": "Whether PKCE is enabled for OAuth registration. Default is false."
-            },
-            "identityProvider": {
-              "type": "string",
-              "description": "The identity provider of OAuth registration.",
-              "enum": ["MicrosoftEntra", "Custom"]
             }
           }
         },
@@ -1829,10 +1775,6 @@
               "type": "string",
               "description": "Which tenant can access the OAuth registration? Values can be \"HomeTenant\" or \"AnyTenant\". Default is \"AnyTenant\".",
               "enum": ["HomeTenant", "AnyTenant"]
-            },
-            "isPKCEEnabled": {
-              "type": "boolean",
-              "description": "Whether PKCE is enabled for OAuth registration. Default is false."
             }
           }
         }

package/templates/core/v3Migration/js.ts.app.local.yml

@@ -256,7 +256,7 @@ deploy:
         M365_CLIENT_SECRET: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
         M365_TENANT_ID: $\{{AAD_APP_TENANT_ID}}
         M365_AUTHORITY_HOST: $\{{AAD_APP_OAUTH_AUTHORITY_HOST}}
-        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3;27922004-5251-4030-b22d-91ecd9a37ea4
+        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3
 
   {{/if}}
   {{#npmCommands}}
@@ -303,7 +303,7 @@ deploy:
         AAD_METADATA_ADDRESS: $\{{AAD_APP_OAUTH_AUTHORITY}}/v2.0/.well-known/openid-configuration
         OAUTH_AUTHORITY: $\{{AAD_APP_OAUTH_AUTHORITY}}
         TAB_APP_ENDPOINT: $\{{ {{~../../placeholderMappings.tabEndpoint~}} }}
-        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3;27922004-5251-4030-b22d-91ecd9a37ea4
+        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3
         URLS: http://localhost:55000
 
   {{/authStart}}
@@ -343,7 +343,7 @@ deploy:
         M365_CLIENT_SECRET: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
         M365_TENANT_ID: $\{{AAD_APP_TENANT_ID}}
         M365_AUTHORITY_HOST: $\{{AAD_APP_OAUTH_AUTHORITY_HOST}}
-        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3;27922004-5251-4030-b22d-91ecd9a37ea4
+        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3
 
   {{/if}}
 {{/config.deploy}}

package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json

@@ -87,12 +87,6 @@
           "permissionIds": [
               "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
           ]
-      },
-      {
-          "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
       }
   ],
   "identifierUris": [

package/templates/plugins/resource/aad/manifest/aad.template.json

@@ -87,12 +87,6 @@
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
-        },
-        {
-            "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
-            "permissionIds": [
-                "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-            ]
         }
     ],
     "identifierUris": [

package/templates/plugins/resource/aad/manifest/bot/aad.manifest.template.json

@@ -87,12 +87,6 @@
           "permissionIds": [
               "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
           ]
-      },
-      {
-          "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
       }
   ],
   "identifierUris": [

package/templates/plugins/resource/aad/manifest/tab/aad.manifest.template.json

@@ -87,12 +87,6 @@
           "permissionIds": [
               "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
           ]
-      },
-      {
-          "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
       }
   ],
   "identifierUris": [

package/build/client/teamsDevPortalClient.d.ts

@@ -1,128 +0,0 @@
-/// <reference types="node" />
-import { AxiosInstance } from "axios";
-import { ApiSecretRegistration, ApiSecretRegistrationUpdate } from "../component/driver/teamsApp/interfaces/ApiSecretRegistration";
-import { AsyncAppValidationDetailsResponse } from "../component/driver/teamsApp/interfaces/AsyncAppValidationDetailsResponse";
-import { AsyncAppValidationResponse } from "../component/driver/teamsApp/interfaces/AsyncAppValidationResponse";
-import { AsyncAppValidationResultsResponse } from "../component/driver/teamsApp/interfaces/AsyncAppValidationResultsResponse";
-import { OauthConfigurationId } from "../component/driver/teamsApp/interfaces/OauthConfigurationId";
-import { OauthRegistration } from "../component/driver/teamsApp/interfaces/OauthRegistration";
-import { IPublishingAppDenition } from "../component/driver/teamsApp/interfaces/appdefinitions/IPublishingAppDefinition";
-import { IValidationResult } from "../component/driver/teamsApp/interfaces/appdefinitions/IValidationResult";
-import { AppDefinition } from "../component/driver/teamsApp/interfaces/appdefinitions/appDefinition";
-import { AppUser } from "../component/driver/teamsApp/interfaces/appdefinitions/appUser";
-import { IBotRegistration } from "../component/resource/botService/appStudio/interfaces/IBotRegistration";
-export declare class RetryHandler {
-    static RETRIES: number;
-    static Retry<T>(fn: () => Promise<T>): Promise<T | undefined>;
-}
-export declare class TeamsDevPortalClient {
-    regionEndpoint?: string;
-    getGlobalEndpoint(): string;
-    setRegionEndpoint(regionEndpoint: string): void;
-    setRegionEndpointByToken(authSvcToken: string): Promise<void>;
-    getEndpoint(): string;
-    /**
-     * Creates a new axios instance to call app studio to prevent setting the accessToken on global instance.
-     * @param {string}  token
-     * @returns {AxiosInstance}
-     */
-    createRequesterWithToken(token: string): AxiosInstance;
-    /**
-     * Import an app registration in app studio with the given archived file and returns the app definition.
-     * @param {string}  token - access token
-     * @param {Buffer}  file - Zip file with manifest.json and two icons
-     * @param {boolean} overwrite - whether to overrite the app if it already exists
-     * @returns {Promise<AppDefinition>}
-     */
-    importApp(token: string, file: Buffer, overwrite?: boolean): Promise<AppDefinition>;
-    listApps(token: string): Promise<AppDefinition[]>;
-    deleteApp(appStudioToken: string, teamsAppId: string): Promise<boolean>;
-    getApp(token: string, teamsAppId: string): Promise<AppDefinition>;
-    getBotId(token: string, teamsAppId: string): Promise<string | undefined>;
-    getAppPackage(token: string, teamsAppId: string): Promise<any>;
-    /**
-     * Check if app exists in the user's organization by the Teams app id
-     * @param teamsAppId
-     * @param token
-     * @param logProvider
-     * @returns
-     */
-    checkExistsInTenant(token: string, teamsAppId: string): Promise<boolean>;
-    /**
-     * Publish Teams app to Teams App Catalog
-     */
-    publishTeamsApp(token: string, teamsAppId: string, file: Buffer): Promise<string>;
-    /**
-     * Update existed publish request
-     * @param teamsAppId
-     * @param file
-     * @param token
-     * @returns
-     */
-    publishTeamsAppUpdate(token: string, teamsAppId: string, file: Buffer): Promise<string>;
-    /**
-     * Get Stagged Teams app from tenant app catalog
-     * @param teamsAppId manifest.id, which is externalId in app catalog.
-     * @param token
-     * @returns
-     */
-    getStaggedApp(token: string, teamsAppId: string): Promise<IPublishingAppDenition | undefined>;
-    getUserList(token: string, teamsAppId: string): Promise<AppUser[] | undefined>;
-    checkPermission(token: string, teamsAppId: string, userObjectId: string): Promise<string>;
-    grantPermission(token: string, teamsAppId: string, newUser: AppUser): Promise<void>;
-    /**
-     * Send the app package for partner center validation
-     * @param file
-     * @param token
-     * @returns
-     */
-    partnerCenterAppPackageValidation(token: string, file: Buffer): Promise<IValidationResult>;
-    checkUser(app: AppDefinition, newUser: AppUser): boolean;
-    /**
-     * Submit App Validation Request (In-App) for which App Definitions are stored at TDP.
-     * @param teamsAppId
-     * @param token
-     * @param timeoutSeconds
-     * @returns
-     */
-    submitAppValidationRequest(token: string, teamsAppId: string, timeoutSeconds?: number): Promise<AsyncAppValidationResponse>;
-    /**
-     * Get App validation requests sumitted by the user
-     */
-    getAppValidationRequestList(token: string, teamsAppId: string): Promise<AsyncAppValidationDetailsResponse>;
-    /**
-     * Get App validation results by provided app validation id
-     * @param appValidationId
-     * @param token
-     * @param timeoutSeconds
-     * @returns
-     */
-    getAppValidationById(token: string, appValidationId: string, timeoutSeconds?: number): Promise<AsyncAppValidationResultsResponse>;
-    getSideloadingStatus(token: string): Promise<boolean | undefined>;
-    /**
-     * Create the Api Key registration.
-     * @param token
-     * @param apiKeyRegistration
-     */
-    createApiKeyRegistration(token: string, apiKeyRegistration: ApiSecretRegistration): Promise<ApiSecretRegistration>;
-    /**
-     * Get the Api Key registration by Id.
-     * @param token
-     * @param apiSecretRegistrationId
-     */
-    getApiKeyRegistrationById(token: string, apiSecretRegistrationId: string): Promise<ApiSecretRegistration>;
-    updateApiKeyRegistration(token: string, apiKeyRegistration: ApiSecretRegistrationUpdate, apiKeyRegistrationId: string): Promise<ApiSecretRegistrationUpdate>;
-    getOauthRegistrationById(token: string, oauthRegistrationId: string): Promise<OauthRegistration>;
-    createOauthRegistration(token: string, oauthRegistration: OauthRegistration): Promise<OauthConfigurationId>;
-    updateOauthRegistration(token: string, oauthRegistration: OauthRegistration, oauthRegistrationId: string): Promise<OauthRegistration>;
-    getBotRegistration(token: string, botId: string): Promise<IBotRegistration | undefined>;
-    listBots(token: string): Promise<IBotRegistration[] | undefined>;
-    deleteBot(token: string, botId: string): Promise<void>;
-    createBotRegistration(token: string, registration: IBotRegistration, checkExistence?: boolean): Promise<void>;
-    updateMessageEndpoint(token: string, botId: string, endpoint: string): Promise<void>;
-    updateBotRegistration(token: string, botReg: IBotRegistration): Promise<void>;
-    handleBotFrameworkError(e: any, apiName: string): void | undefined;
-    wrapException(e: any, apiName: string): Error;
-}
-export declare const teamsDevPortalClient: TeamsDevPortalClient;
-//# sourceMappingURL=teamsDevPortalClient.d.ts.map

package/build/client/teamsDevPortalClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"teamsDevPortalClient.d.ts","sourceRoot":"","sources":["../../src/client/teamsDevPortalClient.ts"],"names":[],"mappings":"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"}