Skip to content

fix: removes rs-keyring usage and use encrypted file to store tokens #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunshastry merged 3 commits into from
Feb 27, 2026
Merged

fix: removes rs-keyring usage and use encrypted file to store tokens #504

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715171d
fix: removes rs-keyring usage and use encrypted file to store tokens
sunshastry Feb 27, 2026
3dc42fe
fix: revert default client Id
sunshastry Feb 27, 2026
61f62bd
fix: addresses review comments
sunshastry Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/setup/mock-auth-hooks.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* ESM loader hooks that replace auth.svc.ts with a mock during E2E tests.
* This avoids hitting the system keyring (unavailable in CI).
* This avoids writing encrypted token files during E2E tests.
*/
export async function load(url, context, nextLoad) {
if (url.endsWith('/service/auth.svc.ts') || url.endsWith('/service/auth.svc.js')) {
Expand Down
231 changes: 11 additions & 220 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"@cyclonedx/cdxgen": "^12.1.1",
"@herodevs/eol-shared": "github:herodevs/eol-shared#v0.1.18",
"@inquirer/prompts": "^8.0.2",
"@napi-rs/keyring": "^1.2.0",
"@oclif/core": "^4.8.0",
"@oclif/plugin-help": "^6.2.32",
"@oclif/plugin-update": "^4.7.16",
Expand Down
15 changes: 0 additions & 15 deletions src/service/auth-config.svc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
const DEFAULT_REALM_URL = 'https://idp.prod.apps.herodevs.io/realms/universe/protocol/openid-connect';
const DEFAULT_CLIENT_ID = 'eol-ds';
const DEFAULT_SERVICE_NAME = '@herodevs/cli';
const DEFAULT_ACCESS_KEY = 'access-token';
const DEFAULT_REFRESH_KEY = 'refresh-token';

export function getRealmUrl() {
return process.env.OAUTH_CONNECT_URL || DEFAULT_REALM_URL;
Expand All @@ -11,15 +8,3 @@ export function getRealmUrl() {
export function getClientId() {
return process.env.OAUTH_CLIENT_ID || DEFAULT_CLIENT_ID;
}

export function getTokenServiceName() {
return process.env.HD_AUTH_SERVICE_NAME || DEFAULT_SERVICE_NAME;
}

export function getAccessTokenKey() {
return process.env.HD_AUTH_ACCESS_KEY || DEFAULT_ACCESS_KEY;
}

export function getRefreshTokenKey() {
return process.env.HD_AUTH_REFRESH_KEY || DEFAULT_REFRESH_KEY;
}
Loading