From 0d8bdb44b3c6b7bb0b351a1cb27230639c8e1664 Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Wed, 1 Nov 2023 10:59:54 +1000 Subject: [PATCH 1/5] Updated ALA security plugins --- build.gradle | 7 ++++--- gradle.properties | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 52ac31b0b..06ce21320 100644 --- a/build.gradle +++ b/build.gradle @@ -129,14 +129,15 @@ dependencies { implementation 'org.apache.poi:poi-ooxml-schemas:4.1.2' implementation "org.grails.plugins:ala-admin-plugin:2.3.0" - implementation ("org.grails.plugins:ala-auth:5.1.1") - implementation "org.grails.plugins:ala-ws-security-plugin:4.1.2" + implementation ("org.grails.plugins:ala-auth:$alaSecurityLibsVersion") + implementation ("org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion") + implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion" + implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion" runtimeOnly "org.grails.plugins:ala-bootstrap3:4.2.0" // swagger API implementation 'au.org.ala.plugins:openapi:1.1.0' - implementation "au.org.ala:userdetails-service-client:1.5.0" implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.1" implementation 'au.org.ala:ala-cas-client:2.5' runtimeOnly("org.springframework.boot:spring-boot-properties-migrator") diff --git a/gradle.properties b/gradle.properties index 38a32a3c8..b470eaec4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ -biocollectVersion=6.6.4 +biocollectVersion=6.6.6-SNAPSHOT +alaSecurityLibsVersion=6.2.0 grailsVersion=5.1.9 grailsGradlePluginVersion=5.1.5 assetPipelineVersion=3.3.4 From bd1cf80f2a866827f10ab4b27779893675d4e5ca Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Wed, 1 Nov 2023 18:59:17 +1000 Subject: [PATCH 2/5] Fixed Authorization header for mobile create/edit pages --- grails-app/views/layouts/mobile.gsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grails-app/views/layouts/mobile.gsp b/grails-app/views/layouts/mobile.gsp index de0c5a897..b315817f2 100644 --- a/grails-app/views/layouts/mobile.gsp +++ b/grails-app/views/layouts/mobile.gsp @@ -60,8 +60,8 @@ withCredentials: true }, beforeSend: function (xhr) { - - xhr.setRequestHeader('Authorization', "${raw(authorization)}"); + + xhr.setRequestHeader('Authorization', "${raw(Authorization)}"); xhr.setRequestHeader('authKey', "${raw(authKey)}"); From 269a6f1415bcb9222c4973027a7035fb772cb702 Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Wed, 1 Nov 2023 19:36:25 +1000 Subject: [PATCH 3/5] Fix SNAPSHOT version (6.6.5) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b470eaec4..23529e7d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -biocollectVersion=6.6.6-SNAPSHOT +biocollectVersion=6.6.5-SNAPSHOT alaSecurityLibsVersion=6.2.0 grailsVersion=5.1.9 grailsGradlePluginVersion=5.1.5 From 56cf4e13270560d63b73dfecfabe9c0f4788694f Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Thu, 2 Nov 2023 09:16:23 +1000 Subject: [PATCH 4/5] Revert security plugin versions --- build.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 06ce21320..4e3e7fd88 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ apply from: "${project.projectDir}/gradle/publish.gradle" repositories { mavenLocal() //for missing jai_core.jar - //maven { url "https://mvnrepository.com" } + //maven { url "https://mvnrepository.com" } maven { url "https://repo.osgeo.org/repository/release/" } maven { url "https://repo.grails.org/grails/core" } maven { url = uri("https://maven.pkg.github.com/atlasoflivingaustralia/ecodata-client-plugin") @@ -129,15 +129,14 @@ dependencies { implementation 'org.apache.poi:poi-ooxml-schemas:4.1.2' implementation "org.grails.plugins:ala-admin-plugin:2.3.0" - implementation ("org.grails.plugins:ala-auth:$alaSecurityLibsVersion") - implementation ("org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion") - implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion" - implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion" + implementation ("org.grails.plugins:ala-auth:5.1.1") + implementation "org.grails.plugins:ala-ws-security-plugin:4.1.2" runtimeOnly "org.grails.plugins:ala-bootstrap3:4.2.0" // swagger API implementation 'au.org.ala.plugins:openapi:1.1.0' + implementation "au.org.ala:userdetails-service-client:1.5.0" implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.1" implementation 'au.org.ala:ala-cas-client:2.5' runtimeOnly("org.springframework.boot:spring-boot-properties-migrator") From ead35e976157d239d60d65eb83bff24df972344d Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Thu, 2 Nov 2023 09:48:51 +1000 Subject: [PATCH 5/5] Remove unused alaSecurityLibsVersion field in gradle.properties --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 23529e7d4..21ced0511 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ biocollectVersion=6.6.5-SNAPSHOT -alaSecurityLibsVersion=6.2.0 grailsVersion=5.1.9 grailsGradlePluginVersion=5.1.5 assetPipelineVersion=3.3.4