add logout

Author: leafty

pkg/cmd/logout.go

@@ -0,0 +1,89 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"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/spf13/cobra"
+)
+
+var logoutCmd = &cobra.Command{
+	Use:   "logout",
+	Short: "Log out of a renku instance",
+	Run:   logout,
+}
+
+func logout(cmd *cobra.Command, args []string) {
+	ctx := context.Background()
+
+	logoutAll, err := cmd.Flags().GetBool("all")
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	if logoutAll {
+		err := renkuapi.LogoutAll(ctx)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		return
+	}
+
+	url, err := cmd.Flags().GetString("url")
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	if url == "" {
+		namespace, err := cmd.Flags().GetString("namespace")
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		if namespace == "" {
+			cli, err := github.NewGitHubCLI("")
+			if err != nil {
+				fmt.Println(err)
+				os.Exit(1)
+			}
+			namespace, err = ns.FindCurrentNamespace(ctx, cli)
+			if err != nil {
+				fmt.Println(err)
+				os.Exit(1)
+			}
+		}
+
+		deploymentURL, err := ns.GetDeploymentURL(namespace)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		url = deploymentURL.String()
+	}
+
+	fmt.Printf("Renku URL: %s\n", url)
+
+	auth, err := renkuapi.NewRenkuApiAuth(url)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	err = auth.Logout(ctx)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func init() {
+	logoutCmd.Flags().String("url", "", "instance URL")
+	logoutCmd.Flags().StringP("namespace", "n", "", "k8s namespace")
+	logoutCmd.Flags().Bool("all", false, "remote all saved logins")
+}

pkg/cmd/root.go

@@ -34,6 +34,7 @@ func init() {
 	rootCmd.AddCommand(cleanupDeploymentCmd)
 	rootCmd.AddCommand(copyKeycloakAdminPasswordCmd)
 	rootCmd.AddCommand(loginCmd)
+	rootCmd.AddCommand(logoutCmd)
 	rootCmd.AddCommand(makeMeAdminCmd)
 	rootCmd.AddCommand(namespaceCmd)
 	rootCmd.AddCommand(openDeploymentCmd)

pkg/renkuapi/auth.go

@@ -155,6 +155,11 @@ func (auth *RenkuApiAuth) saveAccessTokenToKeyring() (err error) {
 	return keyring.Set(keyringService, kUser, auth.accessToken)
 }
 
+func (auth *RenkuApiAuth) deleteAccessTokenFromKeyring() (err error) {
+	kUser := fmt.Sprintf("%s:%s", auth.getKeyringUserPrefix(), "access_token")
+	return keyring.Delete(keyringService, kUser)
+}
+
 func (auth *RenkuApiAuth) getRefreshTokenFromKeyring() (token string, err error) {
 	kUser := fmt.Sprintf("%s:%s", auth.getKeyringUserPrefix(), "refresh_token")
 	return keyring.Get(keyringService, kUser)
@@ -168,6 +173,11 @@ func (auth *RenkuApiAuth) saveRefreshTokenToKeyring() (err error) {
 	return keyring.Set(keyringService, kUser, auth.refreshToken)
 }
 
+func (auth *RenkuApiAuth) deleteRefreshTokenFromKeyring() (err error) {
+	kUser := fmt.Sprintf("%s:%s", auth.getKeyringUserPrefix(), "refresh_token")
+	return keyring.Delete(keyringService, kUser)
+}
+
 func (auth *RenkuApiAuth) getKeyringUserPrefix() string {
 	return fmt.Sprintf("rdu:%s", auth.baseURL.String())
 }
@@ -475,3 +485,20 @@ func (auth *RenkuApiAuth) postRefeshToken(ctx context.Context, refreshToken stri
 	}
 	return result, nil
 }
+
+func (auth *RenkuApiAuth) Logout(ctx context.Context) error {
+	err1 := auth.deleteAccessTokenFromKeyring()
+	err2 := auth.deleteRefreshTokenFromKeyring()
+	if err1 != nil && err2 != nil {
+		return fmt.Errorf("got errors: %w and %w", err1, err2)
+	}
+	if err1 != nil {
+		return err1
+	}
+	return err2
+}
+
+func LogoutAll(ctx context.Context) error {
+	return keyring.DeleteAll(keyringService)
+
+}