Merge pull request #26 from Tenderly/feature/enabling-organizations-a…

…ccess-keys

Enabled organisation access key to work with CLI

commands/login.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/sirupsen/logrus"
+	"github.com/tenderly/tenderly-cli/model"
 	"github.com/tenderly/tenderly-cli/rest"
 	"github.com/tenderly/tenderly-cli/rest/payloads"
 	"github.com/tenderly/tenderly-cli/userError"
@@ -43,6 +44,9 @@ var loginCmd = &cobra.Command{
 			if len(alreadyLoggedIn) == 0 {
 				alreadyLoggedIn = config.GetString(config.Email)
 			}
+			if len(alreadyLoggedIn) == 0 {
+				alreadyLoggedIn = config.GetString(config.OrganizationName)
+			}
 			if len(alreadyLoggedIn) == 0 {
 				alreadyLoggedIn = config.GetString(config.AccountID)
 			}
@@ -87,7 +91,7 @@ var loginCmd = &cobra.Command{
 		config.SetGlobalConfig(config.AccessKey, key)
 		config.SetGlobalConfig(config.AccessKeyId, keyId)
 
-		user, err := rest.User.User()
+		principal, err := rest.User.Principal()
 		if err != nil {
 			if providedAuthenticationMethod == "access-key" {
 				userError.LogErrorf("cannot fetch user info: %s", userError.NewUserError(
@@ -107,9 +111,17 @@ var loginCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		config.SetGlobalConfig(config.AccountID, user.ID)
-		config.SetGlobalConfig(config.Email, user.Email)
-		config.SetGlobalConfig(config.Username, user.Username)
+		config.SetGlobalConfig(config.AccountID, principal.ID)
+
+		if principal.Type == model.UserPrincipalType {
+			config.SetGlobalConfig(config.Email, principal.User.Email)
+		}
+
+		if principal.Type == model.OrganizationPrincipalType {
+			config.SetGlobalConfig(config.OrganizationName, principal.Organization.Name)
+		}
+
+		config.SetGlobalConfig(config.Username, principal.Username)
 
 		WriteGlobalConfig()
 

commands/logout.go

@@ -28,6 +28,7 @@ var logoutCmd = &cobra.Command{
 		config.SetGlobalConfig(config.AccessKey, "")
 		config.SetGlobalConfig(config.AccessKeyId, "")
 		config.SetGlobalConfig(config.Email, "")
+		config.SetGlobalConfig(config.OrganizationName, "")
 		config.SetGlobalConfig(config.Username, "")
 		config.SetGlobalConfig(config.AccountID, "")
 		WriteGlobalConfig()

commands/whoami.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"github.com/tenderly/tenderly-cli/model"
 	"github.com/tenderly/tenderly-cli/userError"
 	"os"
 
@@ -19,7 +20,7 @@ var whoamiCmd = &cobra.Command{
 		CheckLogin()
 		rest := newRest()
 
-		user, err := rest.User.User()
+		principal, err := rest.User.Principal()
 		if err != nil {
 			userError.LogErrorf("failed whoami: %s", userError.NewUserError(
 				err,
@@ -31,10 +32,16 @@ var whoamiCmd = &cobra.Command{
 			os.Exit(0)
 		}
 
-		logrus.Infof("ID: %s", colorizer.Bold(colorizer.Green(user.ID)))
-		logrus.Infof("Email: %s", colorizer.Bold(colorizer.Green(user.Email)))
-		if len(user.Username) != 0 {
-			logrus.Infof("Username: %s", colorizer.Bold(colorizer.Green(user.Username)))
+		logrus.Infof("ID: %s", colorizer.Bold(colorizer.Green(principal.ID)))
+		if principal.Type == model.UserPrincipalType {
+			logrus.Infof("Email: %s", colorizer.Bold(colorizer.Green(principal.User.Email)))
+		}
+		if principal.Type == model.OrganizationPrincipalType {
+			logrus.Infof("Organization name: %s", colorizer.Bold(colorizer.Green(principal.Organization.Name)))
+		}
+
+		if len(principal.Username) != 0 {
+			logrus.Infof("Username: %s", colorizer.Bold(colorizer.Green(principal.Username)))
 		}
 	},
 }

config/config.go

@@ -26,6 +26,8 @@ const (
 	ProjectSlug = "project_slug"
 	Provider    = "provider"
 
+	OrganizationName = "org_name"
+
 	Exports = "exports"
 
 	Projects = "projects"

model/user.go

@@ -2,6 +2,13 @@ package model
 
 import "time"
 
+type PrincipalType string
+
+const (
+	UserPrincipalType         PrincipalType = "user"
+	OrganizationPrincipalType PrincipalType = "organization"
+)
+
 type User struct {
 	ID AccountID `json:"id"`
 
@@ -12,3 +19,20 @@ type User struct {
 
 	CreatedAt time.Time `json:"-"`
 }
+
+type Organization struct {
+	PrincipalID AccountID `json:"id"`
+
+	Name string `json:"name"`
+	Logo string `json:"logo,omitempty"`
+}
+
+type Principal struct {
+	ID AccountID `json:"id"`
+
+	Username     string        `json:"username"`
+	Organization *Organization `json:"organization,omitempty" `
+	User         *User         `json:"user,omitempty"`
+
+	Type PrincipalType `json:"type"`
+}

rest/call/user.go

@@ -16,23 +16,23 @@ func NewUserCalls() *UserCalls {
 	return &UserCalls{}
 }
 
-func (rest *UserCalls) User() (*model.User, error) {
-	var userResponse payloads.UserResponse
-	response := client.Request("GET", "api/v1/user", nil)
+func (rest *UserCalls) Principal() (*model.Principal, error) {
+	var principalResponse payloads.PrincipalResponse
+	response := client.Request("GET", "api/v1/principal", nil)
 
-	err := json.NewDecoder(response).Decode(&userResponse)
+	err := json.NewDecoder(response).Decode(&principalResponse)
 	if err != nil {
 		logrus.Debug("failed parsing user response")
 		return nil, err
 	}
 
-	if userResponse.Error != nil {
+	if principalResponse.Error != nil {
 		logrus.Debug("failed fetching user data ", logrus.Fields{
-			"error_message": userResponse.Error.Message,
+			"error_message": principalResponse.Error.Message,
 		})
 
-		return nil, userResponse.Error
+		return nil, principalResponse.Error
 	}
 
-	return userResponse.User, err
+	return principalResponse.Principal, err
 }

rest/payloads/userPayloads.go

@@ -2,7 +2,7 @@ package payloads
 
 import "github.com/tenderly/tenderly-cli/model"
 
-type UserResponse struct {
-	User  *model.User `json:"user"`
-	Error *ApiError   `json:"error"`
+type PrincipalResponse struct {
+	Principal *model.Principal `json:"principal"`
+	Error     *ApiError        `json:"error"`
 }

rest/rest.go

@@ -12,7 +12,7 @@ type AuthRoutes interface {
 }
 
 type UserRoutes interface {
-	User() (*model.User, error)
+	Principal() (*model.Principal, error)
 }
 
 type ProjectRoutes interface {