Skip to content

[hotfix] Improve Session #2302 fix #2304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prabhjyotsingh wants to merge 2 commits into from
Closed

[hotfix] Improve Session #2302 fix #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f993b59
improve session
prabhjyotsingh Apr 30, 2017
94ba9e7
check if modal window is present, and then close it
prabhjyotsingh Apr 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> roles = SecurityUtils.getRoles();
String principal = SecurityUtils.getPrincipal();
Expand Down
11 changes: 9 additions & 2 deletions zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -146,14 +147,20 @@ 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(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
Expand Down