e13be94e56
When clicking "Grant access", the settings for Dropbox/Google were saved through a call that gets cancelled when redirecting to the grant page (for example in Firefox) This fix makes sure the "save settings" call finished before redirecting to the grant page. Fixes #6176
108 lines
4.6 KiB
JavaScript
108 lines
4.6 KiB
JavaScript
$(document).ready(function() {
|
|
|
|
$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox').each(function() {
|
|
var configured = $(this).find('[data-parameter="configured"]');
|
|
if ($(configured).val() == 'true') {
|
|
$(this).find('.configuration input').attr('disabled', 'disabled');
|
|
$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
|
|
} else {
|
|
var app_key = $(this).find('.configuration [data-parameter="app_key"]').val();
|
|
var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
|
|
var config = $(this).find('.configuration');
|
|
if (app_key != '' && app_secret != '') {
|
|
var pos = window.location.search.indexOf('oauth_token') + 12;
|
|
var token = $(this).find('.configuration [data-parameter="token"]');
|
|
if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
|
|
var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
|
|
var tr = $(this);
|
|
var statusSpan = $(tr).find('.status span');
|
|
statusSpan.removeClass();
|
|
statusSpan.addClass('waiting');
|
|
$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
|
|
if (result && result.status == 'success') {
|
|
$(token).val(result.access_token);
|
|
$(token_secret).val(result.access_token_secret);
|
|
$(configured).val('true');
|
|
OC.MountConfig.saveStorage(tr, function(status) {
|
|
if (status) {
|
|
$(tr).find('.configuration input').attr('disabled', 'disabled');
|
|
$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
|
|
}
|
|
});
|
|
} else {
|
|
OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
|
|
}
|
|
});
|
|
}
|
|
} else {
|
|
onDropboxInputsChange($(this));
|
|
}
|
|
}
|
|
});
|
|
|
|
$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
|
|
var tr = $(this).parent();
|
|
setTimeout(function() {
|
|
onDropboxInputsChange(tr);
|
|
}, 20);
|
|
});
|
|
|
|
$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
|
|
onDropboxInputsChange($(this).parent());
|
|
});
|
|
|
|
$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox .chzn-select', function() {
|
|
onDropboxInputsChange($(this).parent().parent());
|
|
});
|
|
|
|
function onDropboxInputsChange(tr) {
|
|
if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
|
|
var config = $(tr).find('.configuration');
|
|
if ($(tr).find('.mountPoint input').val() != ''
|
|
&& $(config).find('[data-parameter="app_key"]').val() != ''
|
|
&& $(config).find('[data-parameter="app_secret"]').val() != ''
|
|
&& ($(tr).find('.chzn-select').length == 0
|
|
|| $(tr).find('.chzn-select').val() != null))
|
|
{
|
|
if ($(tr).find('.dropbox').length == 0) {
|
|
$(config).append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>');
|
|
} else {
|
|
$(tr).find('.dropbox').show();
|
|
}
|
|
} else if ($(tr).find('.dropbox').length > 0) {
|
|
$(tr).find('.dropbox').hide();
|
|
}
|
|
}
|
|
}
|
|
|
|
$('#externalStorage').on('click', '.dropbox', function(event) {
|
|
event.preventDefault();
|
|
var tr = $(this).parent().parent();
|
|
var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
|
|
var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
|
|
if (app_key != '' && app_secret != '') {
|
|
var tr = $(this).parent().parent();
|
|
var configured = $(this).parent().find('[data-parameter="configured"]');
|
|
var token = $(this).parent().find('[data-parameter="token"]');
|
|
var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
|
|
$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
|
|
if (result && result.status == 'success') {
|
|
$(configured).val('false');
|
|
$(token).val(result.data.request_token);
|
|
$(token_secret).val(result.data.request_token_secret);
|
|
OC.MountConfig.saveStorage(tr, function() {
|
|
window.location = result.data.url;
|
|
});
|
|
} else {
|
|
OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
|
|
}
|
|
});
|
|
} else {
|
|
OC.dialogs.alert(
|
|
t('files_external', 'Please provide a valid Dropbox app key and secret.'),
|
|
t('files_external', 'Error configuring Dropbox storage')
|
|
);
|
|
}
|
|
});
|
|
|
|
});
|