Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: merge v3 back to dev #966

Merged
merged 21 commits into from
Jul 25, 2023
Merged

build: merge v3 back to dev #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6e3a530
Merge pull request #944 from OfficeDev/dev
kimizhu Jul 12, 2023
1e0fe2e
fix: close terminal when stop debug
KennethBWSong Jul 17, 2023
6b35c87
Merge pull request #945 from OfficeDev/bowsong/hotfix_debug
kimizhu Jul 17, 2023
61e3cef
fix: groupchat to groupChat
1yefuwang1 Jul 17, 2023
34f74ff
Merge pull request #946 from OfficeDev/yefu/hotfix_addin
kimizhu Jul 17, 2023
85db0b4
fix: add meeting app show not supported
JerryYangKai Jul 18, 2023
cc83b9a
Merge pull request #947 from OfficeDev/kaiyan/fixmeeting
kimizhu Jul 18, 2023
b8aa47f
fix: set authorization policy
KennethBWSong Jul 21, 2023
94a8714
fix: TTK is downloading sample from wrong tag url
HuihuiWu-Microsoft Jul 21, 2023
7249ff2
fix: set func authorization policy for todo-m365
kuojianlu Jul 21, 2023
b026110
Merge pull request #958 from HuihuiWu-Microsoft/fix-sample-url
kimizhu Jul 21, 2023
a702d2f
fix: set authorization policy
formulahendry Jul 21, 2023
7b35409
Merge pull request #960 from OfficeDev/junhan/fix-auth
eriolchan Jul 24, 2023
a8cdf91
Merge pull request #957 from OfficeDev/bowsong/hotfix_obo
eriolchan Jul 24, 2023
28372f1
fix: update enable authorization policy
xzf0587 Jul 21, 2023
d649b9f
Merge pull request #962 from OfficeDev/junhan/fix-sharenow
eriolchan Jul 24, 2023
ba42fc5
Merge pull request #959 from OfficeDev/kuojianlu/fix-func-auth
eriolchan Jul 24, 2023
1082e8d
fix: set authorization policy
huimiu Jul 24, 2023
be63c8d
Merge pull request #963 from OfficeDev/hui/auth-bug-fix
eriolchan Jul 24, 2023
41e9eac
Revert "fix: TTK is downloading sample from wrong tag url"
HuihuiWu-Microsoft Jul 25, 2023
57907de
Merge pull request #965 from HuihuiWu-Microsoft/revert-sample-fix
eriolchan Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion developer-assist-dashboard/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
{
"label": "Watch backend",
"type": "shell",
"command": "npm run watch",
"command": "npm run watch:teamsfx",
"isBackground": true,
"options": {
"cwd": "${workspaceFolder}/api"
Expand Down
2 changes: 1 addition & 1 deletion developer-assist-dashboard/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
"dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"",
"build": "tsc",
"watch": "tsc -w",
"watch:teamsfx": "tsc -w",
"prestart": "npm run build",
"start": "npx func start",
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
5 changes: 5 additions & 0 deletions developer-assist-dashboard/infra/azure.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
var allowedClientApplications = '"${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${outlookDesktopAppClientId}","${outlookWebAppClientId}"'

// Azure Storage that hosts your static web site
resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
Expand Down Expand Up @@ -173,6 +174,10 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
name: 'PLANNER_BUCKET_ID'
value: plannerBucketId
}
{
name: 'WEBSITE_AUTH_AAD_ACL'
value: '{"allowed_client_applications": [${allowedClientApplications}]}'
}
]
ftpsState: 'FtpsOnly'
}
Expand Down
5 changes: 5 additions & 0 deletions graph-connector-app/infra/azure.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
var allowedClientApplications = '["${aadAppClientId}","${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${outlookDesktopAppClientId}","${outlookWebAppClientId}"]'

// Azure Storage that hosts your static web site
resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
Expand Down Expand Up @@ -97,6 +98,10 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
name: 'ALLOWED_APP_IDS'
value: authorizedClientApplicationIds
}
{
name: 'WEBSITE_AUTH_AAD_ACL'
value: '{"allowed_client_applications": ${allowedClientApplications}}}'
}
{
name: 'M365_CLIENT_ID'
value: aadAppClientId
Expand Down
2 changes: 2 additions & 0 deletions hello-world-in-meeting/appPackage/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"groupchat"
],
"context": [
"channelTab",
"privateChatTab",
"meetingChatTab",
"meetingDetailsTab",
"meetingSidePanel"
Expand Down
2 changes: 1 addition & 1 deletion hello-world-tab-with-backend/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
{
"label": "Watch backend",
"type": "shell",
"command": "npm run watch",
"command": "npm run watch:teamsfx",
"isBackground": true,
"options": {
"cwd": "${workspaceFolder}/api"
Expand Down
2 changes: 1 addition & 1 deletion hello-world-tab-with-backend/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
"dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"",
"build": "tsc",
"watch": "tsc -w",
"watch:teamsfx": "tsc -w",
"prestart": "npm run build",
"start": "npx func start",
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
5 changes: 5 additions & 0 deletions hello-world-tab-with-backend/infra/azure.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
var allowedClientApplications = '"${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${outlookDesktopAppClientId}","${outlookWebAppClientId}"'

// Azure Storage that hosts your static web site
resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
Expand Down Expand Up @@ -118,6 +119,10 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
name: 'M365_APPLICATION_ID_URI'
value: aadApplicationIdUri
}
{
name: 'WEBSITE_AUTH_AAD_ACL'
value: '{"allowed_client_applications": [${allowedClientApplications}]}'
}
]
ftpsState: 'FtpsOnly'
}
Expand Down
2 changes: 1 addition & 1 deletion hello-world-teams-tab-and-outlook-add-in/appPackage/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"canUpdateConfiguration": true,
"scopes": [
"team",
"groupchat"
"groupChat"
]
}
],
Expand Down
9 changes: 5 additions & 4 deletions share-now/infra/teamsFx/function.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ var administratorLogin = contains(provisionParameters, 'azureSqlAdmin') ? provis
var administratorLoginPassword = contains(provisionParameters, 'azureSqlAdminPassword') ? provisionParameters['azureSqlAdminPassword'] : ''
var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint
var botId = provisionParameters['botAadAppClientId']
var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint
var m365ApplicationIdUri = 'api://${tabAppDomain}/${m365ClientId}'

var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
Expand All @@ -30,6 +29,7 @@ var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'

var allowedClientApplications = '["${m365ClientId}","${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${outlookDesktopAppClientId}","${outlookWebAppClientId}"]'
var currentAllowedOrigins = empty(currentConfigs.cors) ? [] : currentConfigs.cors.allowedOrigins

resource appConfig 'Microsoft.Web/sites/config@2021-02-01' = {
Expand All @@ -38,8 +38,8 @@ resource appConfig 'Microsoft.Web/sites/config@2021-02-01' = {
properties: {
cors: {
allowedOrigins: union(currentAllowedOrigins, [
tabAppEndpoint
])
tabAppEndpoint
])
}
}
}
Expand All @@ -48,6 +48,7 @@ resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
properties: union({
API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint
ALLOWED_APP_IDS: authorizedClientApplicationIds
WEBSITE_AUTH_AAD_ACL: '{"allowed_client_applications": ${allowedClientApplications}}}'
M365_CLIENT_ID: m365ClientId
M365_CLIENT_SECRET: m365ClientSecret
M365_TENANT_ID: m365TenantId
Expand Down
2 changes: 1 addition & 1 deletion team-central-dashboard/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
{
"label": "Watch backend",
"type": "shell",
"command": "npm run watch",
"command": "npm run watch:teamsfx",
"isBackground": true,
"options": {
"cwd": "${workspaceFolder}/api"
Expand Down
2 changes: 1 addition & 1 deletion team-central-dashboard/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
"dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"",
"build": "tsc",
"watch": "tsc -w",
"watch:teamsfx": "tsc -w",
"prestart": "npm run build",
"start": "npx func start",
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
5 changes: 5 additions & 0 deletions team-central-dashboard/infra/azure.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
var allowedClientApplications = '"${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${outlookDesktopAppClientId}","${outlookWebAppClientId}"'

// Azure Storage that hosts your static web site
resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
Expand Down Expand Up @@ -124,6 +125,10 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
name: 'TEAMS_APP_ID'
value: teamsAppId
}
{
name: 'WEBSITE_AUTH_AAD_ACL'
value: '{"allowed_client_applications": [${allowedClientApplications}]}'
}
]
ftpsState: 'FtpsOnly'
}
Expand Down
2 changes: 2 additions & 0 deletions todo-list-with-Azure-backend-M365/infra/teamsFx/function.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId1 = '00000002-0000-0ff1-ce00-000000000000'
var outlookWebAppClientId2 = 'bc59ab01-8403-45c6-8796-ac3ef710b3e3'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${officeDesktopAppClientId};${outlookDesktopAppClientId};${outlookWebAppClientId1};${outlookWebAppClientId2}'
var allowedClientApplications = '["${m365ClientId}","${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${officeDesktopAppClientId}","${outlookDesktopAppClientId}","${outlookWebAppClientId1}","${outlookWebAppClientId2}"]'

var currentAllowedOrigins = empty(currentConfigs.cors) ? [] : currentConfigs.cors.allowedOrigins

Expand All @@ -58,6 +59,7 @@ resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId // User assigned identity id, the identity is used to access other Azure resources
WEBSITE_AUTH_AAD_ACL: '{"allowed_client_applications": ${allowedClientApplications}}}'
}, currentAppSettings) // Merge new settings with existing settings
}

Expand Down
2 changes: 2 additions & 0 deletions todo-list-with-Azure-backend/infra/teamsFx/function.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
var allowedClientApplications = '["${m365ClientId}","${teamsMobileOrDesktopAppClientId}","${teamsWebAppClientId}","${officeWebAppClientId1}","${officeWebAppClientId2}","${outlookDesktopAppClientId}","${outlookWebAppClientId}"]'

var currentAllowedOrigins = empty(currentConfigs.cors) ? [] : currentConfigs.cors.allowedOrigins

Expand Down Expand Up @@ -57,6 +58,7 @@ resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
SQL_ENDPOINT: provisionOutputs.azureSqlOutput.value.sqlEndpoint
SQL_USER_NAME: administratorLogin
SQL_PASSWORD: administratorLoginPassword
WEBSITE_AUTH_AAD_ACL: '{"allowed_client_applications": ${allowedClientApplications}}}'
}, currentAppSettings)
}

Expand Down
Loading