mirror/outline
1
0
Fork 0
mirror of https://github.com/outline/outline.git synced 2026-01-05 10:40:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improved error handling for Azure auth, add default value for AZURE_RESOURCE_ID

Browse Source
This commit is contained in:
Tom Moor
2024-10-19 08:05:43 -04:00
parent b6fc8fb4b1
commit da4cd4ebcd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/azure/server/auth/azure.ts
View File

@@ -69,9 +69,9 @@ if (env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET) {
);
}
if (!organizationResponse) {
if (!organizationResponse?.value?.length) {
throw MicrosoftGraphError(
"Unable to load organization info from Microsoft Graph API"
`Unable to load organization info from Microsoft Graph API: ${organizationResponse.error?.message}`
);
}

6
plugins/azure/server/env.ts
View File

@@ -19,9 +19,9 @@ class AzurePluginEnvironment extends Environment {
@IsOptional()
@CannotUseWithout("AZURE_CLIENT_ID")
public AZURE_RESOURCE_APP_ID = this.toOptionalString(
environment.AZURE_RESOURCE_APP_ID
);
public AZURE_RESOURCE_APP_ID =
this.toOptionalString(environment.AZURE_RESOURCE_APP_ID) ??
"00000003-0000-0000-c000-000000000000";
@IsOptional()
@CannotUseWithout("AZURE_CLIENT_ID")