From f993b59fa16fff0add8d4bdc4d7fdf97cea9f981 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 1 May 2017 01:04:07 +0530 Subject: [PATCH 1/2] improve session --- .../main/java/org/apache/zeppelin/rest/LoginRestApi.java | 3 ++- .../org/apache/zeppelin/integration/AuthenticationIT.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java index c9b24b14d0e..e90954142fd 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java @@ -74,9 +74,10 @@ public Response postLogin(@FormParam("userName") String userName, try { UsernamePasswordToken token = new UsernamePasswordToken(userName, password); // token.setRememberMe(true); - currentUser.login(token); + currentUser.getSession().stop(); currentUser.getSession(true); + currentUser.login(token); HashSet roles = SecurityUtils.getRoles(); String principal = SecurityUtils.getPrincipal(); diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java index 24e34804e56..9b02d71dd7d 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import java.util.List; import org.apache.commons.io.FileUtils; @@ -146,14 +147,17 @@ private void testShowNotebookListOnNavbar() throws Exception { } } - private void logoutUser(String userName) { + private void logoutUser(String userName) throws URISyntaxException { ZeppelinITUtils.sleep(500, false); driver.findElement(By.xpath("//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + userName + "')]")).click(); ZeppelinITUtils.sleep(500, false); driver.findElement(By.xpath("//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + userName + "')]//a[@ng-click='navbar.logout()']")).click(); + ZeppelinITUtils.sleep(500, false); + driver.findElement(By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")).click(); ZeppelinITUtils.sleep(5000, false); + driver.get(new URI(driver.getCurrentUrl()).resolve("/#/").toString()); } // @Test From 94ba9e77478a2022b43e359fae56316ae1e7b37f Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 1 May 2017 02:11:47 +0530 Subject: [PATCH 2/2] check if modal window is present, and then close it --- .../apache/zeppelin/integration/AuthenticationIT.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java index 9b02d71dd7d..9abbe28525f 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java @@ -154,10 +154,13 @@ private void logoutUser(String userName) throws URISyntaxException { ZeppelinITUtils.sleep(500, false); driver.findElement(By.xpath("//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + userName + "')]//a[@ng-click='navbar.logout()']")).click(); - ZeppelinITUtils.sleep(500, false); - driver.findElement(By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")).click(); - ZeppelinITUtils.sleep(5000, false); + ZeppelinITUtils.sleep(2000, false); + if (driver.findElement(By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")) + .isDisplayed()) { + driver.findElement(By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")).click(); + } driver.get(new URI(driver.getCurrentUrl()).resolve("/#/").toString()); + ZeppelinITUtils.sleep(500, false); } // @Test