Commit 85ab4a9a authored by Matija Obreza's avatar Matija Obreza

Fix: Settings fail to load when refreshToken missing

parent 729f50ed
...@@ -311,7 +311,9 @@ public class DwcaBuilder extends AbstractModelObject { ...@@ -311,7 +311,9 @@ public class DwcaBuilder extends AbstractModelObject {
oAuthSettings.setClientKey(jsonSettings.getString("clientKey")); oAuthSettings.setClientKey(jsonSettings.getString("clientKey"));
oAuthSettings.setClientSecret(jsonSettings.getString("clientSecret")); oAuthSettings.setClientSecret(jsonSettings.getString("clientSecret"));
oAuthSettings.setScope(StringUtils.defaultIfBlank(jsonSettings.getString("scope"), "read,write")); oAuthSettings.setScope(StringUtils.defaultIfBlank(jsonSettings.getString("scope"), "read,write"));
oAuthSettings.setRefreshToken(jsonSettings.getString("refreshToken")); if (jsonSettings.has("refreshToken")) {
oAuthSettings.setRefreshToken(jsonSettings.getString("refreshToken"));
}
oAuthSettings.setServerUrl(jsonSettings.getString("serverUrl")); oAuthSettings.setServerUrl(jsonSettings.getString("serverUrl"));
oAuthSettings.setTokenEndpoint(jsonSettings.getString("tokenEndpoint")); oAuthSettings.setTokenEndpoint(jsonSettings.getString("tokenEndpoint"));
......
...@@ -501,7 +501,7 @@ public class PushDialog extends Dialog { ...@@ -501,7 +501,7 @@ public class PushDialog extends Dialog {
} }
if (futures.size() > 1) { if (futures.size() > 1) {
_log.warn("Waiting for uploads still running: " + futures.size()); _log.debug("Waiting for uploads still running: " + futures.size());
} }
// We're the last job // We're the last job
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment