Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-idspssHEADmaster

1 files changed, 100 insertions, 84 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java
index 1baefe4b8..ed0f1c278 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java
@@ -32,88 +32,104 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplicati
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OASSOConfigValidation;
 
-public class OASSOConfig implements IOnlineApplicationData{
-
-	private boolean useSSO = false;
-	private boolean showAuthDataFrame = true;
-	private String singleLogOutURL = null;
-	
-	public OASSOConfig() {
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
-	 */
-	@Override
-	public String getName() {
-		return "OASingleSignOn";
-	}
-	
-	public List<String> parse(OnlineApplication dbOAConfig, AuthenticatedUser authUser, HttpServletRequest request) {
-		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
-		if (authdata != null) {
-			OASSO ssoconfig = authdata.getOASSO();
-			if(ssoconfig != null) {
-				useSSO = ssoconfig.isUseSSO();
-				showAuthDataFrame = ssoconfig.isAuthDataFrame();
-				singleLogOutURL = ssoconfig.getSingleLogOutURL();
-			}	
-		}
-		
-		return null;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public List<String> validate(OAGeneralConfig general, AuthenticatedUser authUser,
-			HttpServletRequest request) {
-		return new OASSOConfigValidation().validate(this, authUser.isAdmin(), request);
-	}
-	
-	public String store(OnlineApplication dboa, AuthenticatedUser authUser, HttpServletRequest request) {
-		
-        AuthComponentOA authoa = dboa.getAuthComponentOA();
-        if (authoa == null) {
-            authoa = new AuthComponentOA();
-            dboa.setAuthComponentOA(authoa);
-        }
-		
-        OASSO sso = authoa.getOASSO();
-        if (sso == null) {
-            sso = new OASSO();
-            authoa.setOASSO(sso);
-            sso.setAuthDataFrame(true);
-        }
-        sso.setUseSSO(this.useSSO);
-
-        if (authUser.isAdmin())
-        	sso.setAuthDataFrame(this.showAuthDataFrame);
-
-        sso.setSingleLogOutURL(this.singleLogOutURL);
-        
-        return null;
-	}
-	
-	public boolean isUseSSO() {
-		return useSSO;
-	}
-	public void setUseSSO(boolean useSSO) {
-		this.useSSO = useSSO;
-	}
-	public boolean isShowAuthDataFrame() {
-		return showAuthDataFrame;
-	}
-	public void setShowAuthDataFrame(boolean showAuthDataFrame) {
-		this.showAuthDataFrame = showAuthDataFrame;
-	}
-	public String getSingleLogOutURL() {
-		return singleLogOutURL;
-	}
-	public void setSingleLogOutURL(String singleLogOutURL) {
-		this.singleLogOutURL = singleLogOutURL;
-	}	
+public class OASSOConfig implements IOnlineApplicationData {
+
+  private boolean useSSO = false;
+  private boolean showAuthDataFrame = true;
+  private String singleLogOutURL = null;
+
+  public OASSOConfig() {
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName
+   * ()
+   */
+  @Override
+  public String getName() {
+    return "OASingleSignOn";
+  }
+
+  @Override
+  public List<String> parse(OnlineApplication dbOAConfig, AuthenticatedUser authUser,
+      HttpServletRequest request) {
+    final AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
+    if (authdata != null) {
+      final OASSO ssoconfig = authdata.getOASSO();
+      if (ssoconfig != null) {
+        useSSO = ssoconfig.isUseSSO();
+        showAuthDataFrame = ssoconfig.isAuthDataFrame();
+        singleLogOutURL = ssoconfig.getSingleLogOutURL();
+      }
+    }
+
+    return null;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#
+   * validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public List<String> validate(OAGeneralConfig general, AuthenticatedUser authUser,
+      HttpServletRequest request) {
+    return new OASSOConfigValidation().validate(this, authUser.isAdmin(), request);
+  }
+
+  @Override
+  public String store(OnlineApplication dboa, AuthenticatedUser authUser, HttpServletRequest request) {
+
+    AuthComponentOA authoa = dboa.getAuthComponentOA();
+    if (authoa == null) {
+      authoa = new AuthComponentOA();
+      dboa.setAuthComponentOA(authoa);
+    }
+
+    OASSO sso = authoa.getOASSO();
+    if (sso == null) {
+      sso = new OASSO();
+      authoa.setOASSO(sso);
+      sso.setAuthDataFrame(true);
+    }
+    sso.setUseSSO(this.useSSO);
+
+    if (authUser.isAdmin()) {
+      sso.setAuthDataFrame(this.showAuthDataFrame);
+    }
+
+    sso.setSingleLogOutURL(this.singleLogOutURL);
+
+    return null;
+  }
+
+  public boolean isUseSSO() {
+    return useSSO;
+  }
+
+  public void setUseSSO(boolean useSSO) {
+    this.useSSO = useSSO;
+  }
+
+  public boolean isShowAuthDataFrame() {
+    return showAuthDataFrame;
+  }
+
+  public void setShowAuthDataFrame(boolean showAuthDataFrame) {
+    this.showAuthDataFrame = showAuthDataFrame;
+  }
+
+  public String getSingleLogOutURL() {
+    return singleLogOutURL;
+  }
+
+  public void setSingleLogOutURL(String singleLogOutURL) {
+    this.singleLogOutURL = singleLogOutURL;
+  }
 }