caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed google oauth iframe leak

Browse Source
This commit is contained in:
benweet 2014-05-19 19:02:49 +01:00
parent f6c3a0444c
commit 704d74b175
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/res/helpers/googleHelper.js
View File

@ -108,6 +108,7 @@ define([
'https://www.googleapis.com/auth/photos'
]
};
var oauthIframes = [];
function authenticate(task, permission, accountId) {
var authorizationMgr = authorizationMgrMap[accountId];
if(!authorizationMgr) {
@ -161,6 +162,16 @@ define([
immediate: immediate,
authuser: immediate === false ? '' : authuser
}, function(authResult) {
// Hack to clean window from old oauth iframes
authorizationMgr.$oauthIframe && authorizationMgr.$oauthIframe.remove();
var currentOauthIframes = _.filter(document.querySelectorAll('iframe'), function(iframe) {
var src = iframe.getAttribute('src');
return src && src.indexOf('https://accounts.google.com/o/oauth2/auth') === 0;
});
authorizationMgr.$oauthIframe = $(_.difference(currentOauthIframes, oauthIframes));
oauthIframes = currentOauthIframes;
newToken = gapi.auth.getToken();
gapi.auth.setToken(currentToken);
if(!authResult || authResult.error) {
@ -257,7 +268,7 @@ define([
var headers = {
'Content-Type': 'multipart/mixed; boundary="' + boundary + '"',
};
var base64Data = utils.encodeBase64(content);
var multipartRequestBody = [
delimiter,