Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pulsaradmin/pkg/admin/auth/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const (

type Token struct {
Token string `json:"token"`
File string `json:"file"`
}

type TokenAuthProvider struct {
Expand Down Expand Up @@ -78,7 +79,13 @@ func NewAuthenticationTokenFromAuthParams(encodedAuthParam string,
tokenAuthProvider, err = NewAuthenticationToken(encodedAuthParam, transport)
}
} else {
tokenAuthProvider, err = NewAuthenticationToken(tokenJSON.Token, transport)
if tokenJSON.File != "" {
tokenAuthProvider, err = NewAuthenticationTokenFromFile(tokenJSON.File, transport)
} else if tokenJSON.Token != "" {
tokenAuthProvider, err = NewAuthenticationToken(tokenJSON.Token, transport)
} else {
return nil, errors.New("unsupported token json auth param")
}
}
return tokenAuthProvider, err
}
Expand Down
Loading