From bef05e52d60b3f388ed33bfc3b2358e47d327dd0 Mon Sep 17 00:00:00 2001 From: bincxz <16399091+binaricat@users.noreply.github.com> Date: Tue, 30 Dec 2025 02:11:17 +0800 Subject: [PATCH] Load OAuth client secrets from environment variables Improves configuration security and flexibility by reading OAuth client IDs and secrets from environment variables instead of hardcoding them. Enables easier key management across environments and adds support for Google client secret in token exchange flows. --- .github/workflows/build.yml | 55 +++++++++++++++++++ domain/sync.ts | 13 ++++- electron/bridges/githubAuthBridge.cjs | 3 +- .../services/adapters/GoogleDriveAdapter.ts | 2 + 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..3ed49bc8f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,55 @@ +name: build-packages + +on: + workflow_dispatch: + push: + tags: + - "v*" + +jobs: + build: + name: build-${{ matrix.os }} + runs-on: ${{ matrix.os }} + permissions: + contents: write + strategy: + fail-fast: false + matrix: + os: [macos-latest, windows-latest] + env: + VITE_SYNC_GITHUB_CLIENT_ID: ${{ secrets.VITE_SYNC_GITHUB_CLIENT_ID }} + VITE_SYNC_GOOGLE_CLIENT_ID: ${{ secrets.VITE_SYNC_GOOGLE_CLIENT_ID }} + VITE_SYNC_GOOGLE_CLIENT_SECRET: ${{ secrets.VITE_SYNC_GOOGLE_CLIENT_SECRET }} + VITE_SYNC_ONEDRIVE_CLIENT_ID: ${{ secrets.VITE_SYNC_ONEDRIVE_CLIENT_ID }} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: 20 + cache: npm + + - name: Install deps + run: npm ci + + - name: Build package (macOS) + if: matrix.os == 'macos-latest' + run: npm run pack:mac + + - name: Build package (Windows) + if: matrix.os == 'windows-latest' + run: npm run pack:win + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: netcatty-${{ matrix.os }} + path: release/** + + - name: Create GitHub Release + if: startsWith(github.ref, 'refs/tags/') + uses: softprops/action-gh-release@v2 + with: + files: release/** diff --git a/domain/sync.ts b/domain/sync.ts index 0065823b5..24ea7269a 100644 --- a/domain/sync.ts +++ b/domain/sync.ts @@ -380,6 +380,12 @@ export const SYNC_STORAGE_KEYS = { // Constants // ============================================================================ +const readBuildEnv = (key: string): string | undefined => { + const env = (import.meta as { env?: Record }).env; + const value = env?.[key]; + return value && value.trim().length ? value : undefined; +}; + export const SYNC_CONSTANTS = { // Encryption AES_KEY_LENGTH: 256, @@ -401,9 +407,10 @@ export const SYNC_CONSTANTS = { MAX_SYNC_INTERVAL: 60, // minutes // OAuth - GITHUB_CLIENT_ID: 'Ov23liuLdkw1H393rtT4', // Public client ID for Device Flow - GOOGLE_CLIENT_ID: '840441747394-n58o8ibgivgd3frqsn0bo5revf4viq2a.apps.googleusercontent.com', - ONEDRIVE_CLIENT_ID: '138bb0b6-b919-4e9d-80c6-64136ffc02a3', + GITHUB_CLIENT_ID: readBuildEnv('VITE_SYNC_GITHUB_CLIENT_ID') || '', // Public client ID for Device Flow + GOOGLE_CLIENT_ID: readBuildEnv('VITE_SYNC_GOOGLE_CLIENT_ID') || '', + GOOGLE_CLIENT_SECRET: readBuildEnv('VITE_SYNC_GOOGLE_CLIENT_SECRET') || '', + ONEDRIVE_CLIENT_ID: readBuildEnv('VITE_SYNC_ONEDRIVE_CLIENT_ID') || '', // API endpoints GITHUB_DEVICE_CODE_URL: 'https://github.com/login/device/code', diff --git a/electron/bridges/githubAuthBridge.cjs b/electron/bridges/githubAuthBridge.cjs index 15810240b..02899bbf3 100644 --- a/electron/bridges/githubAuthBridge.cjs +++ b/electron/bridges/githubAuthBridge.cjs @@ -5,7 +5,7 @@ * This bridge proxies GitHub Device Flow endpoints via the main process. */ -const GITHUB_CLIENT_ID = "Ov23liuLdkw1H393rtT4"; +const GITHUB_CLIENT_ID = process.env.VITE_SYNC_GITHUB_CLIENT_ID || ""; const GITHUB_DEVICE_CODE_URL = "https://github.com/login/device/code"; const GITHUB_ACCESS_TOKEN_URL = "https://github.com/login/oauth/access_token"; @@ -82,4 +82,3 @@ function registerHandlers(ipcMain) { } module.exports = { registerHandlers }; - diff --git a/infrastructure/services/adapters/GoogleDriveAdapter.ts b/infrastructure/services/adapters/GoogleDriveAdapter.ts index 72e37e9d0..df99da2f0 100644 --- a/infrastructure/services/adapters/GoogleDriveAdapter.ts +++ b/infrastructure/services/adapters/GoogleDriveAdapter.ts @@ -136,6 +136,7 @@ export const exchangeCodeForTokens = async ( return await exchangeViaMain({ clientId: SYNC_CONSTANTS.GOOGLE_CLIENT_ID, + clientSecret: SYNC_CONSTANTS.GOOGLE_CLIENT_SECRET, code, codeVerifier, redirectUri, @@ -156,6 +157,7 @@ export const refreshAccessToken = async (refreshToken: string): Promise