Migrate Dropbox external storage to new API

2 files changed, 78 insertions, 111 deletions

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
deleted file mode 100644
index 53b5d5d666f..00000000000
--- a/apps/files_external/js/dropbox.js
+++ /dev/null
@@ -1,111 +0,0 @@
-$(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');
-							OCA.External.Settings.mountConfig.saveStorageConfig(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($(document.createElement('input'))
-						.addClass('button dropbox')
-						.attr('type', 'button')
-						.attr('value', t('files_external', 'Grant access')));
-				} 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);
-					OCA.External.Settings.mountConfig.saveStorageConfig(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')
-			);
-		}
-	});
-
-});
diff --git a/apps/files_external/js/oauth1.js b/apps/files_external/js/oauth1.js
new file mode 100644
index 00000000000..47aca36871f
--- /dev/null
+++ b/apps/files_external/js/oauth1.js
@@ -0,0 +1,78 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (authMechanism === 'oauth1::oauth1') {
+			var config = $tr.find('.configuration');
+			config.append($(document.createElement('input'))
+				.addClass('button auth-param')
+				.attr('type', 'button')
+				.attr('value', t('files_external', 'Grant access'))
+				.attr('name', 'oauth1_grant')
+			);
+
+			var configured = $tr.find('[data-parameter="configured"]');
+			if ($(configured).val() == 'true') {
+				$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 {
+				var app_key = $tr.find('.configuration [data-parameter="app_key"]').val();
+				var app_secret = $tr.find('.configuration [data-parameter="app_secret"]').val();
+				if (app_key != '' && app_secret != '') {
+					var pos = window.location.search.indexOf('oauth_token') + 12;
+					var token = $tr.find('.configuration [data-parameter="token"]');
+					if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
+						var token_secret = $tr.find('.configuration [data-parameter="token_secret"]');
+						var statusSpan = $tr.find('.status span');
+						statusSpan.removeClass();
+						statusSpan.addClass('waiting');
+						$.post(OC.filePath('files_external', 'ajax', 'oauth1.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');
+								OCA.External.Settings.mountConfig.saveStorageConfig($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 OAuth1'));
+							}
+						});
+					}
+				}
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="oauth1_grant"]', 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 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', 'oauth1.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);
+					OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
+						window.location = result.data.url;
+					});
+				} else {
+					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring OAuth1'));
+				}
+			});
+		} else {
+			OC.dialogs.alert(
+				t('files_external', 'Please provide a valid app key and secret.'),
+				t('files_external', 'Error configuring OAuth1')
+			);
+		}
+	});
+
+});