From 5ec66bf56f756a576f753bd2563e58ec214909a2 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Sat, 29 Jul 2023 14:11:32 +0200 Subject: [PATCH] Unify env var names and fix CI --- .env.example | 4 ++-- .github/workflows/electron-release.yml | 5 +++-- src/api/gramjs/methods/client.ts | 4 ++-- src/lib/gramjs/client/auth.ts | 8 ++++---- webpack.config.ts | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index 29683a9f7..9bece7fdc 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ NODE_ENV=development -TELEGRAM_T_API_ID= -TELEGRAM_T_API_HASH= +TELEGRAM_API_ID= +TELEGRAM_API_HASH= BASE_URL=https://web.telegram.org/a/ diff --git a/.github/workflows/electron-release.yml b/.github/workflows/electron-release.yml index 74e67ecc8..287c01224 100644 --- a/.github/workflows/electron-release.yml +++ b/.github/workflows/electron-release.yml @@ -50,8 +50,8 @@ jobs: - name: Build and release env: - TELEGRAM_T_API_ID: ${{ secrets.TELEGRAM_API_ID }} - TELEGRAM_T_API_HASH: ${{ secrets.TELEGRAM_API_HASH }} + TELEGRAM_API_ID: ${{ secrets.TELEGRAM_API_ID }} + TELEGRAM_API_HASH: ${{ secrets.TELEGRAM_API_HASH }} APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }} GH_TOKEN: ${{ secrets.GH_TOKEN }} @@ -134,6 +134,7 @@ jobs: env: KEYPAIR_ALIAS: ${{ secrets.KEYPAIR_ALIAS }} FILE_PATH: ${{ steps.download-artifact.outputs.download-path }} + shell: cmd run: smctl.exe sign --keypair-alias=%KEYPAIR_ALIAS% --input "%FILE_PATH%\%FILE_NAME%" - uses: actions/upload-artifact@v3 diff --git a/src/api/gramjs/methods/client.ts b/src/api/gramjs/methods/client.ts index 3cbd6b5bf..64623be78 100644 --- a/src/api/gramjs/methods/client.ts +++ b/src/api/gramjs/methods/client.ts @@ -81,8 +81,8 @@ export async function init(_onUpdate: OnApiUpdate, initialArgs: ApiInitialArgs) client = new TelegramClient( session, - process.env.TELEGRAM_T_API_ID, - process.env.TELEGRAM_T_API_HASH, + process.env.TELEGRAM_API_ID, + process.env.TELEGRAM_API_HASH, { deviceModel: navigator.userAgent || userAgent || DEFAULT_USER_AGENT, systemVersion: platform || DEFAULT_PLATFORM, diff --git a/src/lib/gramjs/client/auth.ts b/src/lib/gramjs/client/auth.ts index 9a420b08a..47a63ceb5 100644 --- a/src/lib/gramjs/client/auth.ts +++ b/src/lib/gramjs/client/auth.ts @@ -231,8 +231,8 @@ async function signInUserWithQrCode( } const result = await client.invoke(new Api.auth.ExportLoginToken({ - apiId: Number(process.env.TELEGRAM_T_API_ID), - apiHash: process.env.TELEGRAM_T_API_HASH, + apiId: Number(process.env.TELEGRAM_API_ID), + apiHash: process.env.TELEGRAM_API_HASH, exceptIds: [], })); if (!(result instanceof Api.auth.LoginToken)) { @@ -272,8 +272,8 @@ async function signInUserWithQrCode( try { const result2 = await client.invoke(new Api.auth.ExportLoginToken({ - apiId: Number(process.env.TELEGRAM_T_API_ID), - apiHash: process.env.TELEGRAM_T_API_HASH, + apiId: Number(process.env.TELEGRAM_API_ID), + apiHash: process.env.TELEGRAM_API_HASH, exceptIds: [], })); diff --git a/webpack.config.ts b/webpack.config.ts index 6301f8e9b..40b41a8e5 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -214,8 +214,8 @@ export default function createConfig( IS_ELECTRON: false, APP_TITLE, RELEASE_DATETIME: Date.now(), - TELEGRAM_T_API_ID: undefined, - TELEGRAM_T_API_HASH: undefined, + TELEGRAM_API_ID: undefined, + TELEGRAM_API_HASH: undefined, // eslint-disable-next-line no-null/no-null TEST_SESSION: null, ELECTRON_HOST_URL,