diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99c1ada..1c8b61e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ build: stage: build script: - npx tsc - # Uses CI_COMMIT_TAG + # Uses CI_COMMIT_TAG, NXAPI_AUTH_CLI_CLIENT_ID, NXAPI_AUTH_APP_CLIENT_ID - NODE_ENV=production npx rollup --config - node bin/nxapi.js util validate-discord-titles diff --git a/resources/build/ci-package-json.js b/resources/build/ci-package-json.js index 8c0211b..d66387e 100644 --- a/resources/build/ci-package-json.js +++ b/resources/build/ci-package-json.js @@ -42,4 +42,13 @@ pkg.__nxapi_git = pkg.__nxapi_git ?? { changed_files: changed_files.length ? changed_files.split('\n') : [], }; +pkg.__nxapi_auth = process.env.NXAPI_AUTH_CLI_CLIENT_ID || process.env.NXAPI_AUTH_APP_CLIENT_ID ? { + cli: process.env.NXAPI_AUTH_CLI_CLIENT_ID ? { + client_id: process.env.NXAPI_AUTH_CLI_CLIENT_ID, + } : undefined, + app: process.env.NXAPI_AUTH_APP_CLIENT_ID ? { + client_id: process.env.NXAPI_AUTH_APP_CLIENT_ID, + } : undefined, +} : undefined; + await fs.writeFile(new URL('../../package.json', import.meta.url), JSON.stringify(pkg, null, 4) + '\n', 'utf-8'); diff --git a/rollup.config.js b/rollup.config.js index ab7e4e2..9b744c3 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -57,6 +57,8 @@ const replace_options = { 'globalThis.__NXAPI_BUNDLE_GIT__': JSON.stringify(git), 'globalThis.__NXAPI_BUNDLE_RELEASE__': JSON.stringify(release), 'globalThis.__NXAPI_BUNDLE_DEFAULT_REMOTE_CONFIG__': JSON.stringify(default_remote_config), + 'globalThis.__NXAPI_BUNDLE_NXAPI_AUTH_CLI_CLIENT_ID__': JSON.stringify(process.env.NXAPI_AUTH_CLI_CLIENT_ID), + 'globalThis.__NXAPI_BUNDLE_NXAPI_AUTH_APP_CLIENT_ID__': JSON.stringify(process.env.NXAPI_AUTH_APP_CLIENT_ID), 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV ?? 'development'), }, preventAssignment: true, diff --git a/src/util/product.ts b/src/util/product.ts index 20d1dae..92112db 100644 --- a/src/util/product.ts +++ b/src/util/product.ts @@ -28,12 +28,16 @@ declare global { var __NXAPI_BUNDLE_GIT__: RevisionInfo | null | undefined; var __NXAPI_BUNDLE_RELEASE__: string | null | undefined; var __NXAPI_BUNDLE_DEFAULT_REMOTE_CONFIG__: any | undefined; + var __NXAPI_BUNDLE_NXAPI_AUTH_CLI_CLIENT_ID__: string | undefined; + var __NXAPI_BUNDLE_NXAPI_AUTH_APP_CLIENT_ID__: string | undefined; } const embedded_pkg = globalThis.__NXAPI_BUNDLE_PKG__; const embedded_git = globalThis.__NXAPI_BUNDLE_GIT__; const embedded_release = globalThis.__NXAPI_BUNDLE_RELEASE__; export const embedded_default_remote_config = globalThis.__NXAPI_BUNDLE_DEFAULT_REMOTE_CONFIG__; +export const embedded_nxapi_auth_cli_client_id = globalThis.__NXAPI_BUNDLE_NXAPI_AUTH_CLI_CLIENT_ID__; +export const embedded_nxapi_auth_app_client_id = globalThis.__NXAPI_BUNDLE_NXAPI_AUTH_APP_CLIENT_ID__; // // Package/version info