kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: tenant id to never be undefined on teams (#5572)

Browse Source 
* fix: tenant id to never be undefined

* simplify azure oauth

* simplify azure oauth

* update ee ref

* sqlx prepare

* sqlx prepare
This commit is contained in:
Alexander Petric
2025-04-05 08:17:26 -04:00
committed by GitHub
parent fb8d9ec942
commit c1b14cb5eb
6 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
backend/.sqlx/query-f955a01779f5441efc6aa9364b24c79b3cbc6413046c3b6099d19f675d8a395b.json generated Normal file
View File

@@ -0,0 +1,23 @@
{
"db_name": "PostgreSQL",
"query": "\n SELECT EXISTS (SELECT 1\n FROM workspace_settings\n WHERE workspace_id <> $1\n AND slack_command_script IS NOT NULL\n AND slack_team_id = $2\n AND (SELECT slack_command_script IS NOT NULL FROM workspace_settings WHERE workspace_id = $1))\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
"Text",
"Text"
]
},
"nullable": [
null
]
},
"hash": "f955a01779f5441efc6aa9364b24c79b3cbc6413046c3b6099d19f675d8a395b"
}

23
backend/.sqlx/query-fa59674af1d1a4ceb696fc883005ef114772f7d2ee0f60cb1358cdb7f0b5cd0c.json generated
View File

@@ -1,23 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n SELECT EXISTS (SELECT 1 \n FROM workspace_settings \n WHERE workspace_id <> $1 \n AND slack_command_script IS NOT NULL\n AND slack_team_id = $2\n AND (SELECT slack_command_script IS NOT NULL FROM workspace_settings WHERE workspace_id = $1))\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
"Text",
"Text"
]
},
"nullable": [
null
]
},
"hash": "fa59674af1d1a4ceb696fc883005ef114772f7d2ee0f60cb1358cdb7f0b5cd0c"
}

10
backend/.sqlx/query-fec6d5674dc6b5a6a0ece419c40508835affcb7679a48f2a443777e829bd1e74.json generated
View File

@@ -41,11 +41,11 @@
]
},
"nullable": [
false,
false,
false,
false,
false,
true,
true,
true,
true,
true,
true
]
},

2
backend/ee-repo-ref.txt
View File

@@ -1 +1 @@
94cbac33756c1fba56da037456f44a4d294475b1
619f7dcd1097bfcd2f8b85f2075782219ff76be1

2
frontend/src/lib/components/AzureOauthSettings.svelte
View File

@@ -10,7 +10,7 @@
extra_params: { tenant_id: string }
extra_params_callback: Record<string, any>
} = {
scopes: [],
scopes: ['offline_access'],
auth_url: '',
token_url: '',
req_body_auth: true,

6
frontend/src/lib/components/OAuthSetting.svelte
View File

@@ -71,7 +71,11 @@
disabled={eeOnly && !$enterpriseLicense}
on:change={(e) => {
if (e.detail) {
value = { id: '', secret: '' }
if (name === 'teams' || name === 'microsoft') {
value = { id: '', secret: '', tenant: '' }
} else {
value = { id: '', secret: '' }
}
} else {
value = undefined
}