From 7ca9245b7c493fc1ee563de688f58ab37cd8bca0 Mon Sep 17 00:00:00 2001 From: Satyam Sinha Date: Fri, 8 Sep 2023 08:59:37 -0700 Subject: [PATCH] Dual context as first step alone can use all 30s --- cmd/a3sctl/internal/authcmd/oidc.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/a3sctl/internal/authcmd/oidc.go b/cmd/a3sctl/internal/authcmd/oidc.go index 9af0248..46a3b89 100644 --- a/cmd/a3sctl/internal/authcmd/oidc.go +++ b/cmd/a3sctl/internal/authcmd/oidc.go @@ -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 { @@ -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", @@ -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,