Merge remote-tracking branch 'origin/master'

Anaaspet · Mar 12, 2013 · c57f6ad · c57f6ad
2 parents a85a47e + 17d823d
commit c57f6ad
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 15 deletions.
diff --git a/Core/WPISuite/src/edu/wpi/cs/wpisuitetng/ManagerLayer.java b/Core/WPISuite/src/edu/wpi/cs/wpisuitetng/ManagerLayer.java
@@ -81,21 +81,14 @@ private ManagerLayer()
 		((ProjectManager)map.get("coreproject")).setAllModules(fullModuleList);
 		String ssid = null;
 
+		((UserManager)map.get("coreuser")).createAdmin();
+
 		try {
-			String adminJSON = "{username:\"admin\", name:\"Admin\", password:\"password\", idNum:0, role:\"ADMIN\"}";
-			ssid = sessions.createSession((User)map.get("coreuser").makeEntity(null, adminJSON));
-		} catch (BadRequestException e) {
-			e.printStackTrace();
-		} catch (ConflictException e) {
-			try {
-				ssid = sessions.createSession((User)map.get("coreuser").getEntity(null, "admin")[0]);
-			} catch (NotFoundException e1) {
-				e1.printStackTrace();
-			} catch (WPISuiteException e1) {
-				e1.printStackTrace();
-			}
-		} catch (WPISuiteException e) {
-			e.printStackTrace();
+			ssid = sessions.createSession((User)map.get("coreuser").getEntity(null, "admin")[0]);
+		} catch (NotFoundException e1) {
+			e1.printStackTrace();
+		} catch (WPISuiteException e1) {
+			e1.printStackTrace();
 		}
 
 		superCookie = sessions.getSession(ssid).toCookie();

diff --git a/Core/WPISuite/src/edu/wpi/cs/wpisuitetng/modules/core/entitymanagers/UserManager.java b/Core/WPISuite/src/edu/wpi/cs/wpisuitetng/modules/core/entitymanagers/UserManager.java
@@ -340,5 +340,38 @@ public static String parseUsername(String serializedUser)
 		logger.log(Level.FINE, "Username parsing success!");
 		return username;
 	}
+
+	/**
+	 * Creates an Admin user if one does not exist
+	 */
+	public User createAdmin()
+	{
+		logger.log(Level.INFO, "Adding an admin");
+
+		User p = new User("Admin", "admin", "password", 0);
+
+		try {
+			if(getEntity(null,p.getUsername())[0] == null)
+			{
+				String newPassword = "password";
+				String hashedPassword = this.passwordHash.generateHash(newPassword);
+
+				p.setPassword(hashedPassword);
+
+				p.setRole(Role.ADMIN);
+
+				save(null,p);
+			}
+			else
+			{
+				p = getEntity(null,p.getUsername())[0];
+			}
+		} catch (WPISuiteException e) {
+		}
+
+		logger.log(Level.INFO, "Admin creation success!");
+
+		return p;
+	}
 
-}
+}