Skip to content

Commit 718ace5

Browse files
arcuri82arcuri82
committed
more fixes
1 parent 243300d commit 718ace5

File tree

1 file changed

+28
-55
lines changed

1 file changed

+28
-55
lines changed

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

Lines changed: 28 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ public class EmbeddedEvoMasterController extends EmbeddedSutController {
6060
private static final String A4 = "Forvalter";
6161
private static final String A5 = "Kode6";
6262
private static final String A6 = "Kode7";
63+
private static final String A7 = "System";
6364

65+
private static final String veileder = "93a26831-9866-4410-927b-74ff51a9107c";
66+
private static final String saksbehandler = "d21e00a4-969d-4b28-8782-dc818abfae65";
67+
private static final String beslutter = "9449c153-5a1e-44a7-84c6-7cc7a8867233";
68+
private static final String forvalter = "c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b";
69+
private static final String kode6 = "5ef775f2-61f8-4283-bf3d-8d03f428aa14";
70+
private static final String kode7 = "ea930b6b-9397-44d9-b9e6-f4cf527a632a";
6471

6572
private Connection sqlConnection;
6673
private List<DbSpecification> dbSpecification;
@@ -109,7 +116,8 @@ public List<AuthenticationDto> getInfoForAuthentication() {
109116
getAuthenticationDto(A3,url),
110117
getAuthenticationDto(A4,url),
111118
getAuthenticationDto(A5,url),
112-
getAuthenticationDto(A6,url)
119+
getAuthenticationDto(A6,url),
120+
getAuthenticationDto(A7,url)
113121
);
114122
}
115123

@@ -118,6 +126,10 @@ private RequestMapping getRequestMapping(String label, List<String> groups, Stri
118126
claims.put("groups",groups);
119127
claims.put("name",name);
120128
claims.put("NAVident", id);
129+
claims.put("sub","subject");
130+
claims.put("aud","some-audience");
131+
claims.put("tid",ISSUER_ID);
132+
claims.put("azp",id);
121133

122134
RequestMapping rm = new RequestMapping(TOKEN_PARAM,label,claims,JOSEObjectType.JWT.getType());
123135

@@ -127,12 +139,14 @@ private RequestMapping getRequestMapping(String label, List<String> groups, Stri
127139
private OAuth2Config getOAuth2Config(){
128140

129141
List<RequestMapping> mappings = Arrays.asList( getRequestMapping(A0, Arrays.asList(PROSESSERING_ROLLE),"Z0042", "Task Runner"),
130-
getRequestMapping(A1, Arrays.asList("VEILEDER"),"Z0000", "Mock McMockface"),
131-
getRequestMapping(A2, Arrays.asList("SAKSBEHANDLER"),"Z0001", "Foo Bar"),
132-
getRequestMapping(A3, Arrays.asList("BESLUTTER"),"Z0002", "John Smith"),
133-
getRequestMapping(A4, Arrays.asList("FORVALTER"),"Z0003", "Mario Rossi"),
134-
getRequestMapping(A5, Arrays.asList("KODE6"),"Z0004", "Kode Six"),
135-
getRequestMapping(A6, Arrays.asList("KODE7"),"Z0005", "Kode Seven"));
142+
getRequestMapping(A1, Arrays.asList(veileder),"Z0000", "Mock McMockface"),
143+
getRequestMapping(A2, Arrays.asList(saksbehandler),"Z0001", "Foo Bar"),
144+
getRequestMapping(A3, Arrays.asList(beslutter),"Z0002", "John Smith"),
145+
getRequestMapping(A4, Arrays.asList(forvalter),"Z0003", "Mario Rossi"),
146+
getRequestMapping(A5, Arrays.asList(kode6),"Z0004", "Kode Six"),
147+
getRequestMapping(A6, Arrays.asList(kode7),"Z0005", "Kode Seven"),
148+
getRequestMapping(A7, Arrays.asList(),"VL", "The System")
149+
);
136150

137151
RequestMappingTokenCallback callback = new RequestMappingTokenCallback(
138152
ISSUER_ID,
@@ -178,53 +192,6 @@ private AuthenticationDto getAuthenticationDto(String label, String oauth2Url){
178192
}
179193

180194

181-
182-
183-
// @Override
184-
// public List<AuthenticationDto> getInfoForAuthentication() {
185-
//
186-
// //see RolletilgangTest
187-
// String token_task = getToken(Arrays.asList(PROSESSERING_ROLLE),"Z0042", "Task Runner");
188-
// String token_veileder = getToken(Arrays.asList("VEILEDER"),"Z0000", "Mock McMockface");
189-
// String token_saksbehandler = getToken(Arrays.asList("SAKSBEHANDLER"),"Z0001", "Foo Bar");
190-
// String token_beslutter = getToken(Arrays.asList("BESLUTTER"),"Z0002", "John Smith");
191-
// String token_forvalter = getToken(Arrays.asList("FORVALTER"),"Z0003", "Mario Rossi");
192-
// String token_kode6 = getToken(Arrays.asList("KODE6"),"Z0004", "Kode Six");
193-
// String token_kode7 = getToken(Arrays.asList("KODE7"),"Z0005", "Kode Seven");
194-
//
195-
// return Arrays.asList(
196-
// AuthUtils.getForAuthorizationHeader("TaskRunner", "Bearer " + token_task),
197-
// AuthUtils.getForAuthorizationHeader("Veileder", "Bearer " + token_veileder),
198-
// AuthUtils.getForAuthorizationHeader("Saksbehandler", "Bearer " + token_saksbehandler),
199-
// AuthUtils.getForAuthorizationHeader("Beslutter", "Bearer " + token_beslutter),
200-
// AuthUtils.getForAuthorizationHeader("Forvalter", "Bearer " + token_forvalter),
201-
// AuthUtils.getForAuthorizationHeader("Kode6", "Bearer " + token_kode6),
202-
// AuthUtils.getForAuthorizationHeader("Kode7", "Bearer " + token_kode7)
203-
// );
204-
// }
205-
//
206-
// private String getToken(List<String> groups, String id, String name) {
207-
// Map<String,Object> claims = new HashMap<>();
208-
// claims.put("groups",groups);
209-
// claims.put("name",name);
210-
// claims.put("NAVident", id);
211-
//
212-
// String token = oAuth2Server.issueToken(
213-
// ISSUER_ID,
214-
// id,
215-
// new DefaultOAuth2TokenCallback(
216-
// ISSUER_ID,
217-
// "subject",
218-
// JOSEObjectType.JWT.getType(),
219-
// Arrays.asList(DEFAULT_AUDIENCE),
220-
// claims,
221-
// 360000
222-
// )
223-
// ).serialize();
224-
// return token;
225-
// }
226-
227-
228195
@Override
229196
public ProblemInfo getProblemInfo() {
230197
return new RestProblem(
@@ -287,7 +254,13 @@ public String startSut() {
287254
"--FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api",
288255
"--FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api",
289256
"--SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev",
290-
"--ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/"
257+
"--ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/",
258+
"--rolle.veileder=" + veileder,
259+
"--rolle.saksbehandler=" + saksbehandler,
260+
"--rolle.beslutter=" + beslutter,
261+
"--rolle.forvalter=" + forvalter,
262+
"--rolle.kode6=" + kode6,
263+
"--rolle.kode7=" + kode7
291264
});
292265

293266
if (sqlConnection != null) {

0 commit comments

Comments
 (0)