Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
This commit is contained in:
commit
73933162d5
@ -251,8 +251,9 @@ class SettingsStore {
|
||||
clearInterval(interval);
|
||||
reject();
|
||||
}
|
||||
} catch {
|
||||
return;
|
||||
} catch (e) {
|
||||
clearInterval(interval);
|
||||
reject(e);
|
||||
}
|
||||
}, 500);
|
||||
});
|
||||
|
@ -109,12 +109,16 @@ const ThirdPartyDialog = (props) => {
|
||||
"Authorization",
|
||||
"height=600, width=1020"
|
||||
);
|
||||
openConnectWindow(item.title, authModal).then((modal) =>
|
||||
getOAuthToken(modal).then((token) => {
|
||||
openConnectWindow(item.title, authModal)
|
||||
.then(getOAuthToken)
|
||||
.then((token) => {
|
||||
authModal.close();
|
||||
showOAuthModal(token, item);
|
||||
})
|
||||
);
|
||||
.catch((e) => {
|
||||
if (!e) return;
|
||||
console.error(e);
|
||||
});
|
||||
} else {
|
||||
item.title = connectedCloudsTitleTranslation(item.title, t);
|
||||
setConnectItem(item);
|
||||
|
Loading…
Reference in New Issue
Block a user