Skip to content

Commit de4195d

Browse files
karamem0karamem0
committed
5.0.0 release
1 parent ca4b3ab commit de4195d

File tree

63 files changed

+1329
-2295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1329
-2295
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"ghcr.io/devcontainers/features/git-lfs:1": {},
1212
"ghcr.io/devcontainers/features/node:1": {
13-
"version": "22.21.1"
13+
"version": "22.22.0"
1414
},
1515
"ghcr.io/jlaundry/devcontainer-features/azure-functions-core-tools:1": {}
1616
},
@@ -22,8 +22,10 @@
2222
"customizations": {
2323
"vscode": {
2424
"extensions": [
25+
"dbaeumer.vscode-eslint",
2526
"editorconfig.editorconfig",
2627
"github.vscode-github-actions",
28+
"ms-azuretools.vscode-azurefunctions",
2729
"ms-azuretools.vscode-bicep",
2830
"ms-dotnettools.csdevkit",
2931
"redhat.vscode-yaml",

‎.github/actions/build-manifest/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ runs:
1111
$content = Get-Content -Path ${{env.FILE_PATH}}
1212
$content = $content -Replace "{{APP_VERSION}}", "${{env.BUILD_VERSION}}"
1313
$content = $content -Replace '{{AZURE_WEB_APP_DOMAIN_NAME}}', '${{env.AZURE_WEB_APP_DOMAIN_NAME}}'
14-
$content = $content -Replace '{{MICROSOFT_APP_ID}}', '${{env.MICROSOFT_APP_ID}}'
15-
$content = $content -Replace '{{MICROSOFT_BOT_ID}}', '${{env.MICROSOFT_BOT_ID}}'
14+
$content = $content -Replace '{{MICROSOFT_TEAMS_APP_ID}}', '${{env.MICROSOFT_TEAMS_APP_ID}}'
15+
$content = $content -Replace '{{MICROSOFT_365_AGENT_ID}}', '${{env.MICROSOFT_365_AGENT_ID}}'
1616
Out-File -FilePath ${{env.FILE_PATH}} -InputObject $content -Encoding UTF8
1717
env:
1818
FILE_PATH: manifest/manifest.json

‎.github/actions/build-source/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
shell: pwsh
1818
run: |
1919
$content = Get-Content -Path ${{env.FILE_PATH}}
20-
$content = $content -Replace "{{MICROSOFT_APP_ID}}", "${{env.MICROSOFT_APP_ID}}"
20+
$content = $content -Replace "{{MICROSOFT_365_AGENT_ID}}", "${{env.MICROSOFT_365_AGENT_ID}}"
2121
Out-File -FilePath ${{env.FILE_PATH}} -InputObject $content -Encoding UTF8
2222
env:
2323
FILE_PATH: source/client/public/.well-known/microsoft-identity-association.json

‎.github/workflows/trigger-on-main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
env:
3232
AZURE_FUNCTION_APP_DOMAIN_NAME: ${{vars.AZURE_FUNCTION_APP_DOMAIN_NAME}}
3333
BUILD_VERSION: ${{vars.BUILD_VERSION}}
34-
MICROSOFT_APP_ID: ${{vars.MICROSOFT_APP_ID}}
34+
MICROSOFT_365_AGENT_ID: ${{vars.MICROSOFT_365_AGENT_ID}}
3535
TELEMETRY_CONNECTION_STRING: ${{vars.TELEMETRY_CONNECTION_STRING}}
3636
deploy-to-azure:
3737
name: Deploy to Azure
@@ -57,5 +57,5 @@ jobs:
5757
env:
5858
AZURE_WEB_APP_DOMAIN_NAME: ${{vars.AZURE_WEB_APP_DOMAIN_NAME}}
5959
BUILD_VERSION: ${{vars.BUILD_VERSION}}
60-
MICROSOFT_APP_ID: ${{vars.MICROSOFT_APP_ID}}
61-
MICROSOFT_BOT_ID: ${{vars.MICROSOFT_BOT_ID}}
60+
MICROSOFT_TEAMS_APP_ID: ${{vars.MICROSOFT_TEAMS_APP_ID}}
61+
MICROSOFT_365_AGENT_ID: ${{vars.MICROSOFT_365_AGENT_ID}}

‎bicep/main.bicep‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ param name string
44
@description('The display name for the Bot Service.')
55
param displayName string = name
66

7-
@description('The Microsoft App ID for Teams SSO.')
8-
param microsoftAppId string
7+
@description('The Microsoft 365 Agent ID for Teams SSO.')
8+
param microsoft365AgentId string
99

10-
@description('The Microsoft App Password for Teams SSO.')
10+
@description('The Microsoft 365 Agent Password for Teams SSO.')
1111
@secure()
12-
param microsoftAppPassword string
12+
param microsoft365AgentPassword string
1313

14-
@description('The Microsoft App Tenant ID for Teams SSO.')
15-
param microsoftAppTenantId string
14+
@description('The Microsoft 365 Agent Tenant ID for Teams SSO.')
15+
param microsoft365AgentTenantId string
1616

1717
module userAssignedIdentity './modules/user-assigned-identity.bicep' = {
1818
name: '${name}-user-assigned-identity'
@@ -56,9 +56,9 @@ module webApp './modules/web-app.bicep' = {
5656
openAIServiceDeploymentName: openAIService.outputs.openAIServiceDeploymentName
5757
storageBlobsContainerName: storageAccount.outputs.storageBlobsContainerName
5858
storageBlobsEndpoint: storageAccount.outputs.storageBlobsEndpoint
59-
microsoftAppId: microsoftAppId
60-
microsoftAppPassword: microsoftAppPassword
61-
microsoftAppTenantId: microsoftAppTenantId
59+
microsoft365AgentId: microsoft365AgentId
60+
microsoft365AgentPassword: microsoft365AgentPassword
61+
microsoft365AgentTenantId: microsoft365AgentTenantId
6262
}
6363
}
6464

@@ -72,9 +72,9 @@ module functionApp './modules/function-app.bicep' = {
7272
storageAccountName: storageAccount.outputs.storageAccountName
7373
storageBlobsContainerName: storageAccount.outputs.storageBlobsContainerName
7474
storageBlobsEndpoint: storageAccount.outputs.storageBlobsEndpoint
75-
microsoftAppId: microsoftAppId
76-
microsoftAppPassword: microsoftAppPassword
77-
microsoftAppTenantId: microsoftAppTenantId
75+
microsoft365AgentId: microsoft365AgentId
76+
microsoft365AgentPassword: microsoft365AgentPassword
77+
microsoft365AgentTenantId: microsoft365AgentTenantId
7878
}
7979
}
8080

@@ -84,7 +84,7 @@ module botService './modules/bot-service.bicep' = {
8484
name: 'bot-${name}'
8585
displayName: displayName
8686
endpoint: 'https://${webApp.outputs.webAppHostName}/api/messages'
87-
msaAppId: microsoftAppId
88-
msaAppTenantId: microsoftAppTenantId
87+
microsoft365AgentId: microsoft365AgentId
88+
microsoft365AgentTenantId: microsoft365AgentTenantId
8989
}
9090
}

‎bicep/modules/bot-service.bicep‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ param endpoint string
1616
@description('The type of Microsoft App used for the bot authentication.')
1717
param msaAppType string = 'SingleTenant'
1818

19-
@description('The Microsoft App ID or User Assigned Managed Identity for the bot authentication.')
20-
param msaAppId string
19+
@description('The Microsoft 365 Agent ID or User Assigned Managed Identity for the bot authentication.')
20+
param microsoft365AgentId string
2121

22-
@description('The Microsoft App Tenant ID for the bot authentication.')
23-
param msaAppTenantId string = tenant().tenantId
22+
@description('The Microsoft 365 Agent Tenant ID for the bot authentication.')
23+
param microsoft365AgentTenantId string = tenant().tenantId
2424

2525
resource botService 'Microsoft.BotService/botServices@2022-09-15' = {
2626
name: name
@@ -33,8 +33,8 @@ resource botService 'Microsoft.BotService/botServices@2022-09-15' = {
3333
displayName: displayName
3434
endpoint: endpoint
3535
msaAppType: msaAppType
36-
msaAppId: msaAppId
37-
msaAppTenantId: msaAppTenantId
36+
msaAppId: microsoft365AgentId
37+
msaAppTenantId: microsoft365AgentTenantId
3838
}
3939
}
4040

‎bicep/modules/function-app.bicep‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ param storageBlobsEndpoint string
2222
@description('The container name of the Storage Blobs to associate with the Function App.')
2323
param storageBlobsContainerName string
2424

25-
@description('The Microsoft App ID for the bot authentication.')
26-
param microsoftAppId string
25+
@description('The Microsoft 365 Agent ID for the bot authentication.')
26+
param microsoft365AgentId string
2727

28-
@description('The Microsoft App Password for the bot authentication.')
28+
@description('The Microsoft 365 Agent Password for the bot authentication.')
2929
@secure()
30-
param microsoftAppPassword string
30+
param microsoft365AgentPassword string
3131

32-
@description('The Microsoft App Tenant ID for the bot authentication.')
33-
param microsoftAppTenantId string
32+
@description('The Microsoft 365 Agent Tenant ID for the bot authentication.')
33+
param microsoft365AgentTenantId string
3434

3535
resource functionApp 'Microsoft.Web/sites@2024-11-01' = {
3636
name: name
@@ -80,15 +80,15 @@ resource functionApp 'Microsoft.Web/sites@2024-11-01' = {
8080
}
8181
{
8282
name: 'BotFramework__MicrosoftAppId'
83-
value: microsoftAppId
83+
value: microsoft365AgentId
8484
}
8585
{
8686
name: 'BotFramework__MicrosoftAppPassword'
87-
value: microsoftAppPassword
87+
value: microsoft365AgentPassword
8888
}
8989
{
9090
name: 'BotFramework__MicrosoftAppTenantId'
91-
value: microsoftAppTenantId
91+
value: microsoft365AgentTenantId
9292
}
9393
{
9494
name: 'FUNCTIONS_EXTENSION_VERSION'
@@ -100,15 +100,15 @@ resource functionApp 'Microsoft.Web/sites@2024-11-01' = {
100100
}
101101
{
102102
name: 'MicrosoftIdentity__ClientId'
103-
value: microsoftAppId
103+
value: microsoft365AgentId
104104
}
105105
{
106106
name: 'MicrosoftIdentity__ClientSecret'
107-
value: microsoftAppPassword
107+
value: microsoft365AgentPassword
108108
}
109109
{
110110
name: 'MicrosoftIdentity__TenantId'
111-
value: microsoftAppTenantId
111+
value: microsoft365AgentTenantId
112112
}
113113
{
114114
name: 'WEBSITE_RUN_FROM_PACKAGE'

‎bicep/modules/web-app.bicep‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ param storageBlobsEndpoint string
2525
@description('The container name of the Storage Blobs to associate with the Web App.')
2626
param storageBlobsContainerName string
2727

28-
@description('The Microsoft App ID for the bot authentication.')
29-
param microsoftAppId string
28+
@description('The Microsoft 365 Agent ID for the bot authentication.')
29+
param microsoft365AgentId string
3030

31-
@description('The Microsoft App Password for the bot authentication.')
31+
@description('The Microsoft 365 Agent Password for the bot authentication.')
3232
@secure()
33-
param microsoftAppPassword string
33+
param microsoft365AgentPassword string
3434

35-
@description('The Microsoft App Tenant ID for the bot authentication.')
36-
param microsoftAppTenantId string
35+
@description('The Microsoft 365 Agent Tenant ID for the bot authentication.')
36+
param microsoft365AgentTenantId string
3737

3838
resource webApp 'Microsoft.Web/sites@2024-11-01' = {
3939
name: name
@@ -75,15 +75,15 @@ resource webApp 'Microsoft.Web/sites@2024-11-01' = {
7575
}
7676
{
7777
name: 'BotFramework__MicrosoftAppId'
78-
value: microsoftAppId
78+
value: microsoft365AgentId
7979
}
8080
{
8181
name: 'BotFramework__MicrosoftAppPassword'
82-
value: microsoftAppPassword
82+
value: microsoft365AgentPassword
8383
}
8484
{
8585
name: 'BotFramework__MicrosoftAppTenantId'
86-
value: microsoftAppTenantId
86+
value: microsoft365AgentTenantId
8787
}
8888
{
8989
name: 'WEBSITE_RUN_FROM_PACKAGE'

‎manifest/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.22/MicrosoftTeams.schema.json",
33
"manifestVersion": "1.22",
44
"version": "{{APP_VERSION}}",
5-
"id": "{{MICROSOFT_APP_ID}}",
5+
"id": "{{MICROSOFT_TEAMS_APP_ID}}",
66
"name": {
77
"short": "Commistant",
88
"full": "Commistant"
@@ -37,7 +37,7 @@
3737
],
3838
"bots": [
3939
{
40-
"botId": "{{MICROSOFT_BOT_ID}}",
40+
"botId": "{{MICROSOFT_365_AGENT_ID}}",
4141
"scopes": [
4242
"groupChat"
4343
],

0 commit comments

Comments
 (0)