Merge branch 'hotfix' into develop

master
kira 6 years ago
commit c0228420c9

@ -141,7 +141,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
client.putAll(clientConfigService.find(client_id)); client.putAll(clientConfigService.find(client_id));
client = clientInfoWithNoSecretInfo(client); client = clientInfoWithNoSecretInfo(client);
if (client.getInteger("parent_client_id") != null) { if (client.getInteger("parent_client_id") != null) {
JSONObject rootPartner = clientManager.getClientInfo(client.getIntValue("parent_client_id")); JSONObject rootPartner = clientManager.getClientInfoIgnoreInvalid(client.getIntValue("parent_client_id"));
rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id"))); rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id")));
rootPartner = clientInfoWithNoSecretInfo(rootPartner); rootPartner = clientInfoWithNoSecretInfo(rootPartner);
account.put("parent_client", rootPartner); account.put("parent_client", rootPartner);
@ -253,7 +253,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
client.putAll(clientConfigService.find(client.getIntValue("client_id"))); client.putAll(clientConfigService.find(client.getIntValue("client_id")));
client = clientInfoWithNoSecretInfo(client); client = clientInfoWithNoSecretInfo(client);
if (client.getInteger("parent_client_id") != null) { if (client.getInteger("parent_client_id") != null) {
JSONObject rootPartner = clientManager.getClientInfo(client.getIntValue("parent_client_id")); JSONObject rootPartner = clientManager.getClientInfoIgnoreInvalid(client.getIntValue("parent_client_id"));
rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id"))); rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id")));
rootPartner = clientInfoWithNoSecretInfo(rootPartner); rootPartner = clientInfoWithNoSecretInfo(rootPartner);
account.put("parent_client", rootPartner); account.put("parent_client", rootPartner);

Loading…
Cancel
Save