wip: can show login info

Author: leafty

Makefile

@@ -68,3 +68,17 @@ check-format:  ## Check that sources are correctly formatted
 .PHONY: check-vet
 check-vet:  ## Check source files with `go vet`
 	go vet ./...
+
+##@ Code generation
+
+.PHONY: renku-users-apispec
+renku-users-apispec:  ## Download the "users" API spec
+	curl -L -o pkg/renkuapi/users/api.spec.yaml https://raw.githubusercontent.com/SwissDataScienceCenter/renku-data-services/refs/heads/main/components/renku_data_services/users/api.spec.yaml
+	sed -e 's/- default: "general"//g' pkg/renkuapi/users/api.spec.yaml > pkg/renkuapi/users/api.spec.new.yaml
+	mv pkg/renkuapi/users/api.spec.new.yaml pkg/renkuapi/users/api.spec.yaml
+
+.PHONY: generate
+generate: pkg/renkuapi/users/users_gen.go  ## Run go generate
+
+pkg/renkuapi/users/users_gen.go: pkg/renkuapi/users/api.spec.yaml
+	go generate pkg/renkuapi/users/users.go

go.mod

@@ -3,7 +3,10 @@ module github.com/SwissDataScienceCenter/renku-dev-utils
 go 1.24.2
 
 require (
+	github.com/getkin/kin-openapi v0.132.0
 	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/oapi-codegen/oapi-codegen/v2 v2.5.0
+	github.com/oapi-codegen/runtime v1.1.2
 	github.com/spf13/cobra v1.10.1
 	github.com/zalando/go-keyring v0.2.6
 	k8s.io/api v0.34.0
@@ -12,8 +15,10 @@ require (
 
 require (
 	al.essio.dev/pkg/shellescape v1.5.1 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -29,23 +34,34 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
+	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/speakeasy-api/jsonpath v0.6.0 // indirect
+	github.com/speakeasy-api/openapi-overlay v0.10.2 // indirect
+	github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
 	golang.org/x/image v0.28.0 // indirect
 	golang.org/x/mobile v0.0.0-20250606033058-a2a15c67f36f // indirect
-	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sync v0.15.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.30.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
 	golang.org/x/text v0.26.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect

go.sum

@@ -8,6 +8,7 @@ import (
 	"github.com/SwissDataScienceCenter/renku-dev-utils/pkg/github"
 	ns "github.com/SwissDataScienceCenter/renku-dev-utils/pkg/namespace"
 	"github.com/SwissDataScienceCenter/renku-dev-utils/pkg/renkuapi"
+	"github.com/SwissDataScienceCenter/renku-dev-utils/pkg/renkuapi/users"
 	"github.com/spf13/cobra"
 )
 
@@ -53,7 +54,7 @@ func login(cmd *cobra.Command, args []string) {
 		url = deploymentURL.String()
 	}
 
-	fmt.Printf("URL '%s'\n", url)
+	fmt.Printf("Renku URL: %s\n", url)
 
 	auth, err := renkuapi.NewRenkuApiAuth(url)
 	if err != nil {
@@ -66,6 +67,26 @@ func login(cmd *cobra.Command, args []string) {
 		fmt.Println(err)
 		os.Exit(1)
 	}
+
+	ruc, err := users.NewRenkuUsersClient(url, users.WithRequestEditors(users.RequestEditorFn(auth.RequestEditor())))
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	userInfo, err := ruc.GetUser(ctx)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Logged in as:")
+	fmt.Printf("  username: %s\n", userInfo.Username)
+	fmt.Printf("  email: %s\n", *userInfo.Email)
+	fmt.Printf("  first name: %s\n", *userInfo.FirstName)
+	fmt.Printf("  last name: %s\n", *userInfo.LastName)
+	fmt.Printf("  is admin: %t\n", userInfo.IsAdmin)
+
 }
 
 func init() {

pkg/cmd/login.go

@@ -60,6 +60,25 @@ func NewRenkuApiAuth(baseURL string) (auth *RenkuApiAuth, err error) {
 	return auth, nil
 }
 
+// RequestEditorFn  is the function signature for the RequestEditor callback function
+type RequestEditorFn func(ctx context.Context, req *http.Request) error
+
+// RequestEditor returns a request editor which injects a valid access token
+// for API requests.
+func (auth *RenkuApiAuth) RequestEditor() RequestEditorFn {
+	return func(ctx context.Context, req *http.Request) error {
+		if req.Header.Get("Authorization") != "" {
+			return nil
+		}
+		token, err := auth.GetAccessToken(ctx)
+		if err != nil {
+			return err
+		}
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+		return nil
+	}
+}
+
 func (auth *RenkuApiAuth) GetAccessToken(ctx context.Context) (token string, err error) {
 	// Use access token if valid
 	token = auth.accessToken
@@ -154,7 +173,6 @@ func (auth *RenkuApiAuth) getKeyringUserPrefix() string {
 }
 
 func (auth *RenkuApiAuth) Login(ctx context.Context) error {
-	// TODO: check username from API
 	token, _ := auth.GetAccessToken(ctx)
 	if token != "" {
 		return nil