will/LanternPowerMonitor
1
0
Fork 0
mirror of https://github.com/zyphlar/LanternPowerMonitor.git synced 2024-03-08 14:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some timezone bugs.

Browse Source
This commit is contained in:
MarkBryanMilligan
2021-03-06 15:45:09 -06:00
parent 181513c06d
commit a43222049d
7 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
currentmonitor/lantern-dataaccess-currentmonitor/src/main/java/com/lanternsoftware/dataaccess/currentmonitor/CurrentMonitorDao.java
View File

@@ -41,6 +41,7 @@ public interface CurrentMonitorDao {
Account getAccount(int _accountId);
Account getAccountByUsername(String _username);
TimeZone getTimeZoneForAccount(int _accountId);
String getTimeZoneForAccount(String _authCode);
MongoProxy getProxy();
}

18
currentmonitor/lantern-dataaccess-currentmonitor/src/main/java/com/lanternsoftware/dataaccess/currentmonitor/MongoCurrentMonitorDao.java
View File

@@ -200,7 +200,7 @@ public class MongoCurrentMonitorDao implements CurrentMonitorDao {
Account acct = proxy.queryOne(Account.class, new DaoQuery("username", _username));
if ((acct == null) || !BCrypt.checkpw(_password, acct.getPassword()))
return null;
return aes.encryptToBase64(DaoSerializer.toZipBson(new AuthCode(acct.getId(), acct.getAuxiliaryAccountIds())));
return toAuthCode(acct.getId(), acct.getAuxiliaryAccountIds());
}
@Override
@@ -226,7 +226,13 @@ public class MongoCurrentMonitorDao implements CurrentMonitorDao {
account.setTimezone(_tz.getID());
putAccount(account);
}
return aes.encryptToBase64(DaoSerializer.toZipBson(new AuthCode(account.getId(), account.getAuxiliaryAccountIds())));
return toAuthCode(account.getId(), account.getAuxiliaryAccountIds());
}
public String toAuthCode(int _acctId, List<Integer> _auxAcctIds) {
if (_acctId < 1)
return null;
return aes.encryptToBase64(DaoSerializer.toZipBson(new AuthCode(_acctId, _auxAcctIds)));
}
@Override
@@ -275,6 +281,14 @@ public class MongoCurrentMonitorDao implements CurrentMonitorDao {
return tz == null ? TimeZone.getTimeZone("America/Chicago") : tz;
}
@Override
public String getTimeZoneForAccount(String _authCode) {
AuthCode code = decryptAuthCode(_authCode);
if (code == null)
return null;
return getTimeZoneForAccount(code.getAccountId()).getID();
}
private Account clearPassword(Account _account) {
if (_account == null)
return null;