From 11641d898638dc3a3ff43d3f063b82c30c0c4b55 Mon Sep 17 00:00:00 2001 From: Shook Date: Fri, 10 May 2024 17:33:01 +0800 Subject: [PATCH] chore: rename env vars "SERVICE_*" -> "BTC_SERVICE_*" --- .github/workflows/test.yaml | 6 +++--- apps/next/.env.example | 4 ++-- apps/next/src/app/page.tsx | 4 ++-- apps/vite/.env.example | 4 ++-- apps/vite/src/App.tsx | 5 ++++- packages/btc/.env.example | 6 +++--- packages/btc/tests/shared/env.ts | 6 +++--- packages/service/.env.example | 6 +++--- packages/service/tests/Service.test.ts | 12 ++++++------ 9 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5240d084..1fb20fed 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -52,6 +52,6 @@ jobs: - name: Run tests for packages run: pnpm run test:packages env: - VITE_SERVICE_URL: ${{ secrets.SERVICE_URL }} - VITE_SERVICE_TOKEN: ${{ secrets.SERVICE_TOKEN }} - VITE_SERVICE_ORIGIN: ${{ secrets.SERVICE_ORIGIN }} + VITE_BTC_SERVICE_URL: ${{ secrets.SERVICE_URL }} + VITE_BTC_SERVICE_TOKEN: ${{ secrets.SERVICE_TOKEN }} + VITE_BTC_SERVICE_ORIGIN: ${{ secrets.SERVICE_ORIGIN }} diff --git a/apps/next/.env.example b/apps/next/.env.example index 126ccc3d..22e91499 100644 --- a/apps/next/.env.example +++ b/apps/next/.env.example @@ -1,2 +1,2 @@ -NEXT_PUBLIC_SERVICE_URL= -NEXT_PUBLIC_SERVICE_TOKEN= +NEXT_PUBLIC_BTC_SERVICE_URL= +NEXT_PUBLIC_BTC_SERVICE_TOKEN= diff --git a/apps/next/src/app/page.tsx b/apps/next/src/app/page.tsx index 10cdf1b4..f68107e2 100644 --- a/apps/next/src/app/page.tsx +++ b/apps/next/src/app/page.tsx @@ -7,8 +7,8 @@ export default function Home() { const networkType = NetworkType.TESTNET; const service = BtcAssetsApi.fromToken( - process.env.NEXT_PUBLIC_SERVICE_URL!, - process.env.NEXT_PUBLIC_SERVICE_TOKEN!, + process.env.NEXT_PUBLIC_BTC_SERVICE_URL!, + process.env.NEXT_PUBLIC_BTC_SERVICE_TOKEN!, ); const source = new DataSource(service, networkType); diff --git a/apps/vite/.env.example b/apps/vite/.env.example index 2b514fe0..23e23fcf 100644 --- a/apps/vite/.env.example +++ b/apps/vite/.env.example @@ -1,2 +1,2 @@ -VITE_SERVICE_URL= -VITE_SERVICE_TOKEN= \ No newline at end of file +VITE_BTC_SERVICE_URL= +VITE_BTC_SERVICE_TOKEN= diff --git a/apps/vite/src/App.tsx b/apps/vite/src/App.tsx index 9a28c179..02edecef 100644 --- a/apps/vite/src/App.tsx +++ b/apps/vite/src/App.tsx @@ -6,7 +6,10 @@ function App() { async function send() { const networkType = NetworkType.TESTNET; - const service = BtcAssetsApi.fromToken(import.meta.env.VITE_SERVICE_URL!, import.meta.env.VITE_SERVICE_TOKEN!); + const service = BtcAssetsApi.fromToken( + import.meta.env.VITE_BTC_SERVICE_URL!, + import.meta.env.VITE_BTC_SERVICE_TOKEN!, + ); const source = new DataSource(service, networkType); const psbt = await sendBtc({ diff --git a/packages/btc/.env.example b/packages/btc/.env.example index df8eb3d3..15c08d44 100644 --- a/packages/btc/.env.example +++ b/packages/btc/.env.example @@ -1,3 +1,3 @@ -VITE_SERVICE_URL= # URL of the service -VITE_SERVICE_TOKEN= # JWT token to access the service -VITE_SERVICE_ORIGIN= # URL representing your token's domain +VITE_BTC_SERVICE_URL= # URL of the service +VITE_BTC_SERVICE_TOKEN= # JWT token to access the service +VITE_BTC_SERVICE_ORIGIN= # URL representing your token's domain diff --git a/packages/btc/tests/shared/env.ts b/packages/btc/tests/shared/env.ts index 79c6e203..195a200b 100644 --- a/packages/btc/tests/shared/env.ts +++ b/packages/btc/tests/shared/env.ts @@ -6,9 +6,9 @@ export const config = networkTypeToConfig(networkType); export const network = config.network; export const service = BtcAssetsApi.fromToken( - process.env.VITE_SERVICE_URL!, - process.env.VITE_SERVICE_TOKEN!, - process.env.VITE_SERVICE_ORIGIN!, + process.env.VITE_BTC_SERVICE_URL!, + process.env.VITE_BTC_SERVICE_TOKEN!, + process.env.VITE_BTC_SERVICE_ORIGIN!, ); export const source = new DataSource(service, networkType); diff --git a/packages/service/.env.example b/packages/service/.env.example index df8eb3d3..15c08d44 100644 --- a/packages/service/.env.example +++ b/packages/service/.env.example @@ -1,3 +1,3 @@ -VITE_SERVICE_URL= # URL of the service -VITE_SERVICE_TOKEN= # JWT token to access the service -VITE_SERVICE_ORIGIN= # URL representing your token's domain +VITE_BTC_SERVICE_URL= # URL of the service +VITE_BTC_SERVICE_TOKEN= # JWT token to access the service +VITE_BTC_SERVICE_ORIGIN= # URL representing your token's domain diff --git a/packages/service/tests/Service.test.ts b/packages/service/tests/Service.test.ts index edfd0910..1bb509cf 100644 --- a/packages/service/tests/Service.test.ts +++ b/packages/service/tests/Service.test.ts @@ -11,15 +11,15 @@ describe( () => { const btcAddress = 'tb1qm06rvrq8jyyckzc5v709u7qpthel9j4d9f7nh3'; const service = BtcAssetsApi.fromToken( - process.env.VITE_SERVICE_URL!, - process.env.VITE_SERVICE_TOKEN!, - process.env.VITE_SERVICE_ORIGIN!, + process.env.VITE_BTC_SERVICE_URL!, + process.env.VITE_BTC_SERVICE_TOKEN!, + process.env.VITE_BTC_SERVICE_ORIGIN!, ); describe('Initiation and token generation', () => { it('Generate a valid token', async () => { const serviceWithApp = new BtcAssetsApi({ - url: process.env.VITE_SERVICE_URL!, + url: process.env.VITE_BTC_SERVICE_URL!, app: 'btc-test-app', domain: 'btc-test.app', origin: 'https://btc-test.app', @@ -36,14 +36,14 @@ describe( expect( () => new BtcAssetsApi({ - url: process.env.VITE_SERVICE_URL!, + url: process.env.VITE_BTC_SERVICE_URL!, domain: 'https://btc-test.app', }), ).toThrow(`${ErrorMessages[ErrorCodes.ASSETS_API_INVALID_PARAM]}: domain`); }); it('Try generate token without the "app" param', async () => { const serviceWithoutApp = new BtcAssetsApi({ - url: process.env.VITE_SERVICE_URL!, + url: process.env.VITE_BTC_SERVICE_URL!, domain: 'btc-test.app', });