chore: synchronize workspaces

ory · Apr 5, 2024 · f811fe5 · f811fe5
1 parent f3b7ed0
commit f811fe5
Show file tree

Hide file tree

Showing 5 changed files with 352 additions and 15 deletions.
diff --git a/cmd/cmd_create_client.go b/cmd/cmd_create_client.go
@@ -87,8 +87,11 @@ To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" +
 			}
 
 			secret := flagx.MustGetString(cmd, flagClientSecret)
+			cl := clientFromFlags(cmd)
+			cl.ClientId = pointerx.Ptr(flagx.MustGetString(cmd, flagClientId))
+
 			//nolint:bodyclose
-			client, _, err := m.OAuth2Api.CreateOAuth2Client(cmd.Context()).OAuth2Client(clientFromFlags(cmd)).Execute()
+			client, _, err := m.OAuth2Api.CreateOAuth2Client(cmd.Context()).OAuth2Client(cl).Execute()
 			if err != nil {
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}
@@ -112,5 +115,6 @@ To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" +
 		},
 	}
 	registerClientFlags(cmd.Flags())
+	cmd.Flags().String(flagClientId, "", "Provide the client's id.")
 	return cmd
 }
diff --git a/cmd/cmd_helper_client.go b/cmd/cmd_helper_client.go
@@ -23,7 +23,6 @@ func clientFromFlags(cmd *cobra.Command) hydra.OAuth2Client {
 		Audience:                          flagx.MustGetStringSlice(cmd, flagClientAudience),
 		BackchannelLogoutSessionRequired:  pointerx.Bool(flagx.MustGetBool(cmd, flagClientBackChannelLogoutSessionRequired)),
 		BackchannelLogoutUri:              pointerx.String(flagx.MustGetString(cmd, flagClientBackchannelLogoutCallback)),
-		ClientId:                          pointerx.String(flagx.MustGetString(cmd, flagClientId)),
 		ClientName:                        pointerx.String(flagx.MustGetString(cmd, flagClientName)),
 		ClientSecret:                      pointerx.String(flagx.MustGetString(cmd, flagClientSecret)),
 		ClientUri:                         pointerx.String(flagx.MustGetString(cmd, flagClientClientURI)),
@@ -78,7 +77,6 @@ func registerClientFlags(flags *pflag.FlagSet) {
 	flags.String(flagClientLogoURI, "", "A URL string that references a logo for the client")
 	flags.StringSlice(flagClientAllowedCORSOrigin, []string{}, "The list of URLs allowed to make CORS requests. Requires CORS_ENABLED.")
 	flags.String(flagClientSubjectType, "public", "A identifier algorithm. Valid values are `public` and `pairwise`.")
-	flags.String(flagClientId, "", "Provide the client's id.")
 	flags.String(flagClientSecret, "", "Provide the client's secret.")
 	flags.String(flagClientName, "", "The client's name.")
 	flags.StringSlice(flagClientPostLogoutCallback, []string{}, "List of allowed URLs to be redirected to after a logout.")

diff --git a/cmd/cmd_update_client.go b/cmd/cmd_update_client.go
@@ -42,10 +42,6 @@ To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" +
 			}
 
 			id := args[0]
-			if f := cmd.Flag(flagClientId); f.Changed {
-				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "client id cannot be updated")
-				return cmdx.FailSilently(cmd)
-			}
 			cc := clientFromFlags(cmd)
 
 			client, _, err := m.OAuth2Api.SetOAuth2Client(context.Background(), id).OAuth2Client(cc).Execute() //nolint:bodyclose

diff --git a/cmd/cmd_update_client_test.go b/cmd/cmd_update_client_test.go
@@ -44,12 +44,4 @@ func TestUpdateClient(t *testing.T) {
 
 		snapshotx.SnapshotT(t, json.RawMessage(actual.Raw), snapshotExcludedClientFields...)
 	})
-
-	t.Run("case=clientID error", func(t *testing.T) {
-		actual := gjson.Parse(cmdx.ExecExpectedErr(t, c,
-			original.GetID(),
-			"--id", "new-id",
-		))
-		assert.Empty(t, actual)
-	})
 }