Changes for PR feedback

cmd/cloud/contexts.go

@@ -269,8 +269,8 @@ func newCmdContextDelete() *cobra.Command {
 
 			if len(contexts.Contexts) == 0 {
 				contexts.CurrentContext = ""
-			} else {
-				// Set the Current Context to the first context in the map
+			} else if contextName == contexts.CurrentContext {
+				// Deleted the current context, so set context to first one in the map
 				contexts.CurrentContext = reflect.ValueOf(contexts.Contexts).MapKeys()[0].String()
 			}
 

internal/api/middleware.go

@@ -64,7 +64,7 @@ func AuthMiddleware(next http.Handler, apiContext *Context) http.Handler {
 			}
 		}
 
-		endpoint := r.URL.Path
+		endpoint := r.URL.EscapedPath()
 		if !isAccessAllowed(cid, endpoint, apiContext.AuthConfig.RestrictedClientIDs, apiContext.AuthConfig.RestrictedClientAllowedEndpointsList) {
 			http.Error(w, "Access denied", http.StatusForbidden)
 			return

internal/auth/cli.go

@@ -37,6 +37,8 @@ func EnsureValidAuthData(ctx context.Context, auth *AuthorizationResponse, orgUR
 	}
 
 	auth.AccessToken = newToken.AccessToken
+	auth.RefreshToken = newToken.RefreshToken
+	auth.ExpiresAt = newToken.Expiry.Unix()
 
 	return auth, nil
 }

internal/auth/device_authorization.go

@@ -51,8 +51,6 @@ func waitForAuthorization(ctx context.Context, config *oauth2.Config, deviceCode
 			return token, nil
 		case "authorization_pending":
 			// Do nothing, just wait
-		case "access_denied":
-			return token, fmt.Errorf("access denied")
 		default:
 			return token, fmt.Errorf("authorization failed: %v", token.Error)
 		}