Skip to content

Commit 19d976f

Browse files
arcuri82arcuri82
committed
fix after refactoring of auth
1 parent 50774ed commit 19d976f

File tree

4 files changed

+55
-92
lines changed

4 files changed

+55
-92
lines changed

‎jdk_11_gradle/em/embedded/graphql/patio-api/src/main/java/em/embedded/patio/EmbeddedEvoMasterController.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22

33
import io.micronaut.context.ApplicationContext;
44
import io.micronaut.runtime.Micronaut;
5+
import org.evomaster.client.java.controller.AuthUtils;
56
import org.evomaster.client.java.controller.EmbeddedSutController;
67
import org.evomaster.client.java.controller.InstrumentedSutStarter;
78
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
8-
import org.evomaster.client.java.controller.api.dto.auth.JsonTokenPostLoginDto;
99
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1010
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1111
import org.evomaster.client.java.sql.DbCleaner;
12-
import org.evomaster.client.java.sql.SqlScriptRunner;
13-
import org.evomaster.client.java.sql.SqlScriptRunnerCached;
1412
import org.evomaster.client.java.controller.internal.SutController;
1513
import org.evomaster.client.java.sql.DbSpecification;
1614
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1715
import org.evomaster.client.java.controller.problem.ProblemInfo;
1816
import org.testcontainers.containers.GenericContainer;
1917
import patio.Application;
2018

21-
import java.io.InputStream;
22-
import java.io.InputStreamReader;
19+
2320
import java.sql.Connection;
2421
import java.sql.DriverManager;
2522
import java.sql.SQLException;
@@ -157,17 +154,12 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
157154
@Override
158155
public List<AuthenticationDto> getInfoForAuthentication() {
159156

160-
JsonTokenPostLoginDto token = new JsonTokenPostLoginDto();
161-
token.userId = "Stark";
162-
token.headerPrefix = "JWT ";
163-
token.endpoint = "/graphql";
164-
token.jsonPayload = "{\"query\": \"{login(email: \\\"tstark@email.com\\\",password: \\\"avengers\\\"){tokens{authenticationToken}}}\"}";
165-
token.extractTokenField = "/data/login/tokens/authenticationToken";
166-
167-
AuthenticationDto dto = new AuthenticationDto("Stark");
168-
dto.jsonTokenPostLogin = token;
169-
170-
return List.of(dto);
157+
return List.of(AuthUtils.getForJWT(
158+
"Stark",
159+
"/graphql",
160+
"{\"query\": \"{login(email: \\\"tstark@email.com\\\",password: \\\"avengers\\\"){tokens{authenticationToken}}}\"}",
161+
"/data/login/tokens/authenticationToken"
162+
));
171163
}
172164

173165

‎jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.mongodb.client.MongoDatabase;
88
import org.bson.Document;
99
import org.bson.types.ObjectId;
10+
import org.evomaster.client.java.controller.AuthUtils;
1011
import org.evomaster.client.java.controller.EmbeddedSutController;
1112
import org.evomaster.client.java.controller.InstrumentedSutStarter;
1213
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
@@ -200,36 +201,24 @@ public List<DbSpecification> getDbSpecifications() {
200201
@Override
201202
public List<AuthenticationDto> getInfoForAuthentication() {
202203
return Arrays.asList(
203-
new AuthenticationDto() {{
204-
name = "admin";
205-
jsonTokenPostLogin = new JsonTokenPostLoginDto() {{
206-
userId = "admin";
207-
endpoint = "/api/user/login";
208-
jsonPayload = "{\"username\":\"admin\", \"password\":\""+rawPassword+"\"}";
209-
extractTokenField = "/accessToken";
210-
headerPrefix = "Bearer ";
211-
}};
212-
}},
213-
new AuthenticationDto() {{
214-
name = "foo";
215-
jsonTokenPostLogin = new JsonTokenPostLoginDto() {{
216-
userId = "foo";
217-
endpoint = "/api/user/login";
218-
jsonPayload = "{\"username\":\"foo\", \"password\":\""+rawPassword+"\"}";
219-
extractTokenField = "/accessToken";
220-
headerPrefix = "Bearer ";
221-
}};
222-
}},
223-
new AuthenticationDto() {{
224-
name = "bar";
225-
jsonTokenPostLogin = new JsonTokenPostLoginDto() {{
226-
userId = "bar";
227-
endpoint = "/api/user/login";
228-
jsonPayload = "{\"username\":\"bar\", \"password\":\""+rawPassword+"\"}";
229-
extractTokenField = "/accessToken";
230-
headerPrefix = "Bearer ";
231-
}};
232-
}}
204+
AuthUtils.getForJsonTokenBearer(
205+
"admin",
206+
"/api/user/login",
207+
"{\"username\":\"admin\", \"password\":\""+rawPassword+"\"}",
208+
"/accessToken"
209+
),
210+
AuthUtils.getForJsonTokenBearer(
211+
"foo",
212+
"/api/user/login",
213+
"{\"username\":\"foo\", \"password\":\""+rawPassword+"\"}",
214+
"/accessToken"
215+
),
216+
AuthUtils.getForJsonTokenBearer(
217+
"bar",
218+
"/api/user/login",
219+
"{\"username\":\"bar\", \"password\":\""+rawPassword+"\"}",
220+
"/accessToken"
221+
)
233222
);
234223
}
235224

‎jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
package em.external.patio;
22

3+
import org.evomaster.client.java.controller.AuthUtils;
34
import org.evomaster.client.java.controller.ExternalSutController;
45
import org.evomaster.client.java.controller.InstrumentedSutStarter;
56
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
6-
import org.evomaster.client.java.controller.api.dto.auth.JsonTokenPostLoginDto;
77
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
88
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
99
import org.evomaster.client.java.sql.DbCleaner;
10-
import org.evomaster.client.java.sql.SqlScriptRunner;
11-
import org.evomaster.client.java.sql.SqlScriptRunnerCached;
10+
1211
import org.evomaster.client.java.sql.DbSpecification;
1312
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1413
import org.evomaster.client.java.controller.problem.ProblemInfo;
1514
import org.testcontainers.containers.GenericContainer;
1615

17-
import java.io.InputStream;
18-
import java.io.InputStreamReader;
16+
1917
import java.sql.Connection;
2018
import java.sql.DriverManager;
2119
import java.sql.SQLException;
@@ -219,17 +217,12 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
219217
@Override
220218
public List<AuthenticationDto> getInfoForAuthentication() {
221219

222-
JsonTokenPostLoginDto token = new JsonTokenPostLoginDto();
223-
token.userId = "Stark";
224-
token.headerPrefix = "JWT ";
225-
token.endpoint = "/graphql";
226-
token.jsonPayload = "{\"query\": \"{login(email: \\\"tstark@email.com\\\",password: \\\"avengers\\\"){tokens{authenticationToken}}}\"}";
227-
token.extractTokenField = "/data/login/tokens/authenticationToken";
228-
229-
AuthenticationDto dto = new AuthenticationDto("Stark");
230-
dto.jsonTokenPostLogin = token;
231-
232-
return List.of(dto);
220+
return List.of(AuthUtils.getForJWT(
221+
"Stark",
222+
"/graphql",
223+
"{\"query\": \"{login(email: \\\"tstark@email.com\\\",password: \\\"avengers\\\"){tokens{authenticationToken}}}\"}",
224+
"/data/login/tokens/authenticationToken"
225+
));
233226
}
234227

235228
@Override

‎jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.mongodb.client.MongoDatabase;
88
import org.bson.Document;
99
import org.bson.types.ObjectId;
10+
import org.evomaster.client.java.controller.AuthUtils;
1011
import org.evomaster.client.java.controller.ExternalSutController;
1112
import org.evomaster.client.java.controller.InstrumentedSutStarter;
1213
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
@@ -256,36 +257,24 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
256257
public List<AuthenticationDto> getInfoForAuthentication() {
257258

258259
return Arrays.asList(
259-
new AuthenticationDto() {{
260-
name = "admin";
261-
jsonTokenPostLogin = new JsonTokenPostLoginDto() {{
262-
userId = "admin";
263-
endpoint = "/api/user/login";
264-
jsonPayload = "{\"username\":\"admin\", \"password\":\""+rawPassword+"\"}";
265-
extractTokenField = "/accessToken";
266-
headerPrefix = "Bearer ";
267-
}};
268-
}},
269-
new AuthenticationDto() {{
270-
name = "foo";
271-
jsonTokenPostLogin = new JsonTokenPostLoginDto() {{
272-
userId = "foo";
273-
endpoint = "/api/user/login";
274-
jsonPayload = "{\"username\":\"foo\", \"password\":\""+rawPassword+"\"}";
275-
extractTokenField = "/accessToken";
276-
headerPrefix = "Bearer ";
277-
}};
278-
}},
279-
new AuthenticationDto() {{
280-
name = "bar";
281-
jsonTokenPostLogin = new JsonTokenPostLoginDto() {{
282-
userId = "bar";
283-
endpoint = "/api/user/login";
284-
jsonPayload = "{\"username\":\"bar\", \"password\":\""+rawPassword+"\"}";
285-
extractTokenField = "/accessToken";
286-
headerPrefix = "Bearer ";
287-
}};
288-
}}
260+
AuthUtils.getForJsonTokenBearer(
261+
"admin",
262+
"/api/user/login",
263+
"{\"username\":\"admin\", \"password\":\""+rawPassword+"\"}",
264+
"/accessToken"
265+
),
266+
AuthUtils.getForJsonTokenBearer(
267+
"foo",
268+
"/api/user/login",
269+
"{\"username\":\"foo\", \"password\":\""+rawPassword+"\"}",
270+
"/accessToken"
271+
),
272+
AuthUtils.getForJsonTokenBearer(
273+
"bar",
274+
"/api/user/login",
275+
"{\"username\":\"bar\", \"password\":\""+rawPassword+"\"}",
276+
"/accessToken"
277+
)
289278
);
290279
}
291280

0 commit comments

Comments
 (0)