| 2,10 → 2,10 |
|---|
| |
| import java.util.Map; |
| |
| import ch.ffhs.webE.dao.UserDAO; |
| import ch.ffhs.webE.dao.UserDAOImpl; |
| import ch.ffhs.webE.domain.User; |
| |
| import com.opensymphony.xwork2.Action; |
| import com.opensymphony.xwork2.ActionContext; |
| import com.opensymphony.xwork2.ActionSupport; |
| import com.opensymphony.xwork2.ModelDriven; |
| 14,21 → 14,16 |
|---|
| { |
| |
| private static final long serialVersionUID = 1799753056277211344L; |
| private final User user = new User(); |
| private final UserDAOImpl userDAO = new UserDAOImpl(); |
| private User user = new User(); |
| private UserDAO userDAO = new UserDAOImpl(); |
| |
| /* Form fields */ |
| // Form fields |
| private String userName; |
| private String pw; |
| |
| /** |
| * JSP session object |
| */ |
| // Session Object |
| Map<String, Object> session = ActionContext.getContext().getSession(); |
| |
| /** |
| * |
| */ |
| public LoginAction() |
| { |
| } |
| 37,32 → 32,31 |
|---|
| { |
| |
| // If password or user name are empty, the login fails. |
| if ("".equals(this.getUserName()) || "".equals(this.getPw()) |
| || this.getUserName() == null || this.getPw() == null) |
| if ("".equals(getUserName()) || "".equals(getPw()) |
| || getUserName() == null || getPw() == null) |
| { |
| this.addFieldError("userName", "Falscher Username oder Passwort"); |
| return Action.ERROR; |
| addFieldError("userName", "Falscher Username oder Passwort"); |
| return ERROR; |
| } |
| |
| String verifiedUser = this.verifyUser(this.getUserName(), this.getPw()); |
| String verifiedUser = verifyUser(getUserName(), getPw()); |
| if (verifiedUser.equals("failed")) |
| { |
| this.addFieldError("userName", "Falscher Username oder Passwort"); |
| return Action.ERROR; |
| addFieldError("userName", "Falscher Username oder Passwort"); |
| return ERROR; |
| } |
| else |
| { |
| |
| // Put user name, password into session |
| this.session.put("username", this.getUserName()); |
| this.session.put("pw", this.getPw()); |
| session.put("username", getUserName()); |
| session.put("pw", getPw()); |
| return verifiedUser; |
| } |
| } |
| |
| /** |
| * Logout ausf�hren. Zerst�rt die Daten in der Session |
| * |
| * Logout ausführen. Zerstört die Daten in der Session |
| * @return String |
| */ |
| public String doLogout() |
| 69,7 → 63,7 |
|---|
| { |
| // Kill Session content |
| ActionContext.getContext().getSession().clear(); |
| return Action.SUCCESS; |
| return SUCCESS; |
| } |
| |
| /** |
| 84,19 → 78,15 |
|---|
| public String verifyUser(String username, String password) |
| { |
| // DB Query |
| User u = this.userDAO.searchUsername(username); |
| User u = userDAO.searchUsername(username); |
| |
| // User does not exist |
| if (u == null) |
| { |
| return Action.ERROR; |
| } |
| return ERROR; |
| |
| // User password does not match |
| if (!u.getPassword().equals(password)) |
| { |
| return Action.ERROR; |
| } |
| return ERROR; |
| |
| // User credentials are fine, check for admin rights |
| if (u.isAdmin()) |
| 111,7 → 101,7 |
|---|
| |
| public String getUserName() |
| { |
| return this.userName; |
| return userName; |
| } |
| |
| public void setUserName(String userName) |
| 121,7 → 111,7 |
|---|
| |
| public String getPw() |
| { |
| return this.pw; |
| return pw; |
| } |
| |
| public void setPw(String pw) |
| 132,6 → 122,6 |
|---|
| @Override |
| public User getModel() |
| { |
| return this.user; |
| return user; |
| } |
| } |