Skip to content
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.

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

Dual context as first step alone can use all 30s #87

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions cmd/a3sctl/internal/authcmd/oidc.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ func makeOIDCCmd(mmaker manipcli.ManipulatorMaker, restrictions *permissions.Res

go startOIDCCallbackServer(srvCtx, authDataCh)

ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
ctx1, cancel1 := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel1()

m, err := mmaker()
if err != nil {
Expand All @@ -57,7 +57,7 @@ func makeOIDCCmd(mmaker manipcli.ManipulatorMaker, restrictions *permissions.Res

client := authlib.NewClient(m)
url, err := client.AuthFromOIDCStep1(
ctx,
ctx1,
fSourceNamespace,
fSourceName,
"http://localhost:65333",
Expand All @@ -71,8 +71,11 @@ func makeOIDCCmd(mmaker manipcli.ManipulatorMaker, restrictions *permissions.Res
authD := <-authDataCh
srvCancel()

ctx2, cancel2 := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel2()

t, err := client.AuthFromOIDCStep2(
ctx,
ctx2,
fSourceNamespace,
fSourceName,
authD.code,
Expand Down