configuration tool update

2 files changed, 29 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index c71b6f8c7..d4736efbb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -471,7 +471,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
    */
   public OAAuthParameter getOnlineApplicationParameter(String oaURL) {
   	
-	  OnlineApplication oa = ConfigurationDBRead.getOnlineApplication(oaURL);
+	  OnlineApplication oa = ConfigurationDBRead.getActiveOnlineApplication(oaURL);
 	  
 	  if (oa == null) {
 		  Logger.warn("Online application with identifier " + oaURL + " is not found.");
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
index 80d95628e..b4036264f 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
@@ -17,22 +17,23 @@ public class ConfigurationDBRead {
 
       private static Map<String, String> QUERIES = new HashMap<String, String>();    	
       static {
-    	  QUERIES.put("getOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix like SUBSTRING(:id, 1, LENGTH(onlineapplication.publicURLPrefix)) and  onlineapplication.isActive = '1'");
-    	  QUERIES.put("getMOAIDConfiguration", "select moaidconfiguration from MOAIDConfiguration moaidconfiguration");
+    	  QUERIES.put("getActiveOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix like SUBSTRING(:id, 1, LENGTH(onlineapplication.publicURLPrefix)) and  onlineapplication.isActive = '1'");
+    	  QUERIES.put("getOnlineApplicationWithDBID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.hjid = :id");
     	  QUERIES.put("getAllOnlineApplications", "select onlineapplication from OnlineApplication onlineapplication");
+    	  QUERIES.put("getMOAIDConfiguration", "select moaidconfiguration from MOAIDConfiguration moaidconfiguration");
     	  QUERIES.put("getUserWithUserID", "select userdatabase from UserDatabase userdatabase where userdatabase.id = :id");
     	  
       }
       
 	  @SuppressWarnings("rawtypes")
-	  public static OnlineApplication getOnlineApplication(String id) {
+	  public static OnlineApplication getActiveOnlineApplication(String id) {
 	  	MiscUtil.assertNotNull(id, "OnlineApplictionID");
 		Logger.trace("Getting OnlineApplication with ID " + id + " from database.");
 		
 		List result;
   		EntityManager session = ConfigurationDBUtils.getCurrentSession();
 	  	
-  		javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithID"));  	
+  		javax.persistence.Query query = session.createQuery(QUERIES.get("getActiveOnlineApplicationWithID"));  	
   		//query.setParameter("id", id+"%");
   		query.setParameter("id", id);
   		result = query.getResultList();
@@ -47,6 +48,29 @@ public class ConfigurationDBRead {
   		return (OnlineApplication) result.get(0);
 	  }
 	
+	  @SuppressWarnings("rawtypes")
+	  public static OnlineApplication getOnlineApplication(long dbid) {
+	  	MiscUtil.assertNotNull(dbid, "OnlineApplictionID");
+		Logger.trace("Getting OnlineApplication with DBID " + dbid + " from database.");
+		
+		List result;
+  		EntityManager session = ConfigurationDBUtils.getCurrentSession();
+	  	
+  		javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithDBID"));  	
+  		//query.setParameter("id", id+"%");
+  		query.setParameter("id", dbid);
+  		result = query.getResultList();
+  	
+  		Logger.trace("Found entries: " + result.size());
+    
+  		if (result.size() == 0) {
+  			Logger.trace("No entries found.");
+  			return null;
+  		}
+  		  		
+  		return (OnlineApplication) result.get(0);
+	  }
+	  
 	  public static MOAIDConfiguration getMOAIDConfiguration() {
 		  Logger.trace("Load MOAID Configuration from database.");