Release 5.5.2 (#1379)

OfficeDev · Apr 1, 2024 · 876fbba · 876fbba
1 parent 6f90c51
commit 876fbba
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 128 deletions.
diff --git a/Deployment/DOD/azuredeploy.json b/Deployment/DOD/azuredeploy.json
@@ -1385,32 +1385,6 @@
               },
               "enabledState": "Enabled"
             }
-          },
-          {
-            "name": "routingRule2",
-            "properties": {
-              "frontendEndpoints": [
-                {
-                  "id": "[concat(resourceId('Microsoft.Network/frontdoors', variables('frontDoorName')), concat('/frontendEndpoints/', variables('frontDoorName'), '-azurefd-us'))]"
-                }
-              ],
-              "acceptedProtocols": [
-                "Https"
-              ],
-              "patternsToMatch": [
-                "/api/*"
-              ],
-              "routeConfiguration": {
-                "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorRedirectConfiguration",
-                "customFragment": null,
-                "customHost": "[variables('botAppDomain')]",
-                "customPath": "",
-                "redirectProtocol": "HttpsOnly",
-                "customQueryString": null,
-                "redirectType": "PermanentRedirect"
-              },
-              "enabledState": "Enabled"
-            }
           }
         ],
         "backendPoolsSettings": {

diff --git a/Deployment/GCCH/azuredeploy.json b/Deployment/GCCH/azuredeploy.json
@@ -1385,32 +1385,6 @@
               },
               "enabledState": "Enabled"
             }
-          },
-          {
-            "name": "routingRule2",
-            "properties": {
-              "frontendEndpoints": [
-                {
-                  "id": "[concat(resourceId('Microsoft.Network/frontdoors', variables('frontDoorName')), concat('/frontendEndpoints/', variables('frontDoorName'), '-azurefd-us'))]"
-                }
-              ],
-              "acceptedProtocols": [
-                "Https"
-              ],
-              "patternsToMatch": [
-                "/api/*"
-              ],
-              "routeConfiguration": {
-                "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorRedirectConfiguration",
-                "customFragment": null,
-                "customHost": "[variables('botAppDomain')]",
-                "customPath": "",
-                "redirectProtocol": "HttpsOnly",
-                "customQueryString": null,
-                "redirectType": "PermanentRedirect"
-              },
-              "enabledState": "Enabled"
-            }
           }
         ],
         "backendPoolsSettings": {

diff --git a/Deployment/azuredeploy.json b/Deployment/azuredeploy.json
@@ -1321,32 +1321,6 @@
               },
               "enabledState": "Enabled"
             }
-          },
-          {
-            "name": "routingRule2",
-            "properties": {
-              "frontendEndpoints": [
-                {
-                  "id": "[resourceId('Microsoft.Network/frontDoors/frontendEndpoints', variables('frontDoorName'), 'frontendEndpoint1')]"
-                }
-              ],
-              "acceptedProtocols": [
-                "Https"
-              ],
-              "patternsToMatch": [
-                "/api/*"
-              ],
-              "routeConfiguration": {
-                "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorRedirectConfiguration",
-                "customFragment": null,
-                "customHost": "[variables('botAppDomain')]",
-                "customPath": "",
-                "redirectProtocol": "HttpsOnly",
-                "customQueryString": null,
-                "redirectType": "PermanentRedirect"
-              },
-              "enabledState": "Enabled"
-            }
           }
         ],
         "enabledState": "Enabled",

diff --git a/Deployment/azuredeploywithcert.json b/Deployment/azuredeploywithcert.json
@@ -1282,32 +1282,6 @@
               },
               "enabledState": "Enabled"
             }
-          },
-          {
-            "name": "routingRule2",
-            "properties": {
-              "frontendEndpoints": [
-                {
-                  "id": "[resourceId('Microsoft.Network/frontDoors/frontendEndpoints', variables('frontDoorName'), 'frontendEndpoint1')]"
-                }
-              ],
-              "acceptedProtocols": [
-                "Https"
-              ],
-              "patternsToMatch": [
-                "/api/*"
-              ],
-              "routeConfiguration": {
-                "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorRedirectConfiguration",
-                "customFragment": null,
-                "customHost": "[variables('botAppDomain')]",
-                "customPath": "",
-                "redirectProtocol": "HttpsOnly",
-                "customQueryString": null,
-                "redirectType": "PermanentRedirect"
-              },
-              "enabledState": "Enabled"
-            }
           }
         ],
         "enabledState": "Enabled",

diff --git a/Manifest/manifest_authors.json b/Manifest/manifest_authors.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json",
   "manifestVersion": "1.5",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "id": "1c07cd26-a088-4db8-8928-ace382fa219f",
   "packageName": "com.microsoft.teams.companycommunicator.authors",
   "developer": {

diff --git a/Manifest/manifest_users.json b/Manifest/manifest_users.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json",
   "manifestVersion": "1.5",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "id": "148a66bb-e83d-425a-927d-09f4299a9274",
   "packageName": "com.microsoft.teams.companycommunicator",
   "developer": {

diff --git a/Source/CompanyCommunicator.Common/Microsoft.Teams.Apps.CompanyCommunicator.Common.csproj b/Source/CompanyCommunicator.Common/Microsoft.Teams.Apps.CompanyCommunicator.Common.csproj
@@ -16,19 +16,18 @@
     </AssemblyAttribute>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AdaptiveCards" Version="1.0.6" />
-    <PackageReference Include="Azure.Core" Version="1.25.0" />
-    <PackageReference Include="Azure.Identity" Version="1.3.0" />
-    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.1.2" />
+    <PackageReference Include="AdaptiveCards" Version="1.2.4" />
+    <PackageReference Include="Azure.Core" Version="1.35.0" />
+    <PackageReference Include="Azure.Identity" Version="1.10.3" />
+    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.15.0" />
     <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.2.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.22" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.3" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.19.2" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
     <PackageReference Include="Microsoft.Graph" Version="3.22.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.50.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.56.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Polly" Version="7.2.1" />
     <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />

diff --git a/...e/CompanyCommunicator.Data.Func/Microsoft.Teams.Apps.CompanyCommunicator.Data.Func.csproj b/...e/CompanyCommunicator.Data.Func/Microsoft.Teams.Apps.CompanyCommunicator.Data.Func.csproj
@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.6.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="4.3.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.9.6" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.11.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.14" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.8" />

diff --git a/...e/CompanyCommunicator.Prep.Func/Microsoft.Teams.Apps.CompanyCommunicator.Prep.Func.csproj b/...e/CompanyCommunicator.Prep.Func/Microsoft.Teams.Apps.CompanyCommunicator.Prep.Func.csproj
@@ -17,11 +17,11 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
     <PackageReference Include="CsvHelper" Version="15.0.5" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.6.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="4.3.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.9.6" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.11.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.14" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.19.2" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.2" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Microsoft.Graph" Version="3.22.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />

diff --git a/...e/CompanyCommunicator.Send.Func/Microsoft.Teams.Apps.CompanyCommunicator.Send.Func.csproj b/...e/CompanyCommunicator.Send.Func/Microsoft.Teams.Apps.CompanyCommunicator.Send.Func.csproj
@@ -12,9 +12,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="4.3.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.11.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.14" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.19.2" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.2" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.8" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />

diff --git a/Source/CompanyCommunicator/ClientApp/package.json b/Source/CompanyCommunicator/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "company-communicator",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "private": true,
   "dependencies": {
     "@fluentui/react": "^8.110.3",
@@ -53,6 +53,9 @@
       "last 1 safari version"
     ]
   },
+  "overrides": {
+    "@babel/traverse": "7.23.9"
+  },
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@types/color-hash": "^1.0.2",

diff --git a/Source/CompanyCommunicator/Microsoft.Teams.Apps.CompanyCommunicator.csproj b/Source/CompanyCommunicator/Microsoft.Teams.Apps.CompanyCommunicator.csproj
@@ -10,19 +10,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.3.0" />
+    <PackageReference Include="Azure.Identity" Version="1.10.3" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.1.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.20" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.20" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.5" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.6.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.19.2" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.9.6" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.2" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.5" />
     <PackageReference Include="Microsoft.Graph" Version="3.22.0" />
     <PackageReference Include="Microsoft.Graph.Core" Version="1.24.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.13.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.13.4" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">

diff --git a/Wiki/Authorization-issue-fix.md b/Wiki/Authorization-issue-fix.md
@@ -0,0 +1,20 @@
+## Improved security for Company Communicator app template authoring experience
+
+A recent security change in the Microsoft Teams client may cause an error to appear in the Company Communicator app template authoring experience in the Microsoft Teams. The users in your organization might see an error while accessing the message authoring experience in the Company Communicator app in Teams, with the error message **“Sorry, an error occurred while trying to access the service”**. Users will observe this issue on the Classic Teams web client, and also on the new Teams desktop and web clients. This can be observed in various environments like Commercial, GCC, GCC-High, and DoD and the below fix will be applicable to all the environments respectively.
+
+The issue can be addressed with a configuration change. The following steps will guide you through the process of updating the configuration to address it and ensure that the Company Communicator app template authoring experience is secure - 
+
+
+- Open the Azure portal, locate and select Company Communicator app Resource group by using the search bar, or navigate to Resource groups from the Azure portal menu.
+- Select the Azure Front Door resource from the list of resources in the Company Communicator app Resource group.
+- Under Settings section in the left-hand side menu, locate the Front Door designer.
+![Front Door Designer View](images/frontdoor_designer.png)
+
+- Select **"routingRule2"** that was created during the Company Communicator app deployment. 
+- Update the status of the routing rule to **Disabled** and click on **Update**.
+![Disable Routing Rule 2 View](images/disable_routing_rule.png)
+
+- Click on **Save** to save the changes.
+- Browse to the App Service resource under the CC resource group and restart the app service.
+- Users may also need to clear the cache on the Teams desktop client ([Classic Teams or new Teams](https://learn.microsoft.com/en-us/microsoftteams/troubleshoot/teams-administration/clear-teams-cache)).
+
diff --git a/Wiki/Release-notes.md b/Wiki/Release-notes.md
@@ -6,6 +6,7 @@ Cumulative improvements in Company Communicator App.
 
 |Version |Release Date |
 |---|---|
+| 5.5.2 | Apr 1, 2024
 | 5.5.1 | Feb 22, 2024
 | 5.5 | Sep 20, 2023
 | 5.4.1 | June 14, 2023
@@ -28,6 +29,11 @@ Cumulative improvements in Company Communicator App.
 | 1.0 | Dec 20, 2019
 
 ### Company Communicator feature release notes
+#### 5.5.2 (April 1, 2024)
+##### Changes introduced
+- Updated libraries to address critical and high security alerts.
+- Permanent fix for the authorization issue in the CC author app.
+
 #### 5.5.1 (February 22, 2024)
 ##### Changes introduced
 - Migration of classic Application Insights to workspace-based Application Insights.

diff --git a/Wiki/Support-policy.md b/Wiki/Support-policy.md
@@ -27,5 +27,6 @@ For assistance or inquiries, you can reach out to our support team by opening a
 
 If you are using modified versions of Company Communicator, you may need to adjust your code base to stay current with the latest updates from the official repo. Here are the principal areas that have been impacted by the recent updates:
 
-- **Authorization problem:** Version 5.5 has been launched by the official repo to address the authorization issue that happened when the redirect removed the Authorization header. This version offers a temporary solution. We are currently developing a permanent fix for this issue, which might involve some changes in Azure front door routing rules. Please be aware that a permanent fix for this will be posted on GitHub in the next few weeks.
+- **Authorization problem:** Version 5.5 has been launched by the official repo to address the authorization issue that happened when the redirect removed the Authorization header. This version offers a temporary solution. 
+We have released a permanent fix to the authorization issue in v5.5.2 which involves change in Azure front door routing rules. Please find the below link for detailed steps to mitigate the authorization issue: [Authorization issue mitigation steps](https://github.com/OfficeDev/microsoft-teams-apps-company-communicator/wiki/Authorization-issue-fix).
 - **Application Insights migration:** The official repo has moved to workspace-based Application Insights, as the classic Application Insights in Azure Monitor will be retired on 29 February 2024. This version creates a new Log Analytics workspace as part of version 5.5.1. For details, please refer to the [We’re retiring Classic Application Insights on 29 February 2024](https://azure.microsoft.com/en-us/updates/we-re-retiring-classic-application-insights-on-29-february-2024/).
diff --git a/Wiki/images/disable_routing_rule.png b/Wiki/images/disable_routing_rule.png
diff --git a/Wiki/images/frontdoor_designer.png b/Wiki/images/frontdoor_designer.png