Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-03-21 18:04:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove nxapi-auth client identifiers from source

Browse Source
This commit is contained in:
Samuel Elliott 2025-09-08 02:03:41 +01:00
parent 8b9b0cbe80
commit 7569d44ca9
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/main/index.ts
View File

@ -22,7 +22,7 @@ import createDebug from '../../util/debug.js';
import { dev, dir, git, release, version } from '../../util/product.js';
import { addUserAgent } from '../../util/useragent.js';
import { initStorage, paths } from '../../util/storage.js';
import { ClientAssertionProvider, NXAPI_AUTH_APP_CLIENT_ID, setClientAssertionProvider } from '../../util/nxapi-auth.js';
import { ClientAssertionProvider, NXAPI_AUTH_APP_CLIENT_ID, NXAPI_AUTH_APP_SCOPE, setClientAssertionProvider } from '../../util/nxapi-auth.js';
import createI18n, { languages } from '../i18n/index.js';
import { CoralApiInterface } from '../../api/coral.js';
import { StatusUpdateIdentifierSymbol, StatusUpdateMonitor, StatusUpdateNotify, StatusUpdateResult, StatusUpdateSubscriber } from '../../common/status.js';
@ -167,7 +167,11 @@ export async function init() {
initGlobals();
addUserAgent('nxapi-app (Chromium ' + process.versions.chrome + '; Electron ' + process.versions.electron + ')');
setClientAssertionProvider(new ClientAssertionProvider(NXAPI_AUTH_APP_CLIENT_ID));
if (NXAPI_AUTH_APP_CLIENT_ID) {
setClientAssertionProvider(new ClientAssertionProvider(NXAPI_AUTH_APP_CLIENT_ID, undefined,
NXAPI_AUTH_APP_SCOPE));
}
setAboutPanelOptions();

8
src/cli.ts
View File

@ -11,7 +11,7 @@ import { addUserAgent } from './util/useragent.js';
import { USER_AGENT_INFO_URL } from './common/constants.js';
import { init as initGlobals } from './common/globals.js';
import { buildEnvironmentProxyAgent } from './util/undici-proxy.js';
import { ClientAssertionProvider, NXAPI_AUTH_CLI_CLIENT_ID, setClientAssertionProvider } from './util/nxapi-auth.js';
import { ClientAssertionProvider, NXAPI_AUTH_CLI_CLIENT_ID, NXAPI_AUTH_CLI_SCOPE, setClientAssertionProvider } from './util/nxapi-auth.js';
const debug = createDebug('cli');
@ -60,8 +60,10 @@ export async function main(argv = process.argv.slice(2)) {
addUserAgent('unidentified-script');
}
setClientAssertionProvider(new ClientAssertionProvider(NXAPI_AUTH_CLI_CLIENT_ID, undefined,
'ca:gf ca:er ca:dr ca:na'));
if (NXAPI_AUTH_CLI_CLIENT_ID) {
setClientAssertionProvider(new ClientAssertionProvider(NXAPI_AUTH_CLI_CLIENT_ID, undefined,
NXAPI_AUTH_CLI_SCOPE));
}
const yargs = createYargs(argv);

22
src/util/nxapi-auth.ts
View File

@ -1,9 +1,25 @@
import { createHash } from 'node:crypto';
import { Jwt, JwtAlgorithm } from './jwt.js';
import { dev, git, pkg, release } from './product.js';
import { dev, embedded_nxapi_auth_app_client_id, embedded_nxapi_auth_cli_client_id, git, pkg, release } from './product.js';
export const NXAPI_AUTH_CLI_CLIENT_ID = 'CKtknJ6HiH2AZIMw-x8ljw';
export const NXAPI_AUTH_APP_CLIENT_ID = 'GlR_qsPZpNcxqMwnbsSjMA';
export const NXAPI_AUTH_CLI_CLIENT_ID =
embedded_nxapi_auth_cli_client_id ??
(pkg.__nxapi_auth?.cli?.client_id as string | undefined) ??
process.env.NXAPI_AUTH_CLIENT_ID ??
null;
export const NXAPI_AUTH_CLI_SCOPE =
embedded_nxapi_auth_cli_client_id || pkg.__nxapi_auth?.cli?.client_id ? 'ca:gf ca:er ca:dr ca:na' :
process.env.NXAPI_AUTH_SCOPE ??
'ca:gf ca:er ca:dr';
export const NXAPI_AUTH_APP_CLIENT_ID =
embedded_nxapi_auth_app_client_id ??
process.env.NXAPI_AUTH_CLIENT_ID ??
null;
export const NXAPI_AUTH_APP_SCOPE =
embedded_nxapi_auth_app_client_id ? 'ca:gf ca:er ca:dr' :
process.env.NXAPI_AUTH_SCOPE ??
'ca:gf ca:er ca:dr';
export let client_auth_provider: ClientAuthProviderInterface | null = null;
export let client_assertion_provider: ClientAssertionProviderInterface | null = null;