SSO re-implemented with SAML2. Upgrade to Java 21, Spring Boot 3.2.0,…

.appveyor.yml

@@ -8,7 +8,7 @@ branches:
 skip_tags: true
 max_jobs: 1
 image: Previous Ubuntu1604
-stack: jdk 8, python 3.9, node 14
+stack: jdk 21, python 3.9, node 14
 
 build_script:
   - python3 -m pip install mkdocs mkdocs-material

README.md

@@ -96,7 +96,8 @@ NGB binaries can be retrieved from the following locations:
 
 ## Requirements
 
-* **[Oracle JDK 8](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html)** or **[Open JDK 8](http://openjdk.java.net/install/)**
+* **[Oracle JDK 21](https://docs.oracle.com/javase/21/docs/technotes/guides/install/install_overview.html)** or *
+  *[Open JDK 21](http://openjdk.java.net/install/)**
 * **[Node.js = 6.9.5](https://nodejs.org/en/download/package-manager/)** 
 * **[Docker engine](https://docs.docker.com/engine/installation/)** *used to build docker images, if it is not a case - then could not be installed*
 * **[MkDocs >= 0.16.0](http://www.mkdocs.org/#installation)** and **[mkdocs-material](http://squidfunk.github.io/mkdocs-material/getting-started/#installing-mkdocs)** *used to build documentation, if it is not a case - then could not be installed*

build.gradle

@@ -31,10 +31,6 @@ class Version {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
-}
-
 task ui(type: Copy) {
     dependsOn ':client:buildUI'
     doFirst {
@@ -79,9 +75,9 @@ task buildDoc(type: Tar) {
     dependsOn runMkdocs
     from("$rootDir/docs/site") {
     }
-    archiveName = "ngb-docs.tar.gz"
-    destinationDir file(distDir)
-    extension = 'tar.gz'
+    archiveBaseName = "ngb-docs"
+    getDestinationDirectory().set(file(distDir))
+    archiveExtension = 'tar.gz'
     compression = Compression.GZIP
 }
 
@@ -121,11 +117,11 @@ task buildWar(type: GradleBuild) {
 }
 
 task buildJar(type: GradleBuild) {
-    dependsOn ui, templates, buildDocs
+    dependsOn ui, templates
     if (runTests) {
         tasks = ['clean', 'build']
     } else {
-        tasks = ['clean', 'bootRepackage']
+        tasks = ['clean', 'bootJar']
     }
     startParameter.projectProperties = [profile    : 'jar',
                                         database   : database,
@@ -147,7 +143,7 @@ task buildCli(type: GradleBuild) {
         tasks = ['clean', 'assemble']
     }
     buildFile = "$rootDir/server/ngb-cli/build.gradle"
-    dir = "$rootDir/ngb-cli/catgenome"
+    dir = "$rootDir/ngb-cli"
     doLast {
         copy {
             from "$cliBuilds/ngb-cli.tar.gz"
@@ -222,7 +218,7 @@ task buildDesktopJar(type: GradleBuild) {
     if (runTests) {
         tasks = ['clean', 'build']
     } else {
-        tasks = ['clean', 'bootRepackage']
+        tasks = ['clean', 'bootJar']
     }
     startParameter.projectProperties = [profile    : 'jar',
                                         database   : database,

client/build.gradle

@@ -1,7 +1,7 @@
-import com.moowork.gradle.node.npm.NpmInstallTask
+import com.github.gradle.node.npm.task.NpmInstallTask
 
 plugins {
-    id "com.moowork.node" version "1.1.1"
+    id "com.github.node-gradle.node" version "7.1.0"
 }
 
 def desktop = hasProperty("desktop")

client/client/app/shared/components/ngbMainToolbar/ngbMainToolbar.component.js

@@ -38,7 +38,7 @@ export default  {
             const prefix = urlPrefix && urlPrefix.endsWith('/')
                 ? urlPrefix.slice(0, -1)
                 : (urlPrefix || '');
-            const logoutUrl = `${prefix}/saml/logout`;
+            const logoutUrl = `${prefix}/logout`;
             this.logout = () => {
                 $window.location.href = logoutUrl;
             };

client/client/app/shared/components/ngbMainToolbar/ngbMainToolbar.tpl.html

@@ -7,10 +7,5 @@
         <li><ngb-main-settings></ngb-main-settings></li>
         <li><ngb-bookmark></ngb-bookmark></li>
         <li ng-if="$ctrl.isRoleModelEnabled && $ctrl.userIsAdmin"><ngb-user-management></ngb-user-management></li>
-        <li ng-if="$ctrl.isRoleModelEnabled && $ctrl.isLoggedIn" class="logout-button">
-            <md-button aria-label="Menu" class="md-icon-button" ng-click="$ctrl.logout($event)">
-                <ng-md-icon icon="power_settings_new"></ng-md-icon>
-            </md-button>
-        </li>
     </ul>
 </div>