Skip to content

Commit 46ab4ce

Browse files
committed
Split addUser into better customizable methods
1 parent 3998730 commit 46ab4ce

File tree

2 files changed

+42
-25
lines changed

2 files changed

+42
-25
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.2.4
2+
* ``oidc-server-mock``
3+
* Split ``addUser`` into better customizable methods
4+
15
# 2.2.3
26
* ``oidc-server-mock``
37
* Make it easier to define extend from ``OIDCTCIFactory``

oidc-server-mock/src/main/java/software/xdev/tci/oidc/OIDCTCI.java

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -139,35 +139,16 @@ public void addUser(
139139
final String email,
140140
final String name,
141141
final String pw)
142+
{
143+
this.apiAddUser(this.createDefaultBodyForAddUser(email, name, pw));
144+
}
145+
146+
protected void apiAddUser(final String jsonBody)
142147
{
143148
try(final CloseableHttpClient client = this.createDefaultHttpClient())
144149
{
145150
final HttpPost post = new HttpPost(this.getContainer().getExternalHttpBaseEndPoint() + "/api/v1/user");
146-
post.setEntity(new StringEntity("""
147-
{
148-
"SubjectId":"%s",
149-
"Username":"%s",
150-
"Password":"%s",
151-
"Claims": [
152-
{
153-
"Type": "name",
154-
"Value": "%s",
155-
"ValueType": "string"
156-
},
157-
{
158-
"Type": "email",
159-
"Value": "%s",
160-
"ValueType": "string"
161-
}
162-
]
163-
}
164-
""".formatted(
165-
UUID.randomUUID().toString(),
166-
email,
167-
pw,
168-
name,
169-
email
170-
)));
151+
post.setEntity(new StringEntity(jsonBody));
171152
post.setHeader(HttpHeaders.ACCEPT, ContentType.APPLICATION_JSON.getMimeType());
172153
post.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
173154

@@ -185,6 +166,38 @@ public void addUser(
185166
}
186167
}
187168

169+
protected String createDefaultBodyForAddUser(
170+
final String email,
171+
final String name,
172+
final String pw)
173+
{
174+
return """
175+
{
176+
"SubjectId":"%s",
177+
"Username":"%s",
178+
"Password":"%s",
179+
"Claims": [
180+
{
181+
"Type": "name",
182+
"Value": "%s",
183+
"ValueType": "string"
184+
},
185+
{
186+
"Type": "email",
187+
"Value": "%s",
188+
"ValueType": "string"
189+
}
190+
]
191+
}
192+
""".formatted(
193+
UUID.randomUUID().toString(),
194+
email,
195+
pw,
196+
name,
197+
email
198+
);
199+
}
200+
188201
protected CloseableHttpClient createDefaultHttpClient()
189202
{
190203
return HttpClientBuilder.create()

0 commit comments

Comments
 (0)