Updates to card name

samples/msgext-product-support-sso-ts/.gitignore

@@ -1,5 +1,6 @@
 # TeamsFx files
 env/.env.*.user
+env/.env.dev
 env/.env.local
 .localConfigs
 appPackage/build

samples/msgext-product-support-sso-ts/appPackage/manifest.json

@@ -11,7 +11,7 @@
         "termsOfUseUrl": "https://www.example.com/privacy"
     },
     "icons": {
-        "color": "color-local.png",
+        "color": "color-${{TEAMSFX_ENV}}.png",
         "outline": "outline.png"
     },
     "name": {

samples/msgext-product-support-sso-ts/env/.env.dev

@@ -5,12 +5,18 @@ TEAMSFX_ENV=dev
 APP_NAME_SUFFIX=dev
 
 # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups.
-AZURE_SUBSCRIPTION_ID=
-AZURE_RESOURCE_GROUP_NAME=
+AZURE_SUBSCRIPTION_ID
+AZURE_RESOURCE_GROUP_NAME=rg-msgextproductsupportssots-dev
 RESOURCE_SUFFIX=
 
 # Generated during provision, you can also add your own variables.
 BOT_ID=
 TEAMS_APP_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
-BOT_DOMAIN=
+BOT_DOMAIN=
+APP_DISPLAY_NAME=Contoso products
+APP_INTERNAL_NAME=msgext-product-support-sso-ts
+
+SPO_HOSTNAME=m365404404.sharepoint.com
+SPO_SITE_URL=sites/productmarketing
+CONNECTION_NAME=MicrosoftGraph

samples/msgext-product-support-sso-ts/src/activityHandler/HandleAdaptiveCardInvoke.ts

@@ -10,8 +10,8 @@ import {
 import {AuthService} from '../services/AuthService';
 import {GraphService} from '../services/GraphService';
 import * as AdaptiveCards from 'adaptivecards-templating';
-import viewProduct from '../adaptiveCards/viewProduct.json';
-import editProduct from '../adaptiveCards/editForm.json';
+import viewProduct from '../adaptiveCards/product-card.json';
+import editProduct from '../adaptiveCards/edit-card.json';
 import { ThumbnailSet } from '@microsoft/microsoft-graph-types';
 import config from '../config';
 export const HandleAdaptiveCardInvoke = async (

samples/msgext-product-support-sso-ts/src/activityHandler/HandleMessagingExtensionQuery.ts

@@ -5,7 +5,7 @@ import {
   MessagingExtensionResponse,
 } from 'botbuilder';
 import * as AdaptiveCards from 'adaptivecards-templating';
-import viewProduct from '../adaptiveCards/viewProduct.json';
+import viewProduct from '../adaptiveCards/product-card.json';
 import {AuthService} from '../services/AuthService';
 import {GraphService} from '../services/GraphService';
 import {cleanupParam} from '../util';

samples/msgext-product-support-sso-ts/teamsapp.yml

@@ -1,96 +1,83 @@
-# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.1.0/yaml.schema.json
 # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
 # Visit https://aka.ms/teamsfx-actions for details on actions
-version: 1.0.0
+version: 1.1.0
 
 environmentFolderPath: ./env
 
-# Triggered when 'teamsfx provision' is executed
 provision:
-  # Creates a Teams app
+
   - uses: teamsApp/create
     with:
-      # Teams app name
-      name: msgext-product-support-sso-ts${{APP_NAME_SUFFIX}}
-    # Write the information of created resources into environment file for
-    # the specified environment variable(s).
+      name: ${{APP_INTERNAL_NAME}}-${{TEAMSFX_ENV}}
     writeToEnvironmentFile:
       teamsAppId: TEAMS_APP_ID
 
-  # Create or reuse an existing Microsoft Entra application for bot.
-  - uses: botAadApp/create
+  - uses: aadApp/create
+    with:
+      name: ${{APP_INTERNAL_NAME}}-bot-${{TEAMSFX_ENV}}
+      generateClientSecret: true
+      signInAudience: AzureADMultipleOrgs
+    writeToEnvironmentFile:
+      clientId: BOT_ID
+      clientSecret: SECRET_BOT_PASSWORD
+      objectId: BOT_AAD_APP_OBJECT_ID
+      tenantId: BOT_AAD_APP_TENANT_ID
+      authority: BOT_AAD_APP_OAUTH_AUTHORITY
+      authorityHost: BOT_AAD_APP_OAUTH_AUTHORITY_HOST
+
+  - uses: aadApp/create
     with:
-      # The Microsoft Entra application's display name
-      name: msgext-product-support-sso-ts${{APP_NAME_SUFFIX}}
+      name: ${{APP_INTERNAL_NAME}}-graph-${{TEAMSFX_ENV}}
+      generateClientSecret: true
+      signInAudience: AzureADMultipleOrgs
     writeToEnvironmentFile:
-      # The Microsoft Entra application's client id created for bot.
-      botId: BOT_ID
-      # The Microsoft Entra application's client secret created for bot.
-      botPassword: SECRET_BOT_PASSWORD
+      clientId: GRAPH_ENTRA_APP_ID
+      clientSecret: SECRET_GRAPH_ENTRA_APP_CLIENT_SECRET
+      objectId: GRAPH_AAD_APP_OBJECT_ID
+      tenantId: GRAPH_AAD_APP_TENANT_ID
+      authority: GRAPH_AAD_APP_OAUTH_AUTHORITY
+      authorityHost: GRAPH_AAD_APP_OAUTH_AUTHORITY_HOST
 
-  - uses: arm/deploy # Deploy given ARM templates parallelly.
+  - uses: arm/deploy
     with:
-      # AZURE_SUBSCRIPTION_ID is a built-in environment variable,
-      # if its value is empty, TeamsFx will prompt you to select a subscription.
-      # Referencing other environment variables with empty values
-      # will skip the subscription selection prompt.
       subscriptionId: ${{AZURE_SUBSCRIPTION_ID}}
-      # AZURE_RESOURCE_GROUP_NAME is a built-in environment variable,
-      # if its value is empty, TeamsFx will prompt you to select or create one
-      # resource group.
-      # Referencing other environment variables with empty values
-      # will skip the resource group selection prompt.
       resourceGroupName: ${{AZURE_RESOURCE_GROUP_NAME}}
       templates:
-        - path: ./infra/azure.bicep # Relative path to this file
-          # Relative path to this yaml file.
-          # Placeholders will be replaced with corresponding environment
-          # variable before ARM deployment.
+        - path: ./infra/azure.bicep 
           parameters: ./infra/azure.parameters.json
-          # Required when deploying ARM template
-          deploymentName: Create-resources-for-me
-      # Teams Toolkit will download this bicep CLI version from github for you,
-      # will use bicep CLI in PATH if you remove this config.
+          deploymentName: Create-resources-for-${{APP_INTERNAL_NAME}}-${{TEAMSFX_ENV}}
       bicepCliVersion: v0.9.1
 
-  # Validate using manifest schema
+  - uses: aadApp/update
+    with:
+      manifestPath: "./infra/entra/entra.bot.manifest.json"
+      outputFilePath : "./build/entra.bot.manifest.${{TEAMSFX_ENV}}.json"
+
+  - uses: aadApp/update
+    with:
+      manifestPath: "./infra/entra/entra.graph.manifest.json"
+      outputFilePath : "./build/entra.graph.manifest.${{TEAMSFX_ENV}}.json"
+
   - uses: teamsApp/validateManifest
     with:
-      # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  # Build Teams app package with latest env value
+
   - uses: teamsApp/zipAppPackage
     with:
-      # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json
-  # Validate app package using validation rules
+
   - uses: teamsApp/validateAppPackage
     with:
-      # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
-  # Will use the app id in manifest file to determine which Teams app to update.
+
   - uses: teamsApp/update
     with:
-      # Relative path to this file. This is the path for built zip file.
-      appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  # Extend your Teams app to Outlook and the Microsoft 365 app
-  - uses: teamsApp/extendToM365
-    with:
-      # Relative path to the build app package.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-    # Write the information of created resources into environment file for
-    # the specified environment variable(s).
-    writeToEnvironmentFile:
-      titleId: M365_TITLE_ID
-      appId: M365_APP_ID
 
-# Triggered when 'teamsfx deploy' is executed
 deploy:
-  # Run npm command
   - uses: cli/runNpmCommand
     name: install dependencies
     with:
@@ -99,20 +86,13 @@ deploy:
     name: build app
     with:
       args: run build --if-present
-  # Deploy your application to Azure App Service using the zip deploy feature.
-  # For additional details, refer to https://aka.ms/zip-deploy-to-app-services.
   - uses: azureAppService/zipDeploy
     with:
       # Deploy base folder
       artifactFolder: .
       # Ignore file location, leave blank will ignore nothing
       ignoreFile: .webappignore
-      # The resource id of the cloud resource to be deployed to.
-      # This key will be generated by arm/deploy action automatically.
-      # You can replace it with your existing Azure Resource id
-      # or add it to your environment variable file.
       resourceId: ${{BOT_AZURE_APP_SERVICE_RESOURCE_ID}}
-
 # Triggered when 'teamsfx publish' is executed
 publish:
   # Validate using manifest schema