crypt/step-ca-cli
1
0
Fork 0
mirror of https://github.com/smallstep/cli.git synced 2025-08-09 03:22:43 +03:00
Code Activity

Merge url.Values and update conditional logic

Browse Source
This commit is contained in:
max furman
2022-01-21 18:18:21 -08:00
parent ad5c6a8e09
commit f11d88abe1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
command/oauth/cmd.go
View File

@@ -357,13 +357,12 @@ func oauthCmd(c *cli.Context) error {
parts := strings.SplitN(keyval, "=", 2) parts := strings.SplitN(keyval, "=", 2)
var k, v string var k, v string
switch len(parts) { switch len(parts) {
case 0:
return errs.InvalidFlagValue(c, "auth-param", keyval, "")
case 1: case 1:
k, v = parts[0], "" k, v = parts[0], ""
authParams.Add(parts[0], "")
case 2: case 2:
k, v = parts[0], parts[1] k, v = parts[0], parts[1]
default:
return errs.InvalidFlagValue(c, "auth-param", keyval, "")
} }
if k == "" { if k == "" {
return errs.InvalidFlagValue(c, "auth-param", keyval, "") return errs.InvalidFlagValue(c, "auth-param", keyval, "")
@@ -940,7 +939,12 @@ func (o *oauth) Auth() (string, error) {
if o.loginHint != "" { if o.loginHint != "" {
q.Add("login_hint", o.loginHint) q.Add("login_hint", o.loginHint)
} }
u.RawQuery = fmt.Sprintf("%s&%s", q.Encode(), o.authParams.Encode()) for k, vs := range o.authParams {
for _, v := range vs {
q.Add(k, v)
}
}
u.RawQuery = q.Encode()
return u.String(), nil return u.String(), nil
} }