21137: Prefer early return per review comments

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go
index 128a271dbc9e3b146ae9eb89ea320c4130f17b42..d91cdddc018f42f02a720d60189fec52a6de385f 100644 (file)
--- a/lib/controller/localdb/login_oidc.go
+++ b/lib/controller/localdb/login_oidc.go
@@ -129,8 +129,11 @@ func (ctrl *oidcLoginController) Logout(ctx context.Context, opts arvados.Logout
                return arvados.LogoutResponse{}, fmt.Errorf("error setting up OpenID Connect provider: %s", err)
        }
        resp, err := logout(ctx, ctrl.Cluster, opts)
+       if err != nil {
+               return arvados.LogoutResponse{}, err
+       }
        creds, credsOK := auth.FromContext(ctx)
-       if err == nil && ctrl.endSessionURL != nil && credsOK && len(creds.Tokens) > 0 {
+       if ctrl.endSessionURL != nil && credsOK && len(creds.Tokens) > 0 {
                values := ctrl.endSessionURL.Query()
                values.Set("client_id", ctrl.ClientID)
                values.Set("post_logout_redirect_uri", resp.RedirectLocation)