Merge pull request #8 from nitta-lab-2018/Acocunts

Fork: 0

nitta-lab-2018 / CactusServer

Browse code Merge pull request #8 from nitta-lab-2018/Acocunts 確認しました。 InstancesInit InstancesRest3 collisionCorrection master
commit e674c1ad194df1644e510c4344602afc28b045d8 2 parents 92e4eb7 + 9010e28 Takashi Kazehaya authored on 17 May 2018

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          10 ■■■■■
          src/main/java/cactusServer/models/Accounts.java
 		return editAccount;
	}
 
	public Account loginAccount(String userID,String userPass) {
		return Accounts.getInstance().getAccount(userID);
		if(idList.contains(userID) && getAccount(userID).getPass().equals(userPass)) {
			return getAccount(userID);
		}else {
			return null;
		}
	}
	
	public String logoutAccount(String userID) {
		Accounts.getInstance().getAccount(userID).setLogin(false);
 		return editAccount;
 	}
 	public Account loginAccount(String userID,String userPass) {
+		return Accounts.getInstance().getAccount(userID);
+		if(idList.contains(userID) && getAccount(userID).getPass().equals(userPass)) {
+			return getAccount(userID);
+		}else {
+			return null;
+		}
 	}
 	public String logoutAccount(String userID) {
 		Accounts.getInstance().getAccount(userID).setLogin(false);

Show line notes below