refactor: saasMode 분기 제거 — 항상 SaaS(OAuth only)로 동작

Mac/Windows 환경 불일치 해소. BUILD_TIME 상수, CONFIGURE 채널,
개발자 모드 UI 전부 제거. Supabase 설정은 supabase-config.ts SSOT.
This commit is contained in:
yunchan8804 2026-04-13 17:20:55 +09:00
parent feb82abbf7
commit 541f04d02b
12 changed files with 566 additions and 9587 deletions

View file

@ -1,5 +1,5 @@
import { resolve } from 'path'
import { defineConfig, externalizeDepsPlugin, loadEnv } from 'electron-vite'
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
import react from '@vitejs/plugin-react'
const sharedAlias = {
@ -10,34 +10,14 @@ const sharedAlias = {
const workspaceExclude = ['@d3ro/core', '@d3ro/ui', '@d3ro/i18n']
// SaaS 데스크톱 클라이언트: Supabase 연결 정보를 빌드 타임에 박는다.
// `apps/desktop/.env` (committed shared defaults) + `.env.local` (gitignored, 개인/비공개 키)
// 우선순위는 vite/electron-vite의 dotenv 로드 규칙: .env.local > .env.[mode] > .env
// 환경 변수에 값이 없으면 빈 문자열로 박혀, 런타임에 ConfigService가 fallback(설정 UI 입력)으로 동작.
function loadSupabaseEnv(mode: string): { url: string; anonKey: string } {
const env = loadEnv(mode, process.cwd(), 'D3RO_')
return {
url: env.D3RO_SUPABASE_URL ?? '',
anonKey: env.D3RO_SUPABASE_ANON_KEY ?? ''
}
}
export default defineConfig(({ mode }) => {
const supabase = loadSupabaseEnv(mode)
const supabaseDefine = {
'process.env.D3RO_SUPABASE_URL': JSON.stringify(supabase.url),
'process.env.D3RO_SUPABASE_ANON_KEY': JSON.stringify(supabase.anonKey)
}
return {
export default defineConfig({
main: {
plugins: [
externalizeDepsPlugin({
exclude: ['electron-store', ...workspaceExclude]
})
],
resolve: { alias: sharedAlias },
define: supabaseDefine
resolve: { alias: sharedAlias }
},
preload: {
plugins: [externalizeDepsPlugin({ exclude: workspaceExclude })],
@ -82,5 +62,4 @@ export default defineConfig(({ mode }) => {
resolve: { alias: sharedAlias },
plugins: [react()]
}
}
})

View file

@ -1,9 +0,0 @@
# apps/desktop SaaS 빌드 타임 환경변수 템플릿.
# 실제 값은 .env.local로 복사 (gitignored).
#
# cp env.example .env.local
#
# Supabase 프로젝트 — 데스크톱 클라이언트가 연결할 SaaS 인스턴스.
# 빌드 시점에 main 번들에 inline 박혀 사용자가 Settings에서 입력할 필요 없음.
D3RO_SUPABASE_URL=https://your-project-ref.supabase.co
D3RO_SUPABASE_ANON_KEY=your-anon-or-publishable-key

View file

@ -6,7 +6,6 @@ import { IPC_CHANNELS } from '@d3ro/core/ipc-channels'
import { D3ROError, ErrorCode } from '@d3ro/core/errors'
import type { IPCResult } from '@d3ro/core/errors'
import { getCloudSyncService } from '../services/CloudSyncService'
import { configSet } from '../services/ConfigService'
import { getLogger } from '../services/LoggerService'
const logger = getLogger('cloud-sync-handlers')
@ -15,11 +14,6 @@ interface SignInParams {
provider: 'google' | 'github'
}
interface ConfigureParams {
url: string
anonKey: string
}
function ok<T>(data: T): IPCResult<T> {
return { success: true, data }
}
@ -46,18 +40,6 @@ export function registerCloudSyncHandlers(): void {
}
})
ipcMain.handle(IPC_CHANNELS.CLOUD_SYNC.CONFIGURE, async (_e, params: ConfigureParams) => {
try {
configSet('supabaseUrl' as never, params.url as never)
configSet('supabaseAnonKey' as never, params.anonKey as never)
// CloudSyncService 재초기화
await sync.init()
return ok(sync.getState())
} catch (e) {
return fail(e)
}
})
ipcMain.handle(IPC_CHANNELS.CLOUD_SYNC.SIGN_IN, async (_e, params: SignInParams) => {
try {
await sync.startSignIn(params.provider)

View file

@ -13,7 +13,8 @@ import {
} from '@supabase/supabase-js'
import { eq, gt } from 'drizzle-orm'
import { getLogger } from './LoggerService'
import { configGet, isSupabaseBuildTimeConfigured } from './ConfigService'
import { configGet } from './ConfigService'
import { SUPABASE_URL, SUPABASE_ANON_KEY } from '@d3ro/core/supabase-config'
import { getDatabase, openForUser, openLocal, closeCurrent } from '../db'
import { history, dictionary, meetingSessions, meetingMemos, meetingDocuments } from '../db/schema'
import { D3ROError, ErrorCode } from '@d3ro/core/errors'
@ -41,11 +42,6 @@ interface CloudSyncState {
userEmail: string | null
lastSyncAt: number | null
syncing: boolean
/**
* SaaS 모드: Supabase URL/Key가 .
* true이면 OAuth (URL/Key ).
*/
saasMode: boolean
}
interface CloudSyncEvents {
@ -78,15 +74,7 @@ class CloudSyncService extends EventEmitter {
if (this._initialized) return
this._initialized = true
const url = configGet('supabaseUrl') as string | undefined
const anonKey = configGet('supabaseAnonKey') as string | undefined
if (!url || !anonKey) {
logger.info('CloudSync disabled — Supabase URL/key not configured')
return
}
this._client = createClient(url, anonKey, {
this._client = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
auth: {
persistSession: false, // 직접 관리
autoRefreshToken: true,
@ -486,8 +474,7 @@ class CloudSyncService extends EventEmitter {
authenticated: this.isAuthenticated(),
userEmail: this._session?.user?.email ?? null,
lastSyncAt: this._lastSyncAt,
syncing: this._syncing,
saasMode: isSupabaseBuildTimeConfigured()
syncing: this._syncing
}
}

View file

@ -7,28 +7,6 @@ import { getLogger } from './LoggerService'
const logger = getLogger('ConfigService')
// ============================================================
// SaaS 빌드 타임 주입 (electron.vite.config.ts의 define으로 박힘)
// ============================================================
// D3RO_SUPABASE_URL / D3RO_SUPABASE_ANON_KEY가 비어있지 않으면
// 데스크톱 사용자가 Settings에서 직접 입력할 필요 없이 SaaS 인스턴스에 자동 연결.
// 빈 문자열이면 기존 동작(사용자 입력) fallback.
const BUILD_TIME_SUPABASE_URL: string = process.env.D3RO_SUPABASE_URL ?? ''
const BUILD_TIME_SUPABASE_ANON_KEY: string = process.env.D3RO_SUPABASE_ANON_KEY ?? ''
export function isSupabaseBuildTimeConfigured(): boolean {
return BUILD_TIME_SUPABASE_URL.length > 0 && BUILD_TIME_SUPABASE_ANON_KEY.length > 0
}
export function getBuildTimeSupabaseUrl(): string {
return BUILD_TIME_SUPABASE_URL
}
export function getBuildTimeSupabaseAnonKey(): string {
return BUILD_TIME_SUPABASE_ANON_KEY
}
// electron-store v10은 ESM 전용이므로 동적 import 필요
interface ElectronStore<T extends Record<string, unknown>> {
get<K extends keyof T>(key: K): T[K]
@ -118,14 +96,6 @@ export function getConfigService(): ElectronStore<AppConfig> | null {
}
export function configGet<K extends keyof AppConfig>(key: K): AppConfig[K] {
// SaaS 빌드 타임 주입은 사용자 설정보다 우선.
if (key === 'supabaseUrl' && BUILD_TIME_SUPABASE_URL.length > 0) {
return BUILD_TIME_SUPABASE_URL as AppConfig[K]
}
if (key === 'supabaseAnonKey' && BUILD_TIME_SUPABASE_ANON_KEY.length > 0) {
return BUILD_TIME_SUPABASE_ANON_KEY as AppConfig[K]
}
if (!store) {
logger.warn(`ConfigService not initialized, returning default for "${key}"`)
return CONFIG_DEFAULTS[key]
@ -134,15 +104,6 @@ export function configGet<K extends keyof AppConfig>(key: K): AppConfig[K] {
}
export function configSet<K extends keyof AppConfig>(key: K, value: AppConfig[K]): void {
// SaaS 빌드 타임 주입된 값은 변경 차단 (사용자가 잘못된 값으로 덮어쓰는 것 방지).
if (
(key === 'supabaseUrl' || key === 'supabaseAnonKey') &&
isSupabaseBuildTimeConfigured()
) {
logger.warn(`Refusing to override build-time SaaS config: "${key}"`)
return
}
if (!store) {
logger.warn(`ConfigService not initialized, cannot set "${key}"`)
return

View file

@ -715,8 +715,6 @@ const electronAPI = {
lastSyncAt: number | null
syncing: boolean
}>(IPC_CHANNELS.CLOUD_SYNC.GET_STATE),
configure: (params: { url: string; anonKey: string }) =>
invoke<unknown>(IPC_CHANNELS.CLOUD_SYNC.CONFIGURE, params),
signIn: (params: { provider: 'google' | 'github' }) =>
invoke<{ started: boolean }>(IPC_CHANNELS.CLOUD_SYNC.SIGN_IN, params),
signOut: () => invoke<unknown>(IPC_CHANNELS.CLOUD_SYNC.SIGN_OUT),

View file

@ -3,7 +3,7 @@
// 로그인 상태 / Sync Now 버튼 / 마지막 동기화 / 환경변수 설정
import { useEffect, useState } from 'react'
import { Box, Button, Stack, TextField, Alert, CircularProgress } from '@mui/material'
import { Box, Button, Stack, Alert, CircularProgress } from '@mui/material'
import CloudIcon from '@mui/icons-material/Cloud'
import CloudDoneIcon from '@mui/icons-material/CloudDone'
import GoogleIcon from '@mui/icons-material/Google'
@ -16,7 +16,6 @@ interface CloudSyncState {
userEmail: string | null
lastSyncAt: number | null
syncing: boolean
saasMode: boolean
}
interface SyncProgress {
@ -31,11 +30,8 @@ export function CloudSyncSection(): React.ReactElement {
authenticated: false,
userEmail: null,
lastSyncAt: null,
syncing: false,
saasMode: false
syncing: false
})
const [supabaseUrl, setSupabaseUrl] = useState('')
const [anonKey, setAnonKey] = useState('')
const [progress, setProgress] = useState<SyncProgress | null>(null)
const [error, setError] = useState<string | null>(null)
const [info, setInfo] = useState<string | null>(null)
@ -46,13 +42,6 @@ export function CloudSyncSection(): React.ReactElement {
void window.electronAPI.cloudSync.getState().then((r) => {
if (r.success) setState(r.data)
})
// 저장된 supabase 설정 로드
void window.electronAPI.config.get({ key: 'supabaseUrl' as never }).then((r) => {
if (r.success && typeof r.data === 'string') setSupabaseUrl(r.data)
})
void window.electronAPI.config.get({ key: 'supabaseAnonKey' as never }).then((r) => {
if (r.success && typeof r.data === 'string') setAnonKey(r.data)
})
const unsubAuth = window.electronAPI.cloudSync.onAuthChanged((payload) => {
setState((prev) => ({
@ -84,21 +73,6 @@ export function CloudSyncSection(): React.ReactElement {
}
}, [])
async function handleConfigure(): Promise<void> {
setError(null)
setBusy(true)
try {
const r = await window.electronAPI.cloudSync.configure({ url: supabaseUrl, anonKey })
if (!r.success) {
setError(r.error.message)
} else {
setInfo('Supabase 연결 설정 저장됨')
}
} finally {
setBusy(false)
}
}
async function handleSignIn(provider: 'google' | 'github'): Promise<void> {
setError(null)
setBusy(true)
@ -161,8 +135,7 @@ export function CloudSyncSection(): React.ReactElement {
<Box sx={{ ...typoSx('heading'), color: d3roPalette.text.primary }}>Cloud Sync</Box>
</Stack>
{!state.authenticated && state.saasMode && (
// SaaS 빌드 타임 모드: URL/Key는 빌드에 박혀있으므로 OAuth 버튼만 노출.
{!state.authenticated && (
<Stack spacing={2}>
<Box sx={{ ...typoSx('label'), color: d3roPalette.text.label, mb: 1 }}>OAuth </Box>
<Stack direction="row" spacing={1}>
@ -186,57 +159,6 @@ export function CloudSyncSection(): React.ReactElement {
</Stack>
)}
{!state.authenticated && !state.saasMode && (
// Legacy 개발자 모드: 빌드 타임 env 미설정 → 사용자가 직접 입력 가능.
<Stack spacing={2}>
<Box sx={{ ...typoSx('label'), color: d3roPalette.text.label }}>
SUPABASE ( )
</Box>
<TextField
label="Supabase URL"
size="small"
value={supabaseUrl}
onChange={(e) => setSupabaseUrl(e.target.value)}
placeholder="https://your-project.supabase.co"
fullWidth
/>
<TextField
label="Anon Key"
size="small"
value={anonKey}
onChange={(e) => setAnonKey(e.target.value)}
placeholder="eyJ..."
type="password"
fullWidth
/>
<Button variant="outlined" onClick={() => void handleConfigure()} disabled={busy}>
</Button>
<Box sx={{ borderTop: `1px solid ${d3roPalette.border.subtle}`, pt: 2 }}>
<Box sx={{ ...typoSx('label'), color: d3roPalette.text.label, mb: 1 }}>OAuth </Box>
<Stack direction="row" spacing={1}>
<Button
variant="contained"
startIcon={<GoogleIcon />}
onClick={() => void handleSignIn('google')}
disabled={busy || !supabaseUrl || !anonKey}
>
Google
</Button>
<Button
variant="outlined"
startIcon={<GitHubIcon />}
onClick={() => void handleSignIn('github')}
disabled={busy || !supabaseUrl || !anonKey}
>
GitHub
</Button>
</Stack>
</Box>
</Stack>
)}
{state.authenticated && (
<Stack spacing={2}>
<Box sx={{ color: d3roPalette.text.primary, fontSize: 13 }}>

View file

@ -36,8 +36,6 @@ export function OnboardingModal({ open, onClose }: OnboardingModalProps): React.
const [selectedDevice, setSelectedDevice] = useState('default')
const [hotkeyBinding, setHotkeyBinding] = useState<HotkeyBinding | null>(null)
const [hotkeyModalOpen, setHotkeyModalOpen] = useState(false)
const [saasMode, setSaasMode] = useState(false)
useEffect(() => {
if (!open) return
setStep(0)
@ -47,10 +45,6 @@ export function OnboardingModal({ open, onClose }: OnboardingModalProps): React.
window.electronAPI.hotkey.getDictationShortcut().then((r) => {
if (r.success && r.data) setHotkeyBinding(r.data)
})
// Cloud Sync step은 빌드 타임 Supabase env가 있을 때만 의미가 있음
window.electronAPI.cloudSync.getState().then((r) => {
if (r.success) setSaasMode(r.data.saasMode)
})
}, [open])
const handleFinish = (): void => {
@ -59,9 +53,9 @@ export function OnboardingModal({ open, onClose }: OnboardingModalProps): React.
onClose()
}
// Ollama step(3) 다음 — saasMode면 Cloud Sync step(4), 아니면 바로 완료(5)로
// Ollama step(3) 다음 → Cloud Sync step(4)로
const nextAfterOllama = (): void => {
setStep(saasMode ? 4 : 5)
setStep(4)
}
// Cloud Sync step에서 Back 누르면 Ollama(3)로 복귀
@ -256,7 +250,7 @@ export function OnboardingModal({ open, onClose }: OnboardingModalProps): React.
</Box>
)}
{/* Step 4: Cloud Sync (선택, saasMode에서만 노출) */}
{/* Step 4: Cloud Sync (선택) */}
{step === 4 && (
<Box>
<Stack direction="row" alignItems="center" gap={1} mb={3}>