From 7d910437fd75b023f0ceeab8970ac2dd2cdcd87b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Sep 2016 14:47:59 +0200
Subject: [PATCH] Respect updater kill switch and fall back to download button

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 apps/updatenotification/js/admin.js                 |  5 +++++
 .../lib/Controller/AdminController.php              |  6 ++++--
 apps/updatenotification/lib/UpdateChecker.php       |  4 ++++
 apps/updatenotification/templates/admin.php         | 13 +++++++++----
 .../tests/Controller/AdminControllerTest.php        | 13 +++++++++++--
 apps/updatenotification/tests/UpdateCheckerTest.php |  5 +++++
 6 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/apps/updatenotification/js/admin.js b/apps/updatenotification/js/admin.js
index 3ca45a191d4..91d9f80b605 100644
--- a/apps/updatenotification/js/admin.js
+++ b/apps/updatenotification/js/admin.js
@@ -35,6 +35,11 @@ $(document).ready(function(){
 						body.removeAttr('id');
 						body.attr('id', 'body-settings');
 					}
+				},
+				error: function(){
+					OC.Notification.showTemporary(t('updatenotification', 'Could not start updater, please try the manual update'));
+					$('#oca_updatenotification_button').addClass('hidden');
+					$('#oca_updatenotification_section .button').removeClass('hidden');
 				}
 			});
 		});
diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php
index 9f10f1b32f2..56f41ebf3ee 100644
--- a/apps/updatenotification/lib/Controller/AdminController.php
+++ b/apps/updatenotification/lib/Controller/AdminController.php
@@ -107,11 +107,13 @@ class AdminController extends Controller implements ISettings {
 		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
 
 		$params = [
-			'isNewVersionAvailable' => ($updateState === []) ? false : true,
+			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
 			'lastChecked' => $lastUpdateCheck,
 			'currentChannel' => $currentChannel,
 			'channels' => $channels,
-			'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'],
+			'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
+			'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
+			'updaterEnabled' => $updateState['updaterEnabled'],
 
 			'notify_groups' => implode('|', $notifyGroups),
 		];
diff --git a/apps/updatenotification/lib/UpdateChecker.php b/apps/updatenotification/lib/UpdateChecker.php
index dd51831007c..040a6c3a6ac 100644
--- a/apps/updatenotification/lib/UpdateChecker.php
+++ b/apps/updatenotification/lib/UpdateChecker.php
@@ -46,9 +46,13 @@ class UpdateChecker {
 		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
 			$result['updateAvailable'] = true;
 			$result['updateVersion'] = $data['versionstring'];
+			$result['updaterEnabled'] = $data['autoupdater'] === '1';
 			if(substr($data['web'], 0, 8) === 'https://') {
 				$result['updateLink'] = $data['web'];
 			}
+			if(substr($data['url'], 0, 8) === 'https://') {
+				$result['downloadLink'] = $data['url'];
+			}
 
 			return $result;
 		}
diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
index 68ef1d423b4..78337eb313b 100644
--- a/apps/updatenotification/templates/admin.php
+++ b/apps/updatenotification/templates/admin.php
@@ -14,13 +14,18 @@
 	$currentChannel = $_['currentChannel'];
 ?>
 <form id="oca_updatenotification_section" class="followupsection">
-	<?php if($isNewVersionAvailable === true): ?>
+	<?php if($isNewVersionAvailable === true) { ?>
 		<strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong>
-		<input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>">
-	<?php else: ?>
+		<?php if ($_['updaterEnabled']) { ?>
+			<input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>">
+		<?php } ?>
+		<?php if (!empty($_['downloadLink'])) { ?>
+			<a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a>
+		<?php } ?>
+	<?php } else { ?>
 		<strong><?php print_unescaped($l->t('Your version is up to date.')); ?></strong>
 		<span class="icon-info svg" title="<?php p($l->t('Checked on %s', [$lastCheckedDate])) ?>"></span>
-	<?php endif; ?>
+	<?php } ?>
 
 	<p>
 		<label for="release-channel"><?php p($l->t('Update channel:')) ?></label>
diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php
index cf99679e680..336da09ec7a 100644
--- a/apps/updatenotification/tests/Controller/AdminControllerTest.php
+++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php
@@ -110,7 +110,12 @@ class AdminControllerTest extends TestCase {
 		$this->updateChecker
 			->expects($this->once())
 			->method('getUpdateState')
-			->willReturn(['updateVersion' => '8.1.2']);
+			->willReturn([
+				'updateAvailable' => true,
+				'updateVersion' => '8.1.2',
+				'downloadLink' => 'https://downloads.nextcloud.org/server',
+				'updaterEnabled' => true,
+			]);
 
 		$params = [
 			'isNewVersionAvailable' => true,
@@ -118,6 +123,8 @@ class AdminControllerTest extends TestCase {
 			'currentChannel' => \OCP\Util::getChannel(),
 			'channels' => $channels,
 			'newVersionString' => '8.1.2',
+			'downloadLink' => 'https://downloads.nextcloud.org/server',
+			'updaterEnabled' => true,
 			'notify_groups' => 'admin',
 		];
 
@@ -154,7 +161,7 @@ class AdminControllerTest extends TestCase {
 		$this->updateChecker
 			->expects($this->once())
 			->method('getUpdateState')
-			->willReturn([]);
+			->willReturn(['updaterEnabled' => false]);
 
 		$params = [
 			'isNewVersionAvailable' => false,
@@ -162,6 +169,8 @@ class AdminControllerTest extends TestCase {
 			'currentChannel' => \OCP\Util::getChannel(),
 			'channels' => $channels,
 			'newVersionString' => '',
+			'downloadLink' => '',
+			'updaterEnabled' => 0,
 			'notify_groups' => 'admin',
 		];
 
diff --git a/apps/updatenotification/tests/UpdateCheckerTest.php b/apps/updatenotification/tests/UpdateCheckerTest.php
index ce19cc60f2c..c5c3034dd72 100644
--- a/apps/updatenotification/tests/UpdateCheckerTest.php
+++ b/apps/updatenotification/tests/UpdateCheckerTest.php
@@ -50,11 +50,13 @@ class UpdateCheckerTest extends TestCase {
 				'versionstring' => 'Nextcloud 123',
 				'web'=> 'javascript:alert(1)',
 				'url'=> 'javascript:alert(2)',
+				'autoupdater'=> '0',
 			]);
 
 		$expected = [
 			'updateAvailable' => true,
 			'updateVersion' => 'Nextcloud 123',
+			'updaterEnabled' => false,
 		];
 		$this->assertSame($expected, $this->updateChecker->getUpdateState());
 	}
@@ -68,12 +70,15 @@ class UpdateCheckerTest extends TestCase {
 				'versionstring' => 'Nextcloud 123',
 				'web'=> 'https://docs.nextcloud.com/myUrl',
 				'url'=> 'https://downloads.nextcloud.org/server',
+				'autoupdater'=> '1',
 			]);
 
 		$expected = [
 			'updateAvailable' => true,
 			'updateVersion' => 'Nextcloud 123',
+			'updaterEnabled' => true,
 			'updateLink' => 'https://docs.nextcloud.com/myUrl',
+			'downloadLink' => 'https://downloads.nextcloud.org/server',
 		];
 		$this->assertSame($expected, $this->updateChecker->getUpdateState());
 	}
-- 
2.39.5