merge: changes from master

internal/auth/auth.go

@@ -89,7 +89,7 @@ func (provider *OIDCProviderInfo) VerifyToken(aToken string) error {
 	ctx := context.Background()
 	_, err := provider.KeySet.VerifySignature(ctx, aToken)
 	if err != nil {
-		return fmt.Errorf("Access token verification failed:", err)
+		return fmt.Errorf("Access token verification failed: %v", err)
 	}
 
 	// Set up the JWT token parser

main.go

@@ -34,21 +34,21 @@ func main() {
 	// Get provider configuration
 	provider, err := auth.GetProviderInfo(providerEndpoint)
 	if err != nil {
-		log.Fatalf("Failed to retrieve provider configuration: %v\n", err)
+		log.Fatalf("Failed to retrieve provider configuration for provider %v with error %v\n", providerEndpoint, err)
 	}
 
 	// Retrieve an OIDC token using the password grant type
 	accessToken, err := auth.RequestJWT(username, password, otp, provider.TokenURL, c.ClientID, c.ClientSecret, c.ClientScope)
 	if err != nil {
-		log.Fatalf("Failed to retrieve token: %v\n", err)
+		log.Fatalf("Failed to retrieve token for %v - error: %v\n", username, err)
 		os.Exit(2)
 	}
 
 	// Verify the token and retrieve the ID token
 	if err := provider.VerifyToken(accessToken); err != nil {
 		// handle the error
-		log.Fatal(err)
+		log.Fatalf("Failed to verify token %v for user %v\n", err, username)
 		os.Exit(3)
 	}
-	log.Println("Token acquired and verified Successfully.")
+	log.Println("Token acquired and verified Successfully for user -", username)
 }