Skip to content

Commit e5990cf

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/platform-wide-querying
2 parents 62bc47e + 01e0c73 commit e5990cf

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# Hash of Go module dependencies.
4242
# Update this after changing go.mod/go.sum:
4343
# task nix-update-hash
44-
vendorHash = "sha256-428mvFi1RltJ6UiuIuBgVrkU6JYMz/qXbRKslZoZ1j0=";
44+
vendorHash = "sha256-uYxxIsYFeYfDXKCiW+iWHSrDT4FGkc+5OJlzZwEmo4w=";
4545

4646
ldflags = [
4747
"-s"

internal/cmd/auth/login.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ func runLoginFlow(ctx context.Context, authHostname string, apiHostname string,
154154
authURL := conf.AuthCodeURL(state,
155155
oauth2.SetAuthURLParam("code_challenge", codeChallenge),
156156
oauth2.SetAuthURLParam("code_challenge_method", "S256"),
157+
oauth2.SetAuthURLParam("prompt", "select_account"),
157158
)
158159

159160
// Channel to receive the authorization code

internal/cmd/utils.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import (
66

77
func WrapResourceCommand(cmd *cobra.Command) *cobra.Command {
88
preRunFunc := func(cmd *cobra.Command, args []string) error {
9+
// if there are not args we let the underline command to deal with it.
10+
if len(args) == 0 {
11+
return nil
12+
}
913
// This mapping helps user during the getting started phase
1014
if args[0] == "organizations" || args[0] == "organization" {
1115
args[0] = "organizationmemberships"

0 commit comments

Comments
 (0)