Skip to content

feat: handle re-auth flows #7

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

Draft
rappizs wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: handle re-auth flows #7

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: 19 additions & 13 deletions pkg/oauth2ac/oauth2ac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,6 @@ func (cp *credentialsProvider) Start(ctx context.Context) (<-chan StatusEvent, e
}

func (cp *credentialsProvider) Authorize(ctx context.Context, authState, code string) (*oauth2.Token, error) {
if cp.syncGate.IsOpen() {
return nil, errors.WithStack(ErrAlreadyAuthorized)
}

token, err := cp.exchangeToken(ctx, authState, code)
if err != nil {
return nil, err
Expand All @@ -291,6 +287,10 @@ func (cp *credentialsProvider) Authorize(ctx context.Context, authState, code st
return nil, err
}

if cp.syncGate.IsOpen() {
cp.signalRefresh()
}

return token, nil
}

Expand Down Expand Up @@ -547,24 +547,30 @@ func (cp *credentialsProvider) tokenRefresherLoop(ctx context.Context) {

select {
case <-cp.refreshCh:
cp.logger.Info("client credentials changed: reset init condition and wait for re-authorization")

cp.mu.RLock()
serr := cp.secretError
cp.mu.RUnlock()

err := errors.WithStack(ErrAuthorizationNeeded)
if serr != nil {
err = errors.Wrap(err, serr.Error())
cp.logger.Info("client credentials changed: reset init condition and wait for re-authorization")

err := errors.Wrap(errors.WithStack(ErrAuthorizationNeeded), serr.Error())
cp.publishCredential(Credential{
Event: credential.RemoveEventType,
Err: err,
})

cp.setUnauthorizedStatus(err)

continue
}

cp.logger.Info("re-authorization: replacing token")
cp.publishCredential(Credential{
Event: credential.RemoveEventType,
Err: err,
Err: errors.WithStack(ErrAuthorizationNeeded),
})

cp.setUnauthorizedStatus(err)

continue
refreshTime = 0
case <-ctx.Done():
return
case <-time.After(refreshTime):
Expand Down
Loading