summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <Kjetil Ørbekk orbekk@pvv.ntnu.no>2010-09-03 15:22:16 -0400
committerKjetil Orbekk <Kjetil Ørbekk orbekk@pvv.ntnu.no>2010-09-03 15:23:18 -0400
commit60ec71603db5eb64c63e4c39e7549ee269e76a56 (patch)
tree169ffe2e8d5e12685aa14011d8d58a76b89ec9a2
parent73b8f6741611db5763f98765402d58d25010467e (diff)
Change in Authentication.
User is not considered authenticated when there are 0 users, instead this is treated as a special case for adding the first user only.
-rw-r--r--src/lq/AddAdmin.java2
-rw-r--r--src/lq/UserUtil.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lq/AddAdmin.java b/src/lq/AddAdmin.java
index 5bed450..15290f7 100644
--- a/src/lq/AddAdmin.java
+++ b/src/lq/AddAdmin.java
@@ -17,7 +17,7 @@ public class AddAdmin extends HttpServlet {
throws IOException {
resp.setContentType("text/html");
String email = req.getParameter("email");
- if (UserUtil.isAuthenticated()) {
+ if (UserUtil.isAuthenticated() || UserUtil.hasZeroUsers()) {
if (addUser(resp, email)) {
resp.getWriter().println(Strings.escape(email) + " kan nå moderere quotes.");
}
diff --git a/src/lq/UserUtil.java b/src/lq/UserUtil.java
index 48bf2b5..ae882d3 100644
--- a/src/lq/UserUtil.java
+++ b/src/lq/UserUtil.java
@@ -16,7 +16,7 @@ public class UserUtil {
return null;
}
else {
- if (hasZeroUsers() || userExists(user.getEmail())) {
+ if (userExists(user.getEmail())) {
return user.getEmail();
}
else {
@@ -39,7 +39,7 @@ public class UserUtil {
return userService.createLogoutURL(requestUrl);
}
- private static final boolean hasZeroUsers() {
+ public static final boolean hasZeroUsers() {
PersistenceManager pm = PMF.get().getPersistenceManager();
try {
Query query = pm.newQuery(Administrator.class);