Skip to content

Commit b1a2d87

Browse files
committed
fixing auth in pay-publicapi
1 parent 2dee466 commit b1a2d87

5 files changed

Lines changed: 26 additions & 8 deletions

File tree

jdk_11_maven/cs/rest/pay-publicapi/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@
182182
<version>${junit5.version}</version>
183183
<scope>test</scope>
184184
</dependency>
185+
<dependency>
186+
<groupId>org.junit.jupiter</groupId>
187+
<artifactId>junit-jupiter-api</artifactId>
188+
<version>${junit5.version}</version>
189+
<scope>test</scope>
190+
</dependency>
185191
<dependency>
186192
<groupId>org.junit.jupiter</groupId>
187193
<artifactId>junit-jupiter-params</artifactId>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package em.embedded.uk.gov.pay.api.app;
22

3+
import org.evomaster.client.java.controller.AuthUtils;
34
import org.evomaster.client.java.controller.EmbeddedSutController;
45
import org.evomaster.client.java.controller.InstrumentedSutStarter;
56
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
@@ -12,6 +13,7 @@
1213
import redis.clients.jedis.Jedis;
1314
import redis.clients.jedis.JedisPool;
1415

16+
import java.util.Arrays;
1517
import java.util.List;
1618

1719
public class EmbeddedEvoMasterController extends EmbeddedSutController {
@@ -65,8 +67,9 @@ public String getPackagePrefixesToCover() {
6567

6668
@Override
6769
public List<AuthenticationDto> getInfoForAuthentication() {
68-
// TODO: Application takes Bearer token through header
69-
return null;
70+
return Arrays.asList(
71+
AuthUtils.getForAuthorizationHeader("foo", "Bearer asdfghdasdjlguuolnga94upq3nrd2642sq7uel0oo")
72+
);
7073
}
7174

7275
@Override

jdk_11_maven/em/embedded/rest/pay-publicapi/src/main/resources/em_config.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ logging:
3030

3131
baseUrl: ${PUBLICAPI_BASE}
3232
connectorUrl: ${CONNECTOR_URL}
33-
publicAuthUrl: ${PUBLIC_AUTH_URL}
33+
publicAuthUrl: http://public.auth.url.com:8080
34+
#publicAuthUrl: ${PUBLIC_AUTH_URL}
3435
ledgerUrl: ${LEDGER_URL}
3536

3637
jerseyClientConfig:
@@ -58,7 +59,9 @@ redis:
5859

5960
allowHttpForReturnUrl: ${ALLOW_HTTP_FOR_RETURN_URL:-false}
6061

61-
apiKeyHmacSecret: ${TOKEN_API_HMAC_SECRET}
62+
#apiKeyHmacSecret: ${TOKEN_API_HMAC_SECRET}
63+
apiKeyHmacSecret: "mysupersecret"
64+
6265

6366
# Caching authenticator.
6467
authenticationCachePolicy: expireAfterWrite=1m

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package em.external.uk.gov.pay.api.app;
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.SutInfoDto;
@@ -16,6 +17,7 @@
1617
import java.nio.file.Path;
1718
import java.nio.file.Paths;
1819
import java.nio.file.StandardCopyOption;
20+
import java.util.Arrays;
1921
import java.util.List;
2022

2123
public class ExternalEvoMasterController extends ExternalSutController {
@@ -206,8 +208,9 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
206208

207209
@Override
208210
public List<AuthenticationDto> getInfoForAuthentication() {
209-
//TODO
210-
return null;
211+
return Arrays.asList(
212+
AuthUtils.getForAuthorizationHeader("foo", "Bearer asdfghdasdjlguuolnga94upq3nrd2642sq7uel0oo")
213+
);
211214
}
212215

213216

jdk_11_maven/em/external/rest/pay-publicapi/src/main/resources/em_config.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ logging:
3030

3131
baseUrl: ${PUBLICAPI_BASE}
3232
connectorUrl: ${CONNECTOR_URL}
33-
publicAuthUrl: ${PUBLIC_AUTH_URL}
33+
publicAuthUrl: http://public.auth.url.com:8080
34+
#publicAuthUrl: ${PUBLIC_AUTH_URL}
3435
ledgerUrl: ${LEDGER_URL}
3536

3637
jerseyClientConfig:
@@ -58,7 +59,9 @@ redis:
5859

5960
allowHttpForReturnUrl: ${ALLOW_HTTP_FOR_RETURN_URL:-false}
6061

61-
apiKeyHmacSecret: ${TOKEN_API_HMAC_SECRET}
62+
#apiKeyHmacSecret: ${TOKEN_API_HMAC_SECRET}
63+
apiKeyHmacSecret: "mysupersecret"
64+
6265

6366
# Caching authenticator.
6467
authenticationCachePolicy: expireAfterWrite=1m

0 commit comments

Comments
 (0)