External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 14:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/magefree/mage

Browse source
This commit is contained in:
Goudt 2017-01-18 23:53:29 +01:00
commit a522930592
104 changed files with 1024 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -132,7 +132,7 @@ public class MageServerImpl implements MageServer {
}
return true;
}
@Override
public boolean resetPassword(String sessionId, String email, String authToken, String password) throws MageException {
if (!ConfigSettings.getInstance().isAuthenticationActivated()) {
@ -942,7 +942,8 @@ public class MageServerImpl implements MageServer {
user.getGameInfo(),
user.getUserState().toString(),
user.getChatLockedUntil(),
user.getClientVersion()
user.getClientVersion(),
user.getEmail()
));
}
return users;

7
Mage.Server/src/main/java/mage/server/User.java
View file

@ -781,6 +781,13 @@ public class User {
}
return number;
}
public String getEmail() {
if (authorizedUser != null) {
return authorizedUser.email;
}
return "";
}
private void updateAuthorizedUser() {
if (authorizedUser != null) {