Fix merge conflicts

src/main/docker/managementportal.yml

@@ -15,6 +15,7 @@ services:
             - MANAGEMENTPORTAL_IDENTITYSERVER_LOGINURL=http://localhost:3000
             - MANAGEMENTPORTAL_IDENTITYSERVER_SERVERADMINURL=http://kratos:4434
             - MANAGEMENTPORTAL_AUTHSERVER_SERVERURL=http://hydra:4444
+            - MANAGEMENTPORTAL_AUTHSERVER_LOGINURL=http://localhost:4444
             - MANAGEMENTPORTAL_AUTHSERVER_SERVERADMINURL=http://hydra:4445
             - JHIPSTER_SLEEP=10 # gives time for the database to boot before the application
             - JAVA_OPTS=-Xmx512m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 #enables remote debugging

src/main/java/org/radarbase/management/config/ManagementPortalProperties.java

@@ -12,6 +12,8 @@ public class ManagementPortalProperties {
 
     private final IdentityServer identityServer = new IdentityServer();
 
+    private final AuthServer authServer = new AuthServer();
+
     private final Mail mail = new Mail();
 
     private final Frontend frontend = new Frontend();
@@ -34,6 +36,10 @@ public IdentityServer getIdentityServer() {
         return identityServer;
     }
 
+    public AuthServer getAuthServer() {
+        return authServer;
+    }
+
     public ManagementPortalProperties.Mail getMail() {
         return mail;
     }
@@ -324,6 +330,37 @@ public void setLoginUrl(String loginUrl) {
         }
     }
 
+    public class AuthServer {
+        private String serverUrl = null;
+        private String serverAdminUrl = null;
+        private String loginUrl = null;
+
+        public String getServerUrl() {
+            return serverUrl;
+        }
+
+        public void setServerUrl(String serverUrl) {
+            this.serverUrl = serverUrl;
+        }
+
+        public String getServerAdminUrl() {
+            return serverAdminUrl;
+        }
+
+        public void setServerAdminUrl(String serverAdminUrl) {
+            this.serverAdminUrl = serverAdminUrl;
+        }
+
+        public String getLoginUrl() {
+            return loginUrl;
+        }
+
+        public void setLoginUrl(String loginUrl) {
+            this.loginUrl = loginUrl;
+        }
+    }
+
+
     public static class CatalogueServer {
 
         private boolean enableAutoImport = false;