Skip to content

Commit 477abae

Browse files
zepatrikzepatrik
authored
chore: bump dependencies and generate internal SDK aligned with the published SDK (#3807)
1 parent 0b3ecfc commit 477abae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1268
-1357
lines changed

‎.docker/Dockerfile-build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21 AS builder
1+
FROM golang:1.22 AS builder
22

33
WORKDIR /go/src/github.com/ory/hydra
44

‎.docker/Dockerfile-hsm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21 AS builder
1+
FROM golang:1.22 AS builder
22

33
WORKDIR /go/src/github.com/ory/hydra
44

‎.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fetch-depth: 2
2626
- uses: actions/setup-go@v3
2727
with:
28-
go-version: "1.21"
28+
go-version: "1.22"
2929
- name: Start service
3030
run: ./test/conformance/start.sh
3131
- name: Run tests
@@ -82,7 +82,7 @@ jobs:
8282
key: ${{ needs.sdk-generate.outputs.sdk-cache-key }}
8383
- uses: actions/setup-go@v4
8484
with:
85-
go-version: "1.21"
85+
go-version: "1.22"
8686
- run: go list -json > go.list
8787
- name: Run nancy
8888
uses: sonatype-nexus-community/[email protected]
@@ -125,7 +125,7 @@ jobs:
125125
key: ${{ needs.sdk-generate.outputs.sdk-cache-key }}
126126
- uses: actions/setup-go@v3
127127
with:
128-
go-version: "1.21"
128+
go-version: "1.22"
129129
- name: Setup HSM libs and packages
130130
run: |
131131
sudo apt install -y softhsm opensc
@@ -176,7 +176,7 @@ jobs:
176176
- uses: ory/ci/checkout@master
177177
- uses: actions/setup-go@v3
178178
with:
179-
go-version: "1.21"
179+
go-version: "1.22"
180180
- uses: actions/cache@v2
181181
with:
182182
path: ./test/e2e/hydra

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- uses: actions/setup-go@v4
4545
with:
46-
go-version: "1.21"
46+
go-version: "1.22"
4747
- run: go version
4848

4949
# Initializes the CodeQL tools for scanning.

‎.github/workflows/format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v3
1212
- uses: actions/setup-go@v3
1313
with:
14-
go-version: "1.21"
14+
go-version: "1.22"
1515
- run: make format
1616
- name: Indicate formatting issues
1717
run: git diff HEAD --exit-code --color

‎.github/workflows/licenses.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-go@v3
1616
with:
17-
go-version: "1.21"
17+
go-version: "1.22"
1818
- uses: actions/setup-node@v2
1919
with:
2020
node-version: "18"

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ sdk: .bin/swagger .bin/ory node_modules
147147
--git-user-id ory \
148148
--git-repo-id hydra-client-go/v2 \
149149
--git-host github.com \
150-
--api-name-suffix "Api" \
150+
--api-name-suffix "API" \
151151
--global-property apiTests=false
152152

153153
make format

‎client/sdk_test.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ func TestClientSDK(t *testing.T) {
8080
c.GetConfig().Servers = hydra.ServerConfigurations{{URL: server.URL}}
8181

8282
t.Run("case=client default scopes are set", func(t *testing.T) {
83-
result, _, err := c.OAuth2Api.CreateOAuth2Client(ctx).OAuth2Client(hydra.OAuth2Client{}).Execute()
83+
result, _, err := c.OAuth2API.CreateOAuth2Client(ctx).OAuth2Client(hydra.OAuth2Client{}).Execute()
8484
require.NoError(t, err)
8585
assert.EqualValues(t, conf.DefaultClientScope(ctx), strings.Split(*result.Scope, " "))
8686

87-
_, err = c.OAuth2Api.DeleteOAuth2Client(ctx, *result.ClientId).Execute()
87+
_, err = c.OAuth2API.DeleteOAuth2Client(ctx, *result.ClientId).Execute()
8888
require.NoError(t, err)
8989
})
9090

@@ -95,7 +95,7 @@ func TestClientSDK(t *testing.T) {
9595
// createClient.SecretExpiresAt = 10
9696

9797
// returned client is correct on Create
98-
result, _, err := c.OAuth2Api.CreateOAuth2Client(ctx).OAuth2Client(createClient).Execute()
98+
result, _, err := c.OAuth2API.CreateOAuth2Client(ctx).OAuth2Client(createClient).Execute()
9999
require.NoError(t, err)
100100
assert.NotEmpty(t, result.UpdatedAt)
101101
assert.NotEmpty(t, result.CreatedAt)
@@ -109,31 +109,31 @@ func TestClientSDK(t *testing.T) {
109109

110110
// secret is not returned on GetOAuth2Client
111111
compareClient.ClientSecret = pointerx.Ptr("")
112-
gresult, _, err := c.OAuth2Api.GetOAuth2Client(context.Background(), *createClient.ClientId).Execute()
112+
gresult, _, err := c.OAuth2API.GetOAuth2Client(context.Background(), *createClient.ClientId).Execute()
113113
require.NoError(t, err)
114114
assertx.EqualAsJSONExcept(t, compareClient, gresult, append(defaultIgnoreFields, "client_secret"))
115115

116116
// get client will return The request could not be authorized
117-
gresult, _, err = c.OAuth2Api.GetOAuth2Client(context.Background(), "unknown").Execute()
117+
gresult, _, err = c.OAuth2API.GetOAuth2Client(context.Background(), "unknown").Execute()
118118
require.Error(t, err)
119119
assert.Empty(t, gresult)
120120
assert.True(t, strings.Contains(err.Error(), "404"), err.Error())
121121

122122
// listing clients returns the only added one
123-
results, _, err := c.OAuth2Api.ListOAuth2Clients(context.Background()).PageSize(100).Execute()
123+
results, _, err := c.OAuth2API.ListOAuth2Clients(context.Background()).PageSize(100).Execute()
124124
require.NoError(t, err)
125125
assert.Len(t, results, 1)
126126
assertx.EqualAsJSONExcept(t, compareClient, results[0], append(defaultIgnoreFields, "client_secret"))
127127

128128
// SecretExpiresAt gets overwritten with 0 on Update
129129
compareClient.ClientSecret = createClient.ClientSecret
130-
uresult, _, err := c.OAuth2Api.SetOAuth2Client(context.Background(), *createClient.ClientId).OAuth2Client(createClient).Execute()
130+
uresult, _, err := c.OAuth2API.SetOAuth2Client(context.Background(), *createClient.ClientId).OAuth2Client(createClient).Execute()
131131
require.NoError(t, err)
132132
assertx.EqualAsJSONExcept(t, compareClient, uresult, append(defaultIgnoreFields, "client_secret"))
133133

134134
// create another client
135135
updateClient := createTestClient("foo")
136-
uresult, _, err = c.OAuth2Api.SetOAuth2Client(context.Background(), *createClient.ClientId).OAuth2Client(updateClient).Execute()
136+
uresult, _, err = c.OAuth2API.SetOAuth2Client(context.Background(), *createClient.ClientId).OAuth2Client(updateClient).Execute()
137137
require.NoError(t, err)
138138
assert.NotEqual(t, updateClient.ClientId, uresult.ClientId)
139139
updateClient.ClientId = uresult.ClientId
@@ -142,35 +142,35 @@ func TestClientSDK(t *testing.T) {
142142
// again, test if secret is not returned on Get
143143
compareClient = updateClient
144144
compareClient.ClientSecret = pointerx.Ptr("")
145-
gresult, _, err = c.OAuth2Api.GetOAuth2Client(context.Background(), *updateClient.ClientId).Execute()
145+
gresult, _, err = c.OAuth2API.GetOAuth2Client(context.Background(), *updateClient.ClientId).Execute()
146146
require.NoError(t, err)
147147
assertx.EqualAsJSONExcept(t, compareClient, gresult, append(defaultIgnoreFields, "client_secret"))
148148

149149
// client can not be found after being deleted
150-
_, err = c.OAuth2Api.DeleteOAuth2Client(context.Background(), *updateClient.ClientId).Execute()
150+
_, err = c.OAuth2API.DeleteOAuth2Client(context.Background(), *updateClient.ClientId).Execute()
151151
require.NoError(t, err)
152152

153-
_, _, err = c.OAuth2Api.GetOAuth2Client(context.Background(), *updateClient.ClientId).Execute()
153+
_, _, err = c.OAuth2API.GetOAuth2Client(context.Background(), *updateClient.ClientId).Execute()
154154
require.Error(t, err)
155155
})
156156

157157
t.Run("case=public client is transmitted without secret", func(t *testing.T) {
158-
result, _, err := c.OAuth2Api.CreateOAuth2Client(context.Background()).OAuth2Client(hydra.OAuth2Client{
158+
result, _, err := c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(hydra.OAuth2Client{
159159
TokenEndpointAuthMethod: pointerx.Ptr("none"),
160160
}).Execute()
161161
require.NoError(t, err)
162162

163163
assert.Equal(t, "", pointerx.Deref(result.ClientSecret))
164164

165-
result, _, err = c.OAuth2Api.CreateOAuth2Client(context.Background()).OAuth2Client(createTestClient("")).Execute()
165+
result, _, err = c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(createTestClient("")).Execute()
166166
require.NoError(t, err)
167167

168168
assert.Equal(t, "secret", pointerx.Deref(result.ClientSecret))
169169
})
170170

171171
t.Run("case=id can be set", func(t *testing.T) {
172172
id := uuidx.NewV4().String()
173-
result, _, err := c.OAuth2Api.CreateOAuth2Client(context.Background()).OAuth2Client(hydra.OAuth2Client{ClientId: pointerx.Ptr(id)}).Execute()
173+
result, _, err := c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(hydra.OAuth2Client{ClientId: pointerx.Ptr(id)}).Execute()
174174
require.NoError(t, err)
175175

176176
assert.Equal(t, id, pointerx.Deref(result.ClientId))
@@ -182,14 +182,14 @@ func TestClientSDK(t *testing.T) {
182182
value := "http://foo.bar"
183183

184184
cl := createTestClient("")
185-
created, _, err := c.OAuth2Api.CreateOAuth2Client(context.Background()).OAuth2Client(cl).Execute()
185+
created, _, err := c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(cl).Execute()
186186
require.NoError(t, err)
187187
cl.ClientId = created.ClientId
188188

189189
expected := deepcopy.Copy(cl).(hydra.OAuth2Client)
190190
expected.RedirectUris = append(expected.RedirectUris, value)
191191

192-
result, _, err := c.OAuth2Api.PatchOAuth2Client(context.Background(), *cl.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
192+
result, _, err := c.OAuth2API.PatchOAuth2Client(context.Background(), *cl.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
193193
require.NoError(t, err)
194194
expected.CreatedAt = result.CreatedAt
195195
expected.UpdatedAt = result.UpdatedAt
@@ -204,11 +204,11 @@ func TestClientSDK(t *testing.T) {
204204
value := "foo"
205205

206206
client := createTestClient("")
207-
created, res, err := c.OAuth2Api.CreateOAuth2Client(context.Background()).OAuth2Client(client).Execute()
207+
created, res, err := c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(client).Execute()
208208
require.NoError(t, err, "%s", ioutilx.MustReadAll(res.Body))
209209
client.ClientId = created.ClientId
210210

211-
_, _, err = c.OAuth2Api.PatchOAuth2Client(context.Background(), *client.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
211+
_, _, err = c.OAuth2API.PatchOAuth2Client(context.Background(), *client.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
212212
require.Error(t, err)
213213
})
214214

@@ -218,13 +218,13 @@ func TestClientSDK(t *testing.T) {
218218
value := "http://foo.bar"
219219

220220
client := createTestClient("")
221-
created, _, err := c.OAuth2Api.CreateOAuth2Client(context.Background()).OAuth2Client(client).Execute()
221+
created, _, err := c.OAuth2API.CreateOAuth2Client(context.Background()).OAuth2Client(client).Execute()
222222
require.NoError(t, err)
223223
client.ClientId = created.ClientId
224224

225-
result1, _, err := c.OAuth2Api.PatchOAuth2Client(context.Background(), *client.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
225+
result1, _, err := c.OAuth2API.PatchOAuth2Client(context.Background(), *client.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
226226
require.NoError(t, err)
227-
result2, _, err := c.OAuth2Api.PatchOAuth2Client(context.Background(), *client.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
227+
result2, _, err := c.OAuth2API.PatchOAuth2Client(context.Background(), *client.ClientId).JsonPatch([]hydra.JsonPatch{{Op: op, Path: path, Value: value}}).Execute()
228228
require.NoError(t, err)
229229

230230
// secret hashes shouldn't change between these PUT calls

‎cmd/cmd_create_client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" +
9191
cl.ClientId = pointerx.Ptr(flagx.MustGetString(cmd, flagClientId))
9292

9393
//nolint:bodyclose
94-
client, _, err := m.OAuth2Api.CreateOAuth2Client(cmd.Context()).OAuth2Client(cl).Execute()
94+
client, _, err := m.OAuth2API.CreateOAuth2Client(cmd.Context()).OAuth2Client(cl).Execute()
9595
if err != nil {
9696
return cmdx.PrintOpenAPIError(cmd, err)
9797
}
9898

9999
if client.ClientSecret == nil && len(secret) > 0 {
100-
client.ClientSecret = pointerx.String(secret)
100+
client.ClientSecret = pointerx.Ptr(secret)
101101
}
102102

103103
if encryptSecret && client.ClientSecret != nil {
@@ -107,7 +107,7 @@ To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" +
107107
return cmdx.FailSilently(cmd)
108108
}
109109

110-
client.ClientSecret = pointerx.String(enc.Base64Encode())
110+
client.ClientSecret = pointerx.Ptr(enc.Base64Encode())
111111
}
112112

113113
cmdx.PrintRow(cmd, (*outputOAuth2Client)(client))

‎cmd/cmd_create_jwks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func NewCreateJWKSCmd() *cobra.Command {
3939
}
4040

4141
//nolint:bodyclose
42-
jwks, _, err := m.JwkApi.CreateJsonWebKeySet(context.Background(), args[0]).CreateJsonWebKeySet(hydra.CreateJsonWebKeySet{
42+
jwks, _, err := m.JwkAPI.CreateJsonWebKeySet(context.Background(), args[0]).CreateJsonWebKeySet(hydra.CreateJsonWebKeySet{
4343
Alg: flagx.MustGetString(cmd, alg),
4444
Kid: kid,
4545
Use: flagx.MustGetString(cmd, use),

‎cmd/cmd_delete_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To delete OAuth 2.0 Clients with the owner of "[email protected]", run:
3434
)
3535

3636
for _, c := range args {
37-
_, err := m.OAuth2Api.DeleteOAuth2Client(cmd.Context(), c).Execute() //nolint:bodyclose
37+
_, err := m.OAuth2API.DeleteOAuth2Client(cmd.Context(), c).Execute() //nolint:bodyclose
3838
if err != nil {
3939
failed[c] = cmdx.PrintOpenAPIError(cmd, err)
4040
continue

‎cmd/cmd_delete_jwks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func NewDeleteJWKSCommand() *cobra.Command {
3232
)
3333

3434
for _, c := range args {
35-
_, err = m.JwkApi.DeleteJsonWebKeySet(context.Background(), c).Execute() //nolint:bodyclose
35+
_, err = m.JwkAPI.DeleteJsonWebKeySet(context.Background(), c).Execute() //nolint:bodyclose
3636
if err != nil {
3737
return cmdx.PrintOpenAPIError(cmd, err)
3838
}

‎cmd/cmd_delete_tokens.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func NewDeleteAccessTokensCmd() *cobra.Command {
2323
}
2424

2525
clientID := args[0]
26-
_, err = client.OAuth2Api.DeleteOAuth2Token(cmd.Context()).ClientId(clientID).Execute() //nolint:bodyclose
26+
_, err = client.OAuth2API.DeleteOAuth2Token(cmd.Context()).ClientId(clientID).Execute() //nolint:bodyclose
2727
if err != nil {
2828
return cmdx.PrintOpenAPIError(cmd, err)
2929
}

‎cmd/cmd_get_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func NewGetClientsCmd() *cobra.Command {
2929

3030
clients := make([]hydra.OAuth2Client, 0, len(args))
3131
for _, id := range args {
32-
client, _, err := m.OAuth2Api.GetOAuth2Client(cmd.Context(), id).Execute() //nolint:bodyclose
32+
client, _, err := m.OAuth2API.GetOAuth2Client(cmd.Context(), id).Execute() //nolint:bodyclose
3333
if err != nil {
3434
return cmdx.PrintOpenAPIError(cmd, err)
3535
}

‎cmd/cmd_get_jwks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To get the JSON Web Key Set as only public keys:
3636

3737
var sets outputJSONWebKeyCollection
3838
for _, set := range args {
39-
key, _, err := m.JwkApi.GetJsonWebKeySet(cmd.Context(), set).Execute() //nolint:bodyclose
39+
key, _, err := m.JwkAPI.GetJsonWebKeySet(cmd.Context(), set).Execute() //nolint:bodyclose
4040
if err != nil {
4141
return cmdx.PrintOpenAPIError(cmd, err)
4242
}

‎cmd/cmd_helper_client.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ import (
1818

1919
func clientFromFlags(cmd *cobra.Command) hydra.OAuth2Client {
2020
return hydra.OAuth2Client{
21-
AccessTokenStrategy: pointerx.String(flagx.MustGetString(cmd, flagClientAccessTokenStrategy)),
21+
AccessTokenStrategy: pointerx.Ptr(flagx.MustGetString(cmd, flagClientAccessTokenStrategy)),
2222
AllowedCorsOrigins: flagx.MustGetStringSlice(cmd, flagClientAllowedCORSOrigin),
2323
Audience: flagx.MustGetStringSlice(cmd, flagClientAudience),
24-
BackchannelLogoutSessionRequired: pointerx.Bool(flagx.MustGetBool(cmd, flagClientBackChannelLogoutSessionRequired)),
25-
BackchannelLogoutUri: pointerx.String(flagx.MustGetString(cmd, flagClientBackchannelLogoutCallback)),
26-
ClientName: pointerx.String(flagx.MustGetString(cmd, flagClientName)),
27-
ClientSecret: pointerx.String(flagx.MustGetString(cmd, flagClientSecret)),
28-
ClientUri: pointerx.String(flagx.MustGetString(cmd, flagClientClientURI)),
24+
BackchannelLogoutSessionRequired: pointerx.Ptr(flagx.MustGetBool(cmd, flagClientBackChannelLogoutSessionRequired)),
25+
BackchannelLogoutUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientBackchannelLogoutCallback)),
26+
ClientName: pointerx.Ptr(flagx.MustGetString(cmd, flagClientName)),
27+
ClientSecret: pointerx.Ptr(flagx.MustGetString(cmd, flagClientSecret)),
28+
ClientUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientClientURI)),
2929
Contacts: flagx.MustGetStringSlice(cmd, flagClientContact),
30-
FrontchannelLogoutSessionRequired: pointerx.Bool(flagx.MustGetBool(cmd, flagClientFrontChannelLogoutSessionRequired)),
31-
FrontchannelLogoutUri: pointerx.String(flagx.MustGetString(cmd, flagClientFrontChannelLogoutCallback)),
30+
FrontchannelLogoutSessionRequired: pointerx.Ptr(flagx.MustGetBool(cmd, flagClientFrontChannelLogoutSessionRequired)),
31+
FrontchannelLogoutUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientFrontChannelLogoutCallback)),
3232
GrantTypes: flagx.MustGetStringSlice(cmd, flagClientGrantType),
33-
JwksUri: pointerx.String(flagx.MustGetString(cmd, flagClientJWKSURI)),
34-
LogoUri: pointerx.String(flagx.MustGetString(cmd, flagClientLogoURI)),
33+
JwksUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientJWKSURI)),
34+
LogoUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientLogoURI)),
3535
Metadata: json.RawMessage(flagx.MustGetString(cmd, flagClientMetadata)),
36-
Owner: pointerx.String(flagx.MustGetString(cmd, flagClientOwner)),
37-
PolicyUri: pointerx.String(flagx.MustGetString(cmd, flagClientPolicyURI)),
36+
Owner: pointerx.Ptr(flagx.MustGetString(cmd, flagClientOwner)),
37+
PolicyUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientPolicyURI)),
3838
PostLogoutRedirectUris: flagx.MustGetStringSlice(cmd, flagClientPostLogoutCallback),
3939
RedirectUris: flagx.MustGetStringSlice(cmd, flagClientRedirectURI),
40-
RequestObjectSigningAlg: pointerx.String(flagx.MustGetString(cmd, flagClientRequestObjectSigningAlg)),
40+
RequestObjectSigningAlg: pointerx.Ptr(flagx.MustGetString(cmd, flagClientRequestObjectSigningAlg)),
4141
RequestUris: flagx.MustGetStringSlice(cmd, flagClientRequestURI),
4242
ResponseTypes: flagx.MustGetStringSlice(cmd, flagClientResponseType),
43-
Scope: pointerx.String(strings.Join(flagx.MustGetStringSlice(cmd, flagClientScope), " ")),
44-
SkipConsent: pointerx.Bool(flagx.MustGetBool(cmd, flagClientSkipConsent)),
45-
SkipLogoutConsent: pointerx.Bool(flagx.MustGetBool(cmd, flagClientLogoutSkipConsent)),
46-
SectorIdentifierUri: pointerx.String(flagx.MustGetString(cmd, flagClientSectorIdentifierURI)),
47-
SubjectType: pointerx.String(flagx.MustGetString(cmd, flagClientSubjectType)),
48-
TokenEndpointAuthMethod: pointerx.String(flagx.MustGetString(cmd, flagClientTokenEndpointAuthMethod)),
49-
TosUri: pointerx.String(flagx.MustGetString(cmd, flagClientTOSURI)),
43+
Scope: pointerx.Ptr(strings.Join(flagx.MustGetStringSlice(cmd, flagClientScope), " ")),
44+
SkipConsent: pointerx.Ptr(flagx.MustGetBool(cmd, flagClientSkipConsent)),
45+
SkipLogoutConsent: pointerx.Ptr(flagx.MustGetBool(cmd, flagClientLogoutSkipConsent)),
46+
SectorIdentifierUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientSectorIdentifierURI)),
47+
SubjectType: pointerx.Ptr(flagx.MustGetString(cmd, flagClientSubjectType)),
48+
TokenEndpointAuthMethod: pointerx.Ptr(flagx.MustGetString(cmd, flagClientTokenEndpointAuthMethod)),
49+
TosUri: pointerx.Ptr(flagx.MustGetString(cmd, flagClientTOSURI)),
5050
}
5151
}
5252

‎cmd/cmd_import_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Please be aware that this command does not update existing clients. If the clien
101101

102102
for src, cc := range clients {
103103
for _, c := range cc {
104-
result, _, err := m.OAuth2Api.CreateOAuth2Client(cmd.Context()).OAuth2Client(c).Execute() //nolint:bodyclose
104+
result, _, err := m.OAuth2API.CreateOAuth2Client(cmd.Context()).OAuth2Client(c).Execute() //nolint:bodyclose
105105
if err != nil {
106106
failed[src] = cmdx.PrintOpenAPIError(cmd, err)
107107
continue

0 commit comments

Comments
 (0)