IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files : Article : Fixed ThirdParty oAuth connect

Browse Source
This commit is contained in:
Ilya Oleshko 2020-11-24 12:55:49 +03:00
parent 83d9d90ac6
commit 76387d71bb
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
View File

@ -128,9 +128,39 @@ const PureThirdPartyListContainer = ({
}
};
const getOAuthToken = (modal, serviceData) => {
let t = setInterval(() => {
try {
if (modal.json) {
clearInterval(t);
const token = modal.json.response;
if (token) {
modal.close();
const data = {
title: serviceData.title,
provider_key: serviceData.title,
link: serviceData.link,
token,
};
setConnectItem(data);
}
}
} catch {
return;
}
}, 1000);
};
const onConnect = (e) => {
const data = e.currentTarget.dataset;
data.link ? openConnectWindow(data.title) : setConnectItem(data);
data.link
? openConnectWindow(data.title).then((modal) =>
getOAuthToken(modal, data)
)
: setConnectItem(data);
redirectAction();
};

6
products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
View File

@ -151,8 +151,10 @@ class ConnectClouds extends React.Component {
if (modal.json) {
clearInterval(t);
const token = modal.json.response;
modal.close();
this.showOAuthModal(token, serviceData);
if (token) {
modal.close();
this.showOAuthModal(token, serviceData);
}
}
} catch {
return;