keeweb/keeweb
1
0
Fork 0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-20 06:56:40 +02:00
Code Issues Releases Wiki Activity

fix #821: auto-click OneDrive popup login button if it's the only option

Browse Source
This commit is contained in:
antelle 2017-12-25 18:58:23 +01:00
parent a6bd460469
commit 0e63e955ce
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scripts/storage/storage-base.js
View File

@ -146,9 +146,11 @@ _.extend(StorageBase.prototype, {
.replace('{scope}', encodeURIComponent(opts.scope))
.replace('{url}', encodeURIComponent(this._getOauthRedirectUrl()));
this.logger.debug('OAuth: popup opened');
if (!this._openPopup(url, 'OAuth', opts.width, opts.height)) {
const popupWindow = this._openPopup(url, 'OAuth', opts.width, opts.height);
if (!popupWindow) {
return callback('OAuth: cannot open popup');
}
this._popupOpened(popupWindow);
const popupClosed = () => {
Backbone.off('popup-closed', popupClosed);
window.removeEventListener('message', windowMessage);
@ -177,6 +179,9 @@ _.extend(StorageBase.prototype, {
window.addEventListener('message', windowMessage);
},
_popupOpened(popupWindow) {
},
_oauthProcessReturn: function(message) {
const token = this._oauthMsgToToken(message);
if (token && !token.error) {

16
app/scripts/storage/storage-onedrive.js
View File

@ -239,6 +239,22 @@ const StorageOneDrive = StorageBase.extend({
width: 600,
height: 500
};
},
_popupOpened(popupWindow) {
if (popupWindow.webContents) {
popupWindow.webContents.on('did-finish-load', (e) => {
const webContents = e.sender.webContents;
const url = webContents.getURL();
if (url && url.startsWith('https://login.microsoftonline.com/common/oauth2/v2.0/authorize')) {
// click the login button mentioned in #821
const script =
`const selector = '[role="button"][aria-describedby="tileError loginHeader"]';
if (document.querySelectorAll(selector).length === 1) document.querySelector(selector).click()`;
webContents.executeJavaScript(script);
}
});
}
}
});