Remove finishlogin.xhtml

pom.xml

@@ -22,7 +22,7 @@
 		<jackson.databind.version>2.9.5</jackson.databind.version>
 		<jackson.prev.version>1.9.11</jackson.prev.version>
 		<jettison.version>1.3.8</jettison.version>
-		<resteasy.version>3.0.24.Final</resteasy.version>
+		<resteasy.version>3.0.26.Final</resteasy.version>
 		<jaxr.version>3.0.12.Final</jaxr.version>
 
 		<httpcore.version>4.4.9</httpcore.version>

server/src/main/java/org/gluu/oxtrust/action/Authenticator.java

@@ -108,15 +108,15 @@ public boolean preAuthenticate() throws IOException, Exception {
 		return result;
 	}
 
-	public boolean authenticate() {
+	protected String authenticate() {
 		String userName = null;
 		try {
 			userName = identity.getOauthData().getUserUid();
 			String idToken = identity.getOauthData().getIdToken();
 
 			if (StringHelper.isEmpty(userName) || StringHelper.isEmpty(idToken)) {
 				log.error("User is not authenticated");
-				return false;
+				return OxTrustConstants.RESULT_NO_PERMISSIONS;
 			}
 
 			identity.getCredentials().setUsername(userName);
@@ -125,23 +125,24 @@ public boolean authenticate() {
 			User user = findUserByUserName(userName);
 			if (user == null) {
 				log.error("Person '{}' not found in LDAP", userName);
-				return false;
+				return OxTrustConstants.RESULT_NO_PERMISSIONS;
 			} else if (GluuStatus.EXPIRED.getValue().equals(user.getAttribute("gluuStatus"))
 					|| GluuStatus.REGISTER.getValue().equals(user.getAttribute("gluuStatus"))) {
 				HashMap<String, Object> params = new HashMap<String, Object>();
 				params.put("inum", user.getInum());
 				facesService.redirect("/register.xhtml", params);
-				return false;
+				return OxTrustConstants.RESULT_REGISTER;
 			}
 
 			postLogin(user);
 			log.info("User '{}' authenticated successfully", userName);
+
+			return OxTrustConstants.RESULT_SUCCESS;
 		} catch (Exception ex) {
 			log.error("Failed to authenticate user '{}'", userName, ex);
-			return false;
 		}
 
-		return true;
+		return OxTrustConstants.RESULT_NO_PERMISSIONS;
 	}
 
 	/**
@@ -419,9 +420,10 @@ private String requestAccessToken(String oxAuthHost, String authorizationCode, S
 		identity.setWorkingParameter(OxTrustConstants.OXAUTH_SSO_SESSION_STATE, Boolean.FALSE);
 
 		log.info("user uid:" + oauthData.getUserUid());
+
+		String result = authenticate();
 
-		return OxTrustConstants.RESULT_SUCCESS;
-
+		return result;
 	}
 
 	private String getOxAuthHost(String oxAuthAuthorizeUrl) {

server/src/main/java/org/gluu/oxtrust/model/LogViewerConfig.java

@@ -16,6 +16,8 @@
 import org.xdi.model.SimpleCustomProperty;
 import org.xdi.model.SimpleExtendedCustomProperty;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * Log viewer configuration model
  * 
@@ -24,6 +26,7 @@
 
 @XmlRootElement
 @JsonPropertyOrder({ "logs" })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class LogViewerConfig {
 
 	@JsonProperty("log_template")

server/src/main/java/org/gluu/oxtrust/util/OxTrustConstants.java

@@ -62,6 +62,7 @@ public final class OxTrustConstants extends OxConstants {
     public static final String RESULT_DISABLED = "disabled";
     public static final String RESULT_NO_PERMISSIONS = "no_permissions";
     public static final String RESULT_VALIDATION_ERROR = "validation_error";
+    public static final String RESULT_REGISTER = "register";
     public static final String RESULT_CONFIRM = "confirm";
     public static final String RESULT_EXISTS = "exists";
     public static final String RESULT_LOGOUT = "logout";

server/src/main/resources/META-INF/navigation/getAuthorizationCode.navigation.xml

@@ -9,7 +9,7 @@
     <navigation-case>
       <from-action>#{authenticator.oAuthGetAccessToken}</from-action>
       <from-outcome>success</from-outcome>
-      <to-view-id>/finishlogin.xhtml</to-view-id>
+      <to-view-id>/home.xhtml</to-view-id>
       <redirect/>
     </navigation-case>
 
@@ -26,6 +26,7 @@
       <to-view-id>/error.xhtml</to-view-id>
       <redirect/>
     </navigation-case>
+
   </navigation-rule>
 
 </faces-config>

server/src/test/java/org/gluu/oxtrust/action/test/AbstractAuthenticationTest.java → server/src/test/java/org/gluu/oxtrust/action/AbstractAuthenticationTest.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.action.test;
+package org.gluu.oxtrust.action;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -62,6 +62,8 @@ protected void checkLoggedIn(final boolean loggedIn) {
 	 */
 	protected void checkLoginUser(final String user, final String password) {
 		identity.getOauthData().setUserUid(user);
+		identity.getOauthData().setIdToken("dummy_id_token");
+
 		authenticator.authenticate();
 
 		assertTrue(identity.isLoggedIn());

server/src/test/java/org/gluu/oxtrust/action/test/BaseComponentTest.java → server/src/test/java/org/gluu/oxtrust/action/BaseComponentTest.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.action.test;
+package org.gluu.oxtrust.action;
 
 /**
  * @author Yuriy Zabrovarnyy

server/src/test/java/org/gluu/oxtrust/action/test/BaseTest.java → server/src/test/java/org/gluu/oxtrust/action/BaseTest.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.action.test;
+package org.gluu.oxtrust.action;
 
 import java.util.List;
 import java.util.Map.Entry;

server/src/test/java/org/gluu/oxtrust/action/test/ConfigurableTest.java → server/src/test/java/org/gluu/oxtrust/action/ConfigurableTest.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.action.test;
+package org.gluu.oxtrust.action;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

server/src/test/java/org/gluu/oxtrust/action/ConfigurationStatusTest.java

@@ -0,0 +1,98 @@
+/*
+ * oxTrust is available under the MIT License (2008). See http://opensource.org/licenses/MIT for full text.
+ *
+ * Copyright (c) 2014, Gluu
+ */
+
+package org.gluu.oxtrust.action;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.Date;
+
+import javax.inject.Inject;
+
+import org.gluu.oxtrust.action.ConfigurationStatusAction;
+import org.gluu.oxtrust.action.Authenticator;
+import org.gluu.oxtrust.ldap.service.ConfigurationService;
+import org.gluu.oxtrust.model.GluuConfiguration;
+import org.gluu.oxtrust.security.Identity;
+import org.gluu.oxtrust.util.OxTrustConstants;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * User: Oleksiy Tataryn
+ */
+public class ConfigurationStatusTest extends BaseTest {
+
+    @Inject
+    private Identity identity;
+
+    @Inject
+    private Authenticator authenticator;
+
+	@Inject
+	private ConfigurationService configurationService;
+
+	@Inject
+	private ConfigurationStatusAction configurationStatusAction;
+
+    public void loginUuser(String userUid) {
+        identity.getOauthData().setUserUid(userUid);
+        identity.getOauthData().setIdToken("dummy_id_token");
+
+        String loggedIn = authenticator.authenticate();
+        assertEquals(loggedIn, OxTrustConstants.RESULT_SUCCESS, "User is not logged in");
+        assertTrue(identity.isLoggedIn(), "User is not logged in");
+    }
+
+	@Test
+    @Parameters({ "test.login.user.admin.uid" })
+	public void testIsConfigurationStatus1(String userUid) {
+	    loginUuser(userUid);
+
+	    GluuConfiguration configuration = configurationService.getConfiguration();
+
+		Date currentDateTime = new Date();
+		configuration.setLastUpdate(currentDateTime);
+
+		configurationService.updateConfiguration(configuration);
+		assertEquals(configurationStatusAction.checkHealth(), OxTrustConstants.RESULT_SUCCESS);
+		assertEquals(configurationStatusAction.getHealth(), "OK");
+	}
+
+	@Test(dependsOnMethods = { "testIsConfigurationStatus1" })
+    @Parameters({ "test.login.user.admin.uid" })
+	public void testIsConfigurationStatus2(String userUid) {
+        loginUuser(userUid);
+
+		GluuConfiguration configuration = configurationService.getConfiguration();
+
+		long currentTime = System.currentTimeMillis() - 50 * 1000;
+		Date currentDateTime = new Date(currentTime);
+		configuration.setLastUpdate(currentDateTime);
+
+		configurationService.updateConfiguration(configuration);
+		assertEquals(configurationStatusAction.checkHealth(), OxTrustConstants.RESULT_SUCCESS);
+		assertEquals(configurationStatusAction.getHealth(), "OK");
+	}
+
+	@Test(dependsOnMethods = { "testIsConfigurationStatus2" })
+    @Parameters({ "test.login.user.admin.uid" })
+	public void testIsConfigurationStatus3(String userUid) {
+        loginUuser(userUid);
+
+		GluuConfiguration configuration = configurationService.getConfiguration();
+
+		long currentTime = System.currentTimeMillis() - 101 * 1000;
+		Date currentDateTime = new Date(currentTime);
+		configuration.setLastUpdate(currentDateTime);
+
+		configurationService.updateConfiguration(configuration);
+		assertEquals(configurationStatusAction.checkHealth(), OxTrustConstants.RESULT_SUCCESS);
+		assertEquals(configurationStatusAction.getHealth(), "FAIL");
+	}
+
+}

server/src/test/java/org/gluu/oxtrust/service/test/CleanUpTest.java → server/src/test/java/org/gluu/oxtrust/service/CleanUpTest.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.service.test;
+package org.gluu.oxtrust.service;
 
 import static org.testng.Assert.assertNotNull;
 
@@ -13,7 +13,7 @@
 
 import javax.inject.Inject;import static org.gluu.oxtrust.ldap.service.AppInitializer.LDAP_ENTRY_MANAGER_NAME;
 
-import org.gluu.oxtrust.action.test.BaseTest;
+import org.gluu.oxtrust.action.BaseTest;
 import org.gluu.oxtrust.ldap.service.IGroupService;
 import org.gluu.oxtrust.ldap.service.IPersonService;
 import org.gluu.oxtrust.ldap.service.MemberService;

server/src/test/java/org/gluu/oxtrust/service/test/GroupServiceTest.java → server/src/test/java/org/gluu/oxtrust/service/GroupServiceTest.java

@@ -4,14 +4,14 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.service.test;
+package org.gluu.oxtrust.service;
 
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import javax.inject.Inject;import static org.gluu.oxtrust.ldap.service.AppInitializer.LDAP_ENTRY_MANAGER_NAME;
 
-import org.gluu.oxtrust.action.test.BaseTest;
+import org.gluu.oxtrust.action.BaseTest;
 import org.gluu.oxtrust.ldap.service.IGroupService;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;

server/src/test/java/org/gluu/oxtrust/service/test/PersonServiceTest.java → server/src/test/java/org/gluu/oxtrust/service/PersonServiceTest.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.service.test;
+package org.gluu.oxtrust.service;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -14,7 +14,7 @@
 
 import javax.inject.Inject;import static org.gluu.oxtrust.ldap.service.AppInitializer.LDAP_ENTRY_MANAGER_NAME;
 
-import org.gluu.oxtrust.action.test.BaseTest;
+import org.gluu.oxtrust.action.BaseTest;
 import org.gluu.oxtrust.ldap.service.IPersonService;
 import org.gluu.oxtrust.model.GluuCustomPerson;
 import org.gluu.oxtrust.util.OxTrustConstants;

server/src/test/java/org/gluu/oxtrust/service/test/PostLogoutRedirectUriTest.java → server/src/test/java/org/gluu/oxtrust/service/PostLogoutRedirectUriTest.java

@@ -4,14 +4,13 @@
  * Copyright (c) 2014, Gluu
  */
 
-package org.gluu.oxtrust.service.test;
+package org.gluu.oxtrust.service;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 
 import org.gluu.oxtrust.action.test.AbstractAuthenticationTest;
-
 import org.testng.annotations.Test;