ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-12 12:25:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refac: add separate Client IDs for OneDrive

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-09-21 01:40:14 -04:00
parent 6e4a2f18e1
commit 466d5bb696
3 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/open_webui/config.py
View file

@ -2170,6 +2170,8 @@ ENABLE_ONEDRIVE_INTEGRATION = PersistentConfig(
"onedrive.enable", "onedrive.enable",
os.getenv("ENABLE_ONEDRIVE_INTEGRATION", "False").lower() == "true", os.getenv("ENABLE_ONEDRIVE_INTEGRATION", "False").lower() == "true",
) )
ENABLE_ONEDRIVE_PERSONAL = ( ENABLE_ONEDRIVE_PERSONAL = (
os.environ.get("ENABLE_ONEDRIVE_PERSONAL", "True").lower() == "true" os.environ.get("ENABLE_ONEDRIVE_PERSONAL", "True").lower() == "true"
) )
@ -2177,10 +2179,12 @@ ENABLE_ONEDRIVE_BUSINESS = (
os.environ.get("ENABLE_ONEDRIVE_BUSINESS", "True").lower() == "true" os.environ.get("ENABLE_ONEDRIVE_BUSINESS", "True").lower() == "true"
) )
ONEDRIVE_CLIENT_ID = PersistentConfig( ONEDRIVE_CLIENT_ID = os.environ.get("ONEDRIVE_CLIENT_ID", "")
"ONEDRIVE_CLIENT_ID", ONEDRIVE_CLIENT_ID_PERSONAL = os.environ.get(
"onedrive.client_id", "ONEDRIVE_CLIENT_ID_PERSONAL", ONEDRIVE_CLIENT_ID
os.environ.get("ONEDRIVE_CLIENT_ID", ""), )
ONEDRIVE_CLIENT_ID_BUSINESS = os.environ.get(
"ONEDRIVE_CLIENT_ID_BUSINESS", ONEDRIVE_CLIENT_ID
) )
ONEDRIVE_SHAREPOINT_URL = PersistentConfig( ONEDRIVE_SHAREPOINT_URL = PersistentConfig(

6
backend/open_webui/main.py
View file

@ -301,7 +301,8 @@ from open_webui.config import (
GOOGLE_DRIVE_CLIENT_ID, GOOGLE_DRIVE_CLIENT_ID,
GOOGLE_DRIVE_API_KEY, GOOGLE_DRIVE_API_KEY,
ENABLE_ONEDRIVE_INTEGRATION, ENABLE_ONEDRIVE_INTEGRATION,
ONEDRIVE_CLIENT_ID, ONEDRIVE_CLIENT_ID_PERSONAL,
ONEDRIVE_CLIENT_ID_BUSINESS,
ONEDRIVE_SHAREPOINT_URL, ONEDRIVE_SHAREPOINT_URL,
ONEDRIVE_SHAREPOINT_TENANT_ID, ONEDRIVE_SHAREPOINT_TENANT_ID,
ENABLE_ONEDRIVE_PERSONAL, ENABLE_ONEDRIVE_PERSONAL,
@ -1743,7 +1744,8 @@ async def get_app_config(request: Request):
"api_key": GOOGLE_DRIVE_API_KEY.value, "api_key": GOOGLE_DRIVE_API_KEY.value,
}, },
"onedrive": { "onedrive": {
"client_id": ONEDRIVE_CLIENT_ID.value, "client_id_personal": ONEDRIVE_CLIENT_ID_PERSONAL,
"client_id_business": ONEDRIVE_CLIENT_ID_BUSINESS,
"sharepoint_url": ONEDRIVE_SHAREPOINT_URL.value, "sharepoint_url": ONEDRIVE_SHAREPOINT_URL.value,
"sharepoint_tenant_id": ONEDRIVE_SHAREPOINT_TENANT_ID.value, "sharepoint_tenant_id": ONEDRIVE_SHAREPOINT_TENANT_ID.value,
}, },

35
src/lib/utils/onedrive-file-picker.ts
View file

@ -31,12 +31,10 @@ class OneDriveConfig {
} }
private async getCredentials(): Promise<void> { private async getCredentials(): Promise<void> {
const headers: HeadersInit = {
'Content-Type': 'application/json'
};
const response = await fetch('/api/config', { const response = await fetch('/api/config', {
headers, headers: {
'Content-Type': 'application/json'
},
credentials: 'include' credentials: 'include'
}); });
@ -46,17 +44,14 @@ class OneDriveConfig {
const config = await response.json(); const config = await response.json();
const newClientId = config.onedrive?.client_id; this.clientIdPersonal = config.onedrive?.client_id_personal;
const newSharepointUrl = config.onedrive?.sharepoint_url; this.clientIdBusiness = config.onedrive?.client_id_business;
const newSharepointTenantId = config.onedrive?.sharepoint_tenant_id; this.sharepointUrl = config.onedrive?.sharepoint_url;
this.sharepointTenantId = config.onedrive?.sharepoint_tenant_id;
if (!newClientId) { if (!this.newClientIdPersonal && !this.newClientIdBusiness) {
throw new Error('OneDrive configuration is incomplete'); throw new Error('OneDrive client ID not configured');
} }
this.clientId = newClientId;
this.sharepointUrl = newSharepointUrl;
this.sharepointTenantId = newSharepointTenantId;
} }
public async getMsalInstance( public async getMsalInstance(
@ -69,10 +64,20 @@ class OneDriveConfig {
this.currentAuthorityType === 'organizations' this.currentAuthorityType === 'organizations'
? this.sharepointTenantId || 'common' ? this.sharepointTenantId || 'common'
: 'consumers'; : 'consumers';
const clientId =
this.currentAuthorityType === 'organizations'
? this.clientIdBusiness
: this.clientIdPersonal;
if (!clientId) {
throw new Error('OneDrive client ID not configured');
}
const msalParams = { const msalParams = {
auth: { auth: {
authority: `https://login.microsoftonline.com/${authorityEndpoint}`, authority: `https://login.microsoftonline.com/${authorityEndpoint}`,
clientId: this.clientId clientId: clientId
} }
}; };