Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename PortainerClient.Authenticate() to Auth()

Browse Source
This commit is contained in:
Juan Carlos Mejías Rodríguez 2019-08-26 01:13:43 -04:00
parent 5c9de76d5f
commit 53b13b1c76
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/client.go
View File

@ -31,8 +31,8 @@ type Config struct {
// PortainerClient represents a Portainer API client // PortainerClient represents a Portainer API client
type PortainerClient interface { type PortainerClient interface {
// Authenticate a user to get an auth token // Auth a user to get an auth token
Authenticate() (token string, err error) Auth() (token string, err error)
// Get endpoints // Get endpoints
GetEndpoints() ([]portainer.Endpoint, error) GetEndpoints() ([]portainer.Endpoint, error)
@ -185,7 +185,7 @@ func (n *portainerClientImp) doJSON(uri, method string, headers http.Header, req
func (n *portainerClientImp) doJSONWithToken(uri, method string, headers http.Header, request interface{}, response interface{}) (err error) { func (n *portainerClientImp) doJSONWithToken(uri, method string, headers http.Header, request interface{}, response interface{}) (err error) {
// Ensure there is an auth token // Ensure there is an auth token
if n.token == "" { if n.token == "" {
n.token, err = n.Authenticate() n.token, err = n.Auth()
if err != nil { if err != nil {
return return
} }
@ -203,7 +203,7 @@ func (n *portainerClientImp) AfterResponse(hook func(resp *http.Response) (err e
n.afterResponseHooks = append(n.afterResponseHooks, hook) n.afterResponseHooks = append(n.afterResponseHooks, hook)
} }
func (n *portainerClientImp) Authenticate() (token string, err error) { func (n *portainerClientImp) Auth() (token string, err error) {
reqBody := AuthenticateUserRequest{ reqBody := AuthenticateUserRequest{
Username: n.user, Username: n.user,
Password: n.password, Password: n.password,

2
client/client_test.go
View File

@ -69,7 +69,7 @@ func TestClientAuthenticates(t *testing.T) {
Password: "a", Password: "a",
UserAgent: "GE007", UserAgent: "GE007",
}) })
token, err := customClient.Authenticate() token, err := customClient.Auth()
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, token, "somerandomtoken") assert.Equal(t, token, "somerandomtoken")
} }

2
cmd/login.go
View File

@ -22,7 +22,7 @@ var loginCmd = &cobra.Command{
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"user": user, "user": user,
}).Debug("Getting auth token") }).Debug("Getting auth token")
authToken, err := client.Authenticate() authToken, err := client.Auth()
common.CheckError(err) common.CheckError(err)
if viper.GetBool("login.print") { if viper.GetBool("login.print") {