Fork: 0
nitta-lab-2018 / CactusServer
Browse code
Merge pull request #36 from nitta-lab-2018/Accounts
確認しました.
InstancesInit InstancesRest3 collisionCorrection master
commit 7a7443f5ceba9ded2b4f47196f22169d2cdcc829
2 parents a328665 + 80c6fdf
ryo isitani authored on 31 May 2018
Patch
Unified Split
Showing 5 changed files
View
2
■■■■■
 .classpath
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
View
16
■■■■■
 src/main/java/cactusServer/entities/Account.java
 
import cactusServer.utils.RandomStringGenerator;
import net.arnx.jsonic.JSONHint;
 
public class Account {
public class Account extends Entity{
private String id, name, token;
@JSONHint(ignore=true)
private String pass;
@JSONHint(ignore=true)
private String uniqueID;
 
public void setName(String name) {
this.name = name;
}
public String getpass() {
@JSONHint(ignore=true)
public String getPass() {
return pass;
}
 
public void setPass(String pass) {
this.pass = pass;
}
public boolean islogin() {
@JSONHint(ignore=true)
public boolean isLogin() {
return login;
}
 
public void setLogin(boolean login) {
public String formToken() {
token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
return token;
}
public String getuniqueID() {
@JSONHint(ignore=true)
public String getUniqueID() {
return uniqueID;
}
 
public void setUniqueID(String uniqueID) {
View
20
■■■■■
 src/main/java/cactusServer/entities/Session.java
import java.net.URI;
 
import cactusServer.entities.Account;
 
public class Session {
private Account account;
private URI accountURI;
 
public class Session extends URIAddressedEntity{
public Session(Account account, URI accountURI) {
this.account = account;
this.accountURI = accountURI;
super(accountURI, account);
}
 
public Account getAccount() {
return account;
return (Account)getBody();
}
 
public void setAccount(Account account) {
this.account = account;
setBody(account);
}
 
public URI getAccountURI() {
return accountURI;
return getUri();
}
 
public void setAccountURI(URI accountURI) {
this.accountURI = accountURI;
setUri(accountURI);
}
}
View
20
■■■■■
 src/main/java/cactusServer/entities/URIAddressedEntity.java
package cactusServer.entities;
 
import java.net.URI;
 
public class URIAddressedEntity extends AddressedEntity{
private String uri;
private URI uri;
private URIAddressedEntity() {
// JSONDecode時の呼び出し用
}
public URIAddressedEntity(String uri, Entity body) {
public URIAddressedEntity(URI uri, Entity body) {
super(body);
setUri(uri);
}
public String getUri() {
public URIAddressedEntity(String str, Entity body) {
super(body);
setUri(URI.create(str));
}
public URI getUri() {
return uri;
}
 
public void setUri(String uri) {
public void setUri(URI uri) {
this.uri = uri;
}
}
View
8
■■■■■
 src/main/java/cactusServer/models/Accounts.java
public Account getAccountByuniqueID(String uniqueID) {
Account editAccount;
for (int i = 0; i < accounts.size(); i++) {
editAccount = accounts.get(i);
if (editAccount.getuniqueID().equals(uniqueID)) {
if (editAccount.getUniqueID().equals(uniqueID)) {
return editAccount;
}
}
return null;
}
 
public Session loginAccount(String userID, String userPass) {
if (getAccountByID(userID).getpass().equals(userPass)) {
if (getAccountByID(userID).getPass().equals(userPass)) {
Accounts.getInstance().getAccountByID(userID).setLogin(true);
Accounts.getInstance().getAccountByID(userID).formToken();
session = new Session(Accounts.getInstance().getAccountByID(userID), URI.create(
"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getuniqueID()));
"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID()));
return session;
} else {
return null;
}
public Account deleteAccount(String token) {
Account edit = Accounts.getInstance().getAccountToken(token);
userIDSet.remove(edit.getId());
uniqueIDSet.remove(edit.getuniqueID());
uniqueIDSet.remove(edit.getUniqueID());
accounts.remove(edit);
return edit;
}