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

Ask for token when importing document from Google+. Fixes #353

Browse Source
This commit is contained in:
benweet 2014-03-19 22:52:51 +00:00
parent 17f5275c28
commit d445ccfec8
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,6 +755,10 @@ define([
if(pickerType == 'doc' || pickerType == 'folder') { if(pickerType == 'doc' || pickerType == 'folder') {
authenticate(task, 'gdrive', accountId); authenticate(task, 'gdrive', accountId);
} }
else {
accountId = 'google.picasa0';
authenticate(task, 'picasa', accountId);
}
loadPicker(task); loadPicker(task);
task.onRun(function() { task.onRun(function() {
var authorizationMgr = authorizationMgrMap[accountId]; var authorizationMgr = authorizationMgrMap[accountId];
@ -794,6 +798,7 @@ define([
view.setType('ofuser'); view.setType('ofuser');
pickerBuilder.addView(view); pickerBuilder.addView(view);
pickerBuilder.addView(google.picker.ViewId.PHOTO_UPLOAD); pickerBuilder.addView(google.picker.ViewId.PHOTO_UPLOAD);
authorizationMgr && authorizationMgr.token && pickerBuilder.setOAuthToken(authorizationMgr.token.access_token);
} }
pickerBuilder.setCallback(function(data) { pickerBuilder.setCallback(function(data) {
if(data.action == google.picker.Action.PICKED || data.action == google.picker.Action.CANCEL) { if(data.action == google.picker.Action.PICKED || data.action == google.picker.Action.CANCEL) {