Updated for loading templates from the config file.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@640 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 14 insertions, 4 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index ea9d7a0d3..c0fcc6a68 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -175,7 +175,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     session.setTarget(target);
     session.setOAURLRequested(oaURL);
     session.setPublicOAURLPrefix(oaParam.getPublicURLPrefix());
-    session.setAuthURL(authURL);
+    session.setAuthURL(authURL);   
     session.setTemplateURL(templateURL);
     session.setBusinessService(oaParam.getBusinessService());
     String returnURL =
@@ -197,6 +197,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
           ex);
       }
       String bkuSelectionTemplate = null;
+      // override template url by url from configuration file
+      if (oaParam.getBkuSelectionTemplateURL() != null) {
+        bkuSelectionTemplateURL = oaParam.getBkuSelectionTemplateURL();
+      }       
       if (bkuSelectionTemplateURL != null) {
         try {
           bkuSelectionTemplate = new String(FileUtils.readURL(bkuSelectionTemplateURL));
@@ -318,13 +322,19 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         REQ_VERIFY_IDENTITY_LINK,
         session.getSessionID());
     String template = null;
-    if (session.getTemplateURL() != null) {
+    // override template url by url from configuration file
+    if (oaParam.getTemplateURL() != null) {
+      templateURL = oaParam.getTemplateURL();
+    } else {
+      templateURL = session.getTemplateURL();
+    }        
+    if (templateURL != null) {
       try {
-        template = new String(FileUtils.readURL(session.getTemplateURL()));
+        template = new String(FileUtils.readURL(templateURL));
       } catch (IOException ex) {
         throw new AuthenticationException(
           "auth.03",
-          new Object[] { session.getTemplateURL(), ex.toString()},
+          new Object[] { templateURL, ex.toString()},
           ex);
       }
     }