Skip to content

feat: auto re-auth when all accounts are permanently unhealthy #70

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

Open
RaphaelManke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: auto re-auth when all accounts are permanently unhealthy #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 30 additions & 2 deletions src/core/request/request-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export class RequestHandler {
constructor(
private accountManager: AccountManager,
private config: KiroConfig,
private repository: AccountRepository
private repository: AccountRepository,
private client?: any
) {
this.accountSelector = new AccountSelector(accountManager, config, syncFromKiroCli, repository)
this.tokenRefresher = new TokenRefresher(config, accountManager, syncFromKiroCli, repository)
Expand Down Expand Up @@ -70,7 +71,11 @@ export class RequestHandler {
}

if (this.allAccountsPermanentlyUnhealthy()) {
throw new Error('All accounts are permanently unhealthy (quota exceeded or suspended)')
const reauthed = await this.triggerReauth(showToast)
if (!reauthed) {
throw new Error('All accounts are permanently unhealthy. Please re-authenticate.')
}
continue
}

let acc = await this.accountSelector.selectHealthyAccount(showToast)
Expand Down Expand Up @@ -259,6 +264,29 @@ export class RequestHandler {
}
}

private async triggerReauth(showToast: ToastFunction): Promise<boolean> {
if (!this.client) return false
try {
showToast('Session expired. Re-authenticating...', 'warning')
await this.client.provider.oauth.authorize({
path: { id: 'kiro' },
body: { method: 0 }
})
// Sync fresh tokens from CLI after re-auth
await syncFromKiroCli()
this.repository.invalidateCache()
const accounts = await this.repository.findAll()
for (const acc of accounts) {
this.accountManager.addAccount(acc)
}
showToast('Re-authentication successful.', 'success')
return true
} catch (e) {
logger.error('Re-auth failed', e instanceof Error ? e : new Error(String(e)))
return false
}
}

private allAccountsPermanentlyUnhealthy(): boolean {
const accounts = this.accountManager.getAccounts()
if (accounts.length === 0) {
Expand Down
4 changes: 2 additions & 2 deletions src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ export const createKiroPlugin =
const accountManager = await AccountManager.loadFromDisk(config.account_selection_strategy)
authHandler.setAccountManager(accountManager)

const requestHandler = new RequestHandler(accountManager, config, repository)
const requestHandler = new RequestHandler(accountManager, config, repository, client)

return {
auth: {
provider: id,
loader: async (getAuth: any) => {
await getAuth()
await authHandler.initialize()
await authHandler.initialize(showToast as any)

return {
apiKey: '',
Expand Down