Skip to content

Commit 1e12cbc

Browse files
arcuri82arcuri82
committed
update for auth breaking changes
1 parent f44fbab commit 1e12cbc

File tree

7 files changed

+66
-71
lines changed

7 files changed

+66
-71
lines changed

‎jdk_11_maven/em/embedded/rest/pay-publicapi/src/main/java/em/embedded/uk/gov/pay/api/app/EmbeddedEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public String getPackagePrefixesToCover() {
6868
@Override
6969
public List<AuthenticationDto> getInfoForAuthentication() {
7070
AuthenticationDto dto = AuthUtils.getForAuthorizationHeader("foo", "Bearer asdfghdasdjlguuolnga94upq3nrd2642sq7uel0oo");
71-
dto.requireMockHandling = true;
71+
dto.setRequireMockHandling(true);
7272
return Arrays.asList(dto);
7373
}
7474

‎jdk_11_maven/em/external/rest/pay-publicapi/src/main/java/em/external/uk/gov/pay/api/app/ExternalEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
209209
@Override
210210
public List<AuthenticationDto> getInfoForAuthentication() {
211211
AuthenticationDto dto = AuthUtils.getForAuthorizationHeader("foo", "Bearer asdfghdasdjlguuolnga94upq3nrd2642sq7uel0oo");
212-
dto.requireMockHandling = true;
212+
dto.setRequireMockHandling(true);
213213
return Arrays.asList(dto);
214214
}
215215

‎jdk_17_maven/em/embedded/rest/familie-ba-sak/src/main/java/em/embedded/familie/ba/sak/EmbeddedEvoMasterController.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package em.embedded.familie.ba.sak;
22

33
import com.nimbusds.jose.JOSEObjectType;
4+
import com.webfuzzing.commons.auth.LoginEndpoint;
5+
import com.webfuzzing.commons.auth.TokenHandling;
46
import no.nav.security.mock.oauth2.MockOAuth2Server;
57
import no.nav.security.mock.oauth2.OAuth2Config;
68
import no.nav.security.mock.oauth2.token.RequestMapping;
@@ -9,9 +11,6 @@
911
import org.evomaster.client.java.controller.InstrumentedSutStarter;
1012
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1113
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
12-
import org.evomaster.client.java.controller.api.dto.auth.HttpVerb;
13-
import org.evomaster.client.java.controller.api.dto.auth.LoginEndpointDto;
14-
import org.evomaster.client.java.controller.api.dto.auth.TokenHandlingDto;
1514
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1615
import org.evomaster.client.java.controller.problem.ProblemInfo;
1716
import org.evomaster.client.java.controller.problem.RestProblem;
@@ -173,20 +172,20 @@ private OAuth2Config getOAuth2Config(){
173172
private AuthenticationDto getAuthenticationDto(String label, String oauth2Url){
174173

175174
AuthenticationDto dto = new AuthenticationDto(label);
176-
LoginEndpointDto x = new LoginEndpointDto();
177-
dto.loginEndpointAuth = x;
178-
179-
x.externalEndpointURL = oauth2Url;
180-
x.payloadRaw = TOKEN_PARAM+"="+label+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret";
181-
x.verb = HttpVerb.POST;
182-
x.contentType = "application/x-www-form-urlencoded";
183-
x.expectCookies = false;
184-
185-
TokenHandlingDto token = new TokenHandlingDto();
186-
token.headerPrefix = "Bearer ";
187-
token.httpHeaderName = "Authorization";
188-
token.extractFromField = "/access_token";
189-
x.token = token;
175+
LoginEndpoint x = new LoginEndpoint();
176+
dto.setLoginEndpointAuth(x);
177+
178+
x.setExternalEndpointURL(oauth2Url);
179+
x.setPayloadRaw(TOKEN_PARAM+"="+label+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret");
180+
x.setVerb(LoginEndpoint.HttpVerb.POST);
181+
x.setContentType("application/x-www-form-urlencoded");
182+
x.setExpectCookies(false);
183+
184+
TokenHandling token = new TokenHandling();
185+
token.setHeaderPrefix("Bearer ");
186+
token.setHttpHeaderName("Authorization");
187+
token.setExtractFromField("/access_token");
188+
x.setToken(token);
190189

191190
return dto;
192191
}

‎jdk_17_maven/em/embedded/rest/tiltaksgjennomforing-api/src/main/java/em/embedded/rest/tiltaksgjennomforing/api/EmbeddedEvoMasterController.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package em.embedded.rest.tiltaksgjennomforing.api;
22

33
import com.nimbusds.jose.JOSEObjectType;
4+
import com.webfuzzing.commons.auth.LoginEndpoint;
5+
import com.webfuzzing.commons.auth.TokenHandling;
46
import no.nav.security.mock.oauth2.MockOAuth2Server;
57
import no.nav.security.mock.oauth2.OAuth2Config;
68
import no.nav.security.mock.oauth2.token.RequestMapping;
@@ -11,9 +13,6 @@
1113
import org.evomaster.client.java.controller.InstrumentedSutStarter;
1214
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1315
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
14-
import org.evomaster.client.java.controller.api.dto.auth.HttpVerb;
15-
import org.evomaster.client.java.controller.api.dto.auth.LoginEndpointDto;
16-
import org.evomaster.client.java.controller.api.dto.auth.TokenHandlingDto;
1716
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1817
import org.evomaster.client.java.controller.problem.ProblemInfo;
1918
import org.evomaster.client.java.controller.problem.RestProblem;
@@ -86,20 +85,20 @@ public String getPackagePrefixesToCover() {
8685
private AuthenticationDto getAuthenticationDto(String label, String keyValue, String oauth2Url){
8786

8887
AuthenticationDto dto = new AuthenticationDto(label);
89-
LoginEndpointDto x = new LoginEndpointDto();
90-
dto.loginEndpointAuth = x;
91-
92-
x.externalEndpointURL = oauth2Url;
93-
x.payloadRaw = keyValue+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret";
94-
x.verb = HttpVerb.POST;
95-
x.contentType = "application/x-www-form-urlencoded";
96-
x.expectCookies = false;
97-
98-
TokenHandlingDto token = new TokenHandlingDto();
99-
token.headerPrefix = "Bearer ";
100-
token.httpHeaderName = "Authorization";
101-
token.extractFromField = "/access_token";
102-
x.token = token;
88+
LoginEndpoint x = new LoginEndpoint();
89+
dto.setLoginEndpointAuth(x);
90+
91+
x.setExternalEndpointURL(oauth2Url);
92+
x.setPayloadRaw(keyValue+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret");
93+
x.setVerb(LoginEndpoint.HttpVerb.POST);
94+
x.setContentType("application/x-www-form-urlencoded");
95+
x.setExpectCookies(false);
96+
97+
TokenHandling token = new TokenHandling();
98+
token.setHeaderPrefix("Bearer ");
99+
token.setHttpHeaderName("Authorization");
100+
token.setExtractFromField("/access_token");
101+
x.setToken(token);
103102

104103
return dto;
105104
}

‎jdk_17_maven/em/external/rest/familie-ba-sak/src/main/java/em/external/familie/ba/sak/ExternalEvoMasterController.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package em.external.familie.ba.sak;
22

33
import com.nimbusds.jose.JOSEObjectType;
4+
import com.webfuzzing.commons.auth.LoginEndpoint;
5+
import com.webfuzzing.commons.auth.TokenHandling;
46
import no.nav.security.mock.oauth2.MockOAuth2Server;
57
import no.nav.security.mock.oauth2.OAuth2Config;
68
import no.nav.security.mock.oauth2.token.RequestMapping;
@@ -9,9 +11,6 @@
911
import org.evomaster.client.java.controller.InstrumentedSutStarter;
1012
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
1113
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
12-
import org.evomaster.client.java.controller.api.dto.auth.HttpVerb;
13-
import org.evomaster.client.java.controller.api.dto.auth.LoginEndpointDto;
14-
import org.evomaster.client.java.controller.api.dto.auth.TokenHandlingDto;
1514
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1615
import org.evomaster.client.java.controller.problem.RestProblem;
1716
import org.evomaster.client.java.sql.DbCleaner;
@@ -364,20 +363,20 @@ private OAuth2Config getOAuth2Config(){
364363
private AuthenticationDto getAuthenticationDto(String label, String oauth2Url){
365364

366365
AuthenticationDto dto = new AuthenticationDto(label);
367-
LoginEndpointDto x = new LoginEndpointDto();
368-
dto.loginEndpointAuth = x;
369-
370-
x.externalEndpointURL = oauth2Url;
371-
x.payloadRaw = TOKEN_PARAM+"="+label+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret";
372-
x.verb = HttpVerb.POST;
373-
x.contentType = "application/x-www-form-urlencoded";
374-
x.expectCookies = false;
375-
376-
TokenHandlingDto token = new TokenHandlingDto();
377-
token.headerPrefix = "Bearer ";
378-
token.httpHeaderName = "Authorization";
379-
token.extractFromField = "/access_token";
380-
x.token = token;
366+
LoginEndpoint x = new LoginEndpoint();
367+
dto.setLoginEndpointAuth(x);
368+
369+
x.setExternalEndpointURL(oauth2Url);
370+
x.setPayloadRaw(TOKEN_PARAM+"="+label+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret");
371+
x.setVerb(LoginEndpoint.HttpVerb.POST);
372+
x.setContentType("application/x-www-form-urlencoded");
373+
x.setExpectCookies(false);
374+
375+
TokenHandling token = new TokenHandling();
376+
token.setHeaderPrefix("Bearer ");
377+
token.setHttpHeaderName("Authorization");
378+
token.setExtractFromField("/access_token");
379+
x.setToken(token);
381380

382381
return dto;
383382
}

‎jdk_17_maven/em/external/rest/tiltaksgjennomforing-api/src/main/java/em/external/tiltaksgjennomforing/api/ExternalEvoMasterController.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package em.external.tiltaksgjennomforing.api;
22

33
import com.nimbusds.jose.JOSEObjectType;
4+
import com.webfuzzing.commons.auth.LoginEndpoint;
5+
import com.webfuzzing.commons.auth.TokenHandling;
46
import no.nav.security.mock.oauth2.MockOAuth2Server;
57
import no.nav.security.mock.oauth2.OAuth2Config;
68
import no.nav.security.mock.oauth2.token.RequestMapping;
@@ -9,9 +11,6 @@
911
import org.evomaster.client.java.controller.InstrumentedSutStarter;
1012
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1113
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
12-
import org.evomaster.client.java.controller.api.dto.auth.HttpVerb;
13-
import org.evomaster.client.java.controller.api.dto.auth.LoginEndpointDto;
14-
import org.evomaster.client.java.controller.api.dto.auth.TokenHandlingDto;
1514
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1615
import org.evomaster.client.java.controller.problem.ProblemInfo;
1716
import org.evomaster.client.java.controller.problem.RestProblem;
@@ -336,20 +335,20 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
336335
private AuthenticationDto getAuthenticationDto(String label, String keyValue, String oauth2Url){
337336

338337
AuthenticationDto dto = new AuthenticationDto(label);
339-
LoginEndpointDto x = new LoginEndpointDto();
340-
dto.loginEndpointAuth = x;
341-
342-
x.externalEndpointURL = oauth2Url;
343-
x.payloadRaw = keyValue+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret";
344-
x.verb = HttpVerb.POST;
345-
x.contentType = "application/x-www-form-urlencoded";
346-
x.expectCookies = false;
347-
348-
TokenHandlingDto token = new TokenHandlingDto();
349-
token.headerPrefix = "Bearer ";
350-
token.httpHeaderName = "Authorization";
351-
token.extractFromField = "/access_token";
352-
x.token = token;
338+
LoginEndpoint x = new LoginEndpoint();
339+
dto.setLoginEndpointAuth(x);
340+
341+
x.setExternalEndpointURL(oauth2Url);
342+
x.setPayloadRaw(keyValue+"&grant_type=client_credentials&code=foo&client_id=foo&client_secret=secret");
343+
x.setVerb(LoginEndpoint.HttpVerb.POST);
344+
x.setContentType("application/x-www-form-urlencoded");
345+
x.setExpectCookies(false);
346+
347+
TokenHandling token = new TokenHandling();
348+
token.setHeaderPrefix("Bearer ");
349+
token.setHttpHeaderName("Authorization");
350+
token.setExtractFromField("/access_token");
351+
x.setToken(token);
353352

354353
return dto;
355354
}

‎jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.evomaster.client.java.controller.problem.ProblemInfo;
1111
import org.evomaster.client.java.controller.problem.RestProblem;
1212
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
13-
import org.evomaster.client.java.controller.api.dto.auth.HeaderDto;
1413
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1514
import org.h2.tools.Server;
1615

0 commit comments

Comments
 (0)