diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte
index a81139d2f..bf2f5cddb 100644
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -2,7 +2,7 @@
import { toast } from 'svelte-sonner';
import { v4 as uuidv4 } from 'uuid';
import { createPicker, getAuthToken } from '$lib/utils/google-drive-picker';
- import { openOneDrivePicker } from '$lib/utils/onedrive-file-picker';
+ import { pickAndDownloadFile } from '$lib/utils/onedrive-file-picker';
import { onMount, tick, getContext, createEventDispatcher, onDestroy } from 'svelte';
const dispatch = createEventDispatcher();
@@ -1111,10 +1111,10 @@
}}
uploadOneDriveHandler={async () => {
try {
- const fileData = await openOneDrivePicker();
+ const fileData = await pickAndDownloadFile();
if (fileData) {
const file = new File([fileData.blob], fileData.name, {
- type: fileData.blob.type
+ type: fileData.blob.type || 'application/octet-stream'
});
await uploadFileHandler(file);
} else {
@@ -1122,11 +1122,6 @@
}
} catch (error) {
console.error('OneDrive Error:', error);
- toast.error(
- $i18n.t('Error accessing OneDrive: {{error}}', {
- error: error.message
- })
- );
}
}}
onClose={async () => {
diff --git a/src/lib/components/chat/MessageInput/InputMenu.svelte b/src/lib/components/chat/MessageInput/InputMenu.svelte
index 91f9cf81b..7f7660f19 100644
--- a/src/lib/components/chat/MessageInput/InputMenu.svelte
+++ b/src/lib/components/chat/MessageInput/InputMenu.svelte
@@ -228,30 +228,41 @@
{/if}
- {#if $config?.features?.enable_onedrive_integration || true}
+ {#if $config?.features?.enable_onedrive_integration}
{
uploadOneDriveHandler();
}}
>
-
diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts
index f96670cb6..1f6b400e0 100644
--- a/src/lib/stores/index.ts
+++ b/src/lib/stores/index.ts
@@ -204,6 +204,7 @@ type Config = {
enable_login_form: boolean;
enable_web_search?: boolean;
enable_google_drive_integration: boolean;
+ enable_onedrive_integration: boolean;
enable_image_generation: boolean;
enable_admin_export: boolean;
enable_admin_chat_access: boolean;
diff --git a/src/lib/utils/onedrive-auth.ts b/src/lib/utils/onedrive-auth.ts
deleted file mode 100644
index be2de44a0..000000000
--- a/src/lib/utils/onedrive-auth.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { PublicClientApplication } from '@azure/msal-browser';
-
-const msalParams = {
- auth: {
- authority: 'https://login.microsoftonline.com/consumers',
- clientId: '2ab80a1e-7300-4cb1-beac-c38c730e8b7f'
- }
-};
-
-// MSAL 초기화
-const app = new PublicClientApplication(msalParams);
-
-export async function initializeMsal() {
- try {
- await app.initialize();
- console.log('MSAL initialized successfully');
- } catch (error) {
- console.error('MSAL initialization error:', error);
- }
- }
-
- export async function getToken(): Promise
{
- const authParams = { scopes: ['OneDrive.ReadWrite'] };
- let accessToken = '';
-
- try {
- // Ensure initialization happens early
- await initializeMsal();
- const resp = await app.acquireTokenSilent(authParams);
- accessToken = resp.accessToken;
- } catch (err) {
- const resp = await app.loginPopup(authParams);
- app.setActiveAccount(resp.account);
-
- if (resp.idToken) {
- const resp2 = await app.acquireTokenSilent(authParams);
- accessToken = resp2.accessToken;
- }
- }
-
- return accessToken;
- }
diff --git a/src/lib/utils/onedrive-file-picker.ts b/src/lib/utils/onedrive-file-picker.ts
index d003e38ec..e3a80c912 100644
--- a/src/lib/utils/onedrive-file-picker.ts
+++ b/src/lib/utils/onedrive-file-picker.ts
@@ -1,211 +1,266 @@
-// src/lib/utils/onedrive-file-picker.ts
-import { getToken } from './onedrive-auth';
+let CLIENT_ID = '';
+async function getCredentials() {
+ if (CLIENT_ID) return;
+ const response = await fetch('/api/config');
+ if (!response.ok) {
+ throw new Error('Failed to fetch OneDrive credentials');
+ }
+ const config = await response.json();
+ CLIENT_ID = config.onedrive?.client_id;
+ if (!CLIENT_ID) {
+ throw new Error('OneDrive client ID not configured');
+ }
+}
+
+function loadMsalScript(): Promise {
+ return new Promise((resolve, reject) => {
+ const win = window;
+ if (win.msal) {
+ resolve();
+ return;
+ }
+ const script = document.createElement('script');
+ script.src = 'https://alcdn.msauth.net/browser/2.19.0/js/msal-browser.min.js';
+ script.async = true;
+ script.onload = () => resolve();
+ script.onerror = () => reject(new Error('Failed to load MSAL script'));
+ document.head.appendChild(script);
+ });
+}
+
+let msalInstance: any;
+
+// Initialize MSAL authentication
+async function initializeMsal() {
+ if (!CLIENT_ID) {
+ await getCredentials();
+ }
+ const msalParams = {
+ auth: {
+ authority: 'https://login.microsoftonline.com/consumers',
+ clientId: CLIENT_ID
+ }
+ };
+ try {
+ await loadMsalScript();
+ const win = window;
+ msalInstance = new win.msal.PublicClientApplication(msalParams);
+ if (msalInstance.initialize) {
+ await msalInstance.initialize();
+ }
+ } catch (error) {
+ console.error('MSAL initialization error:', error);
+ }
+}
+
+// Retrieve OneDrive access token
+async function getToken(): Promise {
+ const authParams = { scopes: ['OneDrive.ReadWrite'] };
+ let accessToken = '';
+ try {
+ await initializeMsal();
+ const resp = await msalInstance.acquireTokenSilent(authParams);
+ accessToken = resp.accessToken;
+ } catch (err) {
+ const resp = await msalInstance.loginPopup(authParams);
+ msalInstance.setActiveAccount(resp.account);
+ if (resp.idToken) {
+ const resp2 = await msalInstance.acquireTokenSilent(authParams);
+ accessToken = resp2.accessToken;
+ }
+ }
+ return accessToken;
+}
const baseUrl = "https://onedrive.live.com/picker";
const params = {
- sdk: '8.0',
- entry: {
- oneDrive: {
- files: {}
- }
- },
- authentication: {},
- messaging: {
- origin: 'http://localhost:3000', // 현재 부모 페이지의 origin
- channelId: '27' // 메시징 채널용 임의의 ID
- },
- typesAndSources: {
- mode: 'files',
- pivots: {
- oneDrive: true,
- recent: true
- }
- }
+ sdk: '8.0',
+ entry: {
+ oneDrive: {
+ files: {}
+ }
+ },
+ authentication: {},
+ messaging: {
+ origin: window?.location?.origin,
+ channelId: crypto.randomUUID()
+ },
+ typesAndSources: {
+ mode: 'files',
+ pivots: {
+ oneDrive: true,
+ recent: true
+ }
+ }
};
-/**
- * OneDrive 파일 피커 창을 열고, 사용자가 선택한 파일 메타데이터를 받아오는 함수
- */
-export async function openOneDrivePicker(): Promise {
- // SSR 환경(SvelteKit)에서 window 객체가 없을 수 있으므로 가드
- if (typeof window === 'undefined') {
- throw new Error('Not in browser environment');
- }
-
- return new Promise(async (resolve, reject) => {
- let pickerWindow: Window | null = null;
- let channelPort: MessagePort | null = null;
-
- try {
- const authToken = await getToken();
- if (!authToken) {
- return reject(new Error('Failed to acquire access token'));
- }
-
- // 팝업 창 오픈
- pickerWindow = window.open('', 'OneDrivePicker', 'width=800,height=600');
- if (!pickerWindow) {
- return reject(new Error('Failed to open OneDrive picker window'));
- }
-
- // 쿼리스트링 구성
- const queryString = new URLSearchParams({
- filePicker: JSON.stringify(params)
- });
- const url = `${baseUrl}?${queryString.toString()}`;
-
- // 새로 연 window에 form을 동적으로 추가하여 POST
- const form = pickerWindow.document.createElement('form');
- form.setAttribute('action', url);
- form.setAttribute('method', 'POST');
-
- const input = pickerWindow.document.createElement('input');
- input.setAttribute('type', 'hidden');
- input.setAttribute('name', 'access_token');
- input.setAttribute('value', authToken);
-
- form.appendChild(input);
- pickerWindow.document.body.appendChild(form);
- form.submit();
-
- // 부모 창에서 message 이벤트 수신
- const handleWindowMessage = (event: MessageEvent) => {
- // pickerWindow가 아닌 다른 window에서 온 메시지는 무시
- if (event.source !== pickerWindow) return;
-
- const message = event.data;
-
- // 초기화 메시지 => SharedWorker(MessageChannel) 식으로 포트 받기
- if (
- message?.type === 'initialize' &&
- message?.channelId === params.messaging.channelId
- ) {
- channelPort = event.ports?.[0];
- if (!channelPort) return;
-
- channelPort.addEventListener('message', handlePortMessage);
- channelPort.start();
-
- // picker iframe에 'activate' 전달
- channelPort.postMessage({
- type: 'activate'
- });
- }
- };
-
- // 포트 메시지 핸들러
- const handlePortMessage = async (portEvent: MessageEvent) => {
- const portData = portEvent.data;
- switch (portData.type) {
- case 'notification':
- console.log('notification:', portData);
- break;
-
- case 'command': {
- // picker에 응답
- channelPort?.postMessage({
- type: 'acknowledge',
- id: portData.id
- });
-
- const command = portData.data;
-
- switch (command.command) {
- case 'authenticate': {
- // 재인증
- try {
- const newToken = await getToken();
- if (newToken) {
- channelPort?.postMessage({
- type: 'result',
- id: portData.id,
- data: {
- result: 'token',
- token: newToken
- }
- });
- } else {
- throw new Error('Could not retrieve auth token');
- }
- } catch (err) {
- console.error(err);
- channelPort?.postMessage({
- result: 'error',
- error: {
- code: 'tokenError',
- message: 'Failed to get token'
- },
- isExpected: true
- });
- }
- break;
- }
-
- case 'close': {
- // 사용자가 취소하거나 닫았을 경우
- cleanup();
- resolve(null);
- break;
- }
-
- case 'pick': {
- // 사용자가 파일 선택 완료
- console.log('Picked:', command);
- /**
- * command 안에는 사용자가 선택한 파일들의 메타데이터 정보가 들어있습니다.
- * 필요하다면 Microsoft Graph API 등을 통해 Blob(실제 파일 데이터)을 받아와야 할 수 있습니다.
- */
-
- // picker에 응답
- channelPort?.postMessage({
- type: 'result',
- id: portData.id,
- data: {
- result: 'success'
- }
- });
-
- // 선택한 파일들(메타정보)을 resolve
- cleanup();
- resolve(command);
- break;
- }
-
- default: {
- console.warn('Unsupported command:', command);
- channelPort?.postMessage({
- result: 'error',
- error: {
- code: 'unsupportedCommand',
- message: command.command
- },
- isExpected: true
- });
- break;
- }
- }
- break;
- }
- }
- };
-
- function cleanup() {
- window.removeEventListener('message', handleWindowMessage);
- if (channelPort) {
- channelPort.removeEventListener('message', handlePortMessage);
- }
- if (pickerWindow) {
- pickerWindow.close();
- pickerWindow = null;
- }
- }
-
- // 메시지 이벤트 등록
- window.addEventListener('message', handleWindowMessage);
- } catch (err) {
- if (pickerWindow) pickerWindow.close();
- reject(err);
- }
- });
+// Download file from OneDrive
+async function downloadOneDriveFile(fileInfo: any): Promise {
+ const accessToken = await getToken();
+ if (!accessToken) {
+ throw new Error('Unable to retrieve OneDrive access token.');
+ }
+ const fileInfoUrl = `${fileInfo["@sharePoint.endpoint"]}/drives/${fileInfo.parentReference.driveId}/items/${fileInfo.id}`;
+ const response = await fetch(fileInfoUrl, {
+ headers: {
+ 'Authorization': `Bearer ${accessToken}`
+ }
+ });
+ if (!response.ok) {
+ throw new Error('Failed to fetch file information.');
+ }
+ const fileData = await response.json();
+ const downloadUrl = fileData['@content.downloadUrl'];
+ const downloadResponse = await fetch(downloadUrl);
+ if (!downloadResponse.ok) {
+ throw new Error('Failed to download file.');
+ }
+ return await downloadResponse.blob();
}
+
+// Open OneDrive file picker and return selected file metadata
+export async function openOneDrivePicker(): Promise {
+ if (typeof window === 'undefined') {
+ throw new Error('Not in browser environment');
+ }
+ return new Promise((resolve, reject) => {
+ let pickerWindow: Window | null = null;
+ let channelPort: MessagePort | null = null;
+
+ const handleWindowMessage = (event: MessageEvent) => {
+ if (event.source !== pickerWindow) return;
+ const message = event.data;
+ if (message?.type === 'initialize' && message?.channelId === params.messaging.channelId) {
+ channelPort = event.ports?.[0];
+ if (!channelPort) return;
+ channelPort.addEventListener('message', handlePortMessage);
+ channelPort.start();
+ channelPort.postMessage({ type: 'activate' });
+ }
+ };
+
+ const handlePortMessage = async (portEvent: MessageEvent) => {
+ const portData = portEvent.data;
+ switch (portData.type) {
+ case 'notification':
+ break;
+ case 'command': {
+ channelPort?.postMessage({ type: 'acknowledge', id: portData.id });
+ const command = portData.data;
+ switch (command.command) {
+ case 'authenticate': {
+ try {
+ const newToken = await getToken();
+ if (newToken) {
+ channelPort?.postMessage({
+ type: 'result',
+ id: portData.id,
+ data: { result: 'token', token: newToken }
+ });
+ } else {
+ throw new Error('Could not retrieve auth token');
+ }
+ } catch (err) {
+ console.error(err);
+ channelPort?.postMessage({
+ result: 'error',
+ error: { code: 'tokenError', message: 'Failed to get token' },
+ isExpected: true
+ });
+ }
+ break;
+ }
+ case 'close': {
+ cleanup();
+ resolve(null);
+ break;
+ }
+ case 'pick': {
+ channelPort?.postMessage({
+ type: 'result',
+ id: portData.id,
+ data: { result: 'success' }
+ });
+ cleanup();
+ resolve(command);
+ break;
+ }
+ default: {
+ console.warn('Unsupported command:', command);
+ channelPort?.postMessage({
+ result: 'error',
+ error: { code: 'unsupportedCommand', message: command.command },
+ isExpected: true
+ });
+ break;
+ }
+ }
+ break;
+ }
+ }
+ };
+
+ function cleanup() {
+ window.removeEventListener('message', handleWindowMessage);
+ if (channelPort) {
+ channelPort.removeEventListener('message', handlePortMessage);
+ }
+ if (pickerWindow) {
+ pickerWindow.close();
+ pickerWindow = null;
+ }
+ }
+
+ const initializePicker = async () => {
+ try {
+ const authToken = await getToken();
+ if (!authToken) {
+ return reject(new Error('Failed to acquire access token'));
+ }
+ pickerWindow = window.open('', 'OneDrivePicker', 'width=800,height=600');
+ if (!pickerWindow) {
+ return reject(new Error('Failed to open OneDrive picker window'));
+ }
+ const queryString = new URLSearchParams({
+ filePicker: JSON.stringify(params)
+ });
+ const url = `${baseUrl}?${queryString.toString()}`;
+ const form = pickerWindow.document.createElement('form');
+ form.setAttribute('action', url);
+ form.setAttribute('method', 'POST');
+ const input = pickerWindow.document.createElement('input');
+ input.setAttribute('type', 'hidden');
+ input.setAttribute('name', 'access_token');
+ input.setAttribute('value', authToken);
+ form.appendChild(input);
+ pickerWindow.document.body.appendChild(form);
+ form.submit();
+ window.addEventListener('message', handleWindowMessage);
+ } catch (err) {
+ if (pickerWindow) pickerWindow.close();
+ reject(err);
+ }
+ };
+
+ initializePicker();
+ });
+}
+
+// Pick and download file from OneDrive
+export async function pickAndDownloadFile(): Promise<{ blob: Blob; name: string } | null> {
+ try {
+ const pickerResult = await openOneDrivePicker();
+ if (!pickerResult || !pickerResult.items || pickerResult.items.length === 0) {
+ return null;
+ }
+ const selectedFile = pickerResult.items[0];
+ const blob = await downloadOneDriveFile(selectedFile);
+ return { blob, name: selectedFile.name };
+ } catch (error) {
+ console.error('Error occurred during OneDrive file pick/download:', error);
+ throw error;
+ }
+}
+
+export { downloadOneDriveFile };