Merge branch 'DEVELOP_BE' (3adec455) · Commits · Eclipse Projects / Eclipse openK Core Modules / org.eclipse.openk-coremodules.authandauth

pom.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@

		<groupId>openk.pta.de</groupId>
		<artifactId>portal</artifactId>
		<version>1.1.0</version>
		<version>1.1.1</version>
		<packaging>war</packaging>

		<properties>

src/main/java/org/eclipse/openk/portal/auth2/model/JwtPayload.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -24,7 +24,12 @@ public class JwtPayload {
		private long nbf;
		private long iat;
		private String iss;
		private String aud;

		//Since Keycloak 4.8.3 "aud" Parameter is an array now
		//Pre 4.8.3 "aud" was a single String
		//We keep it for documentation reasons
		//private String[] aud; //NOSONAR
		//private String aud; //NOSONAR
		private String sub;
		private String typ;
		private String azp;
		@@ -58,9 +63,6 @@ public class JwtPayload {
		public String getiss() { return iss; }
		public void setiss(String iss) { this.iss = iss; }

		public String getaud() { return aud; }
		public void setaud(String aud) { this.aud = aud; }

		public String getsub() { return sub; }
		public void setsub(String sub) { this.sub = sub; }

src/main/resources/moduleConfigDevLocal.json

+21 −2

Original line number	Diff line number	Diff line
		[
		{
		"name": "Betriebstagebuch",
		"name": "Betriebstagebuch local 4200",
		"cols": 1,
		"rows": 1,
		"color": "#ffffff",
		@@ -8,6 +8,16 @@
		"pictureLink": "https://www.openkonsequenz.de/medien/cache/main_image/m_logbuch_2443636.jpg",
		"requiredRole": "elogbook-access"

		},
		{
		"name": "Betriebstagebuch local 8080",
		"cols": 1,
		"rows": 1,
		"color": "#ffffff",
		"link": "http://localhost:8080/elogbookFE",
		"pictureLink": "https://www.openkonsequenz.de/medien/cache/main_image/m_logbuch_2443636.jpg",
		"requiredRole": "elogbook-access"

		},
		{
		"name": "Bereitschaftsplanung",
		@@ -46,7 +56,16 @@
		"requiredRole": "kon-access"
		},
		{
		"name": "Kontaktstammdaten Local",
		"name": "Kontaktstammdaten local 8080",
		"cols": 1,
		"rows": 1,
		"color": "#ffffff",
		"link": "http://localhost:8080/contactdatabase",
		"pictureLink": "assets/img/kontaktstammdaten_kachel.jpg",
		"requiredRole": "kon-access"
		},
		{
		"name": "Kontaktstammdaten local 4200",
		"cols": 1,
		"rows": 1,
		"color": "#ffffff",

src/test/java/org/eclipse/openk/portal/util/JwtHelperTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@ public class JwtHelperTest extends ResourceLoaderBase {

		@Test
		public void testGetJwtPayload_Base64URL() {
		String base64urlToken = "eyJqdGkiOiI3NDVmOTc4Zi00OTYwLTRlO"+
		//Token Pre 4.8.3 Keycloak
		String base64urlToken = "AA.eyJqdGkiOiI3NDVmOTc4Zi00OTYwLTRlO"+
		"WYtYmFiMS1jNjdkZjMzODEwYjQiLCJleH"+
		"AiOjE1MTYwMTAxNDksIm5iZiI6MCwiaWF"+
		"0IjoxNTE2MDA5ODQ5LCJpc3MiOiJodHRw"+
		@@ -57,8 +58,9 @@ public class JwtHelperTest extends ResourceLoaderBase {
		"iwibmFtZSI6IlV3ZSByb8OfIiwicHJlZm"+
		"VycmVkX3VzZXJuYW1lIjoib3Blbmt0ZXN"+
		"0IiwiZ2l2ZW5fbmFtZSI6IlV3ZSIsImZh"+
		"bWlseV9uYW1lIjoicm_DnyJ9";
		base64urlToken = "AA."+base64urlToken+".CC";
		"bWlseV9uYW1lIjoicm_DnyJ9.CC";
		//Since Keycloak 4.8.3 Aud Parameter is an array now
		base64urlToken = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJIRWQ4NGl4V2xaVWk2bWFSa005Tk1wSEd0amRXRU1pZGtNV0Nvbk90U1ZVIn0.eyJleHAiOjE2MTA3MzYxNDEsImlhdCI6MTYxMDczNTg0MSwianRpIjoiNGIwMTM1NGMtN2NmZC00ZmEyLThmMjQtYWM0ZmJlZWZhNTZkIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgwL2F1dGgvcmVhbG1zL0Vsb2dib29rIiwiYXVkIjpbInJlYWxtLW1hbmFnZW1lbnQiLCJhY2NvdW50Il0sInN1YiI6IjAzNDU0MjJmLTk0MzctNDVmYy1iMmY0LTNlYTcwZDUzY2Q3NCIsInR5cCI6IkJlYXJlciIsImF6cCI6ImVsb2dib29rLWJhY2tlbmQiLCJzZXNzaW9uX3N0YXRlIjoiNDRlMWQxMTctYTU0My00NWZjLWJjNTAtZjE5MDYzZGVmOTk0IiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIqIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJlbG9nYm9vay1ub3JtYWx1c2VyIiwicGxhbm5lZC1wb2xpY2llcy1ub3JtYWx1c2VyIiwiZWxvZ2Jvb2stYWNjZXNzIiwiZWxvZ2Jvb2stc3VwZXJ1c2VyIiwia29uLWFkbWluIiwiZ3JpZC1mYWlsdXJlLWFjY2VzcyIsIm9mZmxpbmVfYWNjZXNzIiwia29uLWFjY2VzcyIsImdyaWQtZmFpbHVyZS1hZG1pbiIsInBsYW5uZWQtcG9saWNpZXMtYWNjZXNzIiwicGxhbm5pbmctYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iLCJwbGFubmVkLXBvbGljaWVzLXN1cGVydXNlciJdfSwicmVzb3VyY2VfYWNjZXNzIjp7InJlYWxtLW1hbmFnZW1lbnQiOnsicm9sZXMiOlsidmlldy11c2VycyIsInF1ZXJ5LWdyb3VwcyIsInF1ZXJ5LXVzZXJzIl19LCJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiJBZG1pbiBTdHJhdG9yIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiYWRtaW4iLCJnaXZlbl9uYW1lIjoiQWRtaW4iLCJmYW1pbHlfbmFtZSI6IlN0cmF0b3IifQ.sz5nOZZDwDHUS-WLzx1KX_KGTiWGuWTisR_bbHyReeXJyMefL6pngYwF_Qt0EPk1g0rqmqdhTN8-5IaSrwO1n0RmZrWLg19n1QnjkAs6ebF84UL07n5EEFJKh0luyWOKb_EW8JZpwRpLhaiWTG6KdXnOU6VkxJ-xX0ncmrHS8MYDh_u1LhIUPnu43trn0jJWoNAuHHVMY0rhpXNaZqc3Rq8iI3Vye87Yvs83jKTj5d1rHsFTrkaRt51bgi-2ML6IZa9GxIbCYroHZ7Idue00jisWPzmYU7F-wOpASBClBDsweTwRY9Dgr_yjrMns-1KXfYwtt4BTEc0IMKfX5gneSg";
		// this payload contains a char with is valid in Base64URL but NOT in Base64.
		JwtToken jt = new JwtToken();
		jt.setAccessToken(base64urlToken);

src/test/java/org/eclipse/openk/portal/viewmodel/UserModuleTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ public class UserModuleTest {
		@Test
		public void testModuleConfigProduction() {
		UserModule[] um = UserModule.getInstance();
		assertEquals( "Betriebstagebuch", um[0].getModuleName() );
		assertEquals( "Betriebstagebuch local 4200", um[0].getModuleName() );
		assertEquals( "#ffffff", um[0].getColor() );
		assertEquals( 1, (long)um[0].getCols() );
		assertEquals( 1, (long)um[0].getRows() );