diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d8d8714..29b55af 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -6,7 +6,6 @@ - diff --git a/src/main/java/com/example/cosmos_serversb/entities/Token.java b/src/main/java/com/example/cosmos_serversb/entities/Token.java index 6e5a120..42fd4b3 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Token.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Token.java @@ -24,4 +24,6 @@ return uId; } + + } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java index 0c9fe54..647c1af 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java @@ -2,14 +2,13 @@ import com.example.cosmos_serversb.entities.Group; import com.example.cosmos_serversb.entities.User; +import com.example.cosmos_serversb.entities.Token; import java.util.HashSet; import java.util.Set; public class UserJsonForRequests { public String uId, uri, name, iconUri; - public boolean login = true; - public String token; public UserJsonForRequests() { @@ -19,8 +18,6 @@ setUri(user.getUri()); setName(user.getName()); setIconUri(user.getIconUri()); - setToken(user.getToken()); - this.login = true; } public String getuId() { @@ -55,20 +52,4 @@ this.iconUri = iconUri; } - public boolean getLogin() { - return login; - } - - public void setLogin(boolean login) { - this.login = login; - } - - public void setToken(String token) { - this.token = token; - } - - public String getToken() { - return token; - } - }