ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify env var names and fix CI

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-07-29 14:11:32 +02:00
parent 38dde4ed33
commit 5ec66bf56f
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example
View File

@ -1,6 +1,6 @@
NODE_ENV=development NODE_ENV=development
TELEGRAM_T_API_ID= TELEGRAM_API_ID=
TELEGRAM_T_API_HASH= TELEGRAM_API_HASH=
BASE_URL=https://web.telegram.org/a/ BASE_URL=https://web.telegram.org/a/

5
.github/workflows/electron-release.yml vendored
View File

@ -50,8 +50,8 @@ jobs:
- name: Build and release - name: Build and release
env: env:
TELEGRAM_T_API_ID: ${{ secrets.TELEGRAM_API_ID }} TELEGRAM_API_ID: ${{ secrets.TELEGRAM_API_ID }}
TELEGRAM_T_API_HASH: ${{ secrets.TELEGRAM_API_HASH }} TELEGRAM_API_HASH: ${{ secrets.TELEGRAM_API_HASH }}
APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
GH_TOKEN: ${{ secrets.GH_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}
@ -134,6 +134,7 @@ jobs:
env: env:
KEYPAIR_ALIAS: ${{ secrets.KEYPAIR_ALIAS }} KEYPAIR_ALIAS: ${{ secrets.KEYPAIR_ALIAS }}
FILE_PATH: ${{ steps.download-artifact.outputs.download-path }} FILE_PATH: ${{ steps.download-artifact.outputs.download-path }}
shell: cmd
run: smctl.exe sign --keypair-alias=%KEYPAIR_ALIAS% --input "%FILE_PATH%\%FILE_NAME%" run: smctl.exe sign --keypair-alias=%KEYPAIR_ALIAS% --input "%FILE_PATH%\%FILE_NAME%"
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3

4
src/api/gramjs/methods/client.ts
View File

@ -81,8 +81,8 @@ export async function init(_onUpdate: OnApiUpdate, initialArgs: ApiInitialArgs)
client = new TelegramClient( client = new TelegramClient(
session, session,
process.env.TELEGRAM_T_API_ID, process.env.TELEGRAM_API_ID,
process.env.TELEGRAM_T_API_HASH, process.env.TELEGRAM_API_HASH,
{ {
deviceModel: navigator.userAgent || userAgent || DEFAULT_USER_AGENT, deviceModel: navigator.userAgent || userAgent || DEFAULT_USER_AGENT,
systemVersion: platform || DEFAULT_PLATFORM, systemVersion: platform || DEFAULT_PLATFORM,

8
src/lib/gramjs/client/auth.ts
View File

@ -231,8 +231,8 @@ async function signInUserWithQrCode(
} }
const result = await client.invoke(new Api.auth.ExportLoginToken({ const result = await client.invoke(new Api.auth.ExportLoginToken({
apiId: Number(process.env.TELEGRAM_T_API_ID), apiId: Number(process.env.TELEGRAM_API_ID),
apiHash: process.env.TELEGRAM_T_API_HASH, apiHash: process.env.TELEGRAM_API_HASH,
exceptIds: [], exceptIds: [],
})); }));
if (!(result instanceof Api.auth.LoginToken)) { if (!(result instanceof Api.auth.LoginToken)) {
@ -272,8 +272,8 @@ async function signInUserWithQrCode(
try { try {
const result2 = await client.invoke(new Api.auth.ExportLoginToken({ const result2 = await client.invoke(new Api.auth.ExportLoginToken({
apiId: Number(process.env.TELEGRAM_T_API_ID), apiId: Number(process.env.TELEGRAM_API_ID),
apiHash: process.env.TELEGRAM_T_API_HASH, apiHash: process.env.TELEGRAM_API_HASH,
exceptIds: [], exceptIds: [],
})); }));

4
webpack.config.ts
View File

@ -214,8 +214,8 @@ export default function createConfig(
IS_ELECTRON: false, IS_ELECTRON: false,
APP_TITLE, APP_TITLE,
RELEASE_DATETIME: Date.now(), RELEASE_DATETIME: Date.now(),
TELEGRAM_T_API_ID: undefined, TELEGRAM_API_ID: undefined,
TELEGRAM_T_API_HASH: undefined, TELEGRAM_API_HASH: undefined,
// eslint-disable-next-line no-null/no-null // eslint-disable-next-line no-null/no-null
TEST_SESSION: null, TEST_SESSION: null,
ELECTRON_HOST_URL, ELECTRON_HOST_URL,