Added warnings about AmazonCD shutting down

duplicati · Jun 25, 2019 · 8dae320 · 8dae320
1 parent a03cd08
commit 8dae320
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/Duplicati/Library/Main/Controller.cs b/Duplicati/Library/Main/Controller.cs
@@ -791,17 +791,21 @@ private void ValidateOptions()
 
             // For now, warn not to use 7z
             if (string.Equals(m_options.CompressionModule, "7z", StringComparison.OrdinalIgnoreCase))
-                Logging.Log.WriteWarningMessage(LOGTAG, "7zModuleHasIssues", null, "The 7z compression module has known issues and should only be used for experimental purposes");
-
-            //TODO: Based on the action, see if all options are relevant
-        }
-
-        /// <summary>
-        /// Helper method that expands the users chosen source input paths,
-        /// and removes duplicate paths
-        /// </summary>
-        /// <returns>The expanded and filtered sources.</returns>
-        private string[] ExpandInputSources(string[] inputsources, IFilter filter)
+                Logging.Log.WriteWarningMessage(LOGTAG, "7zModuleHasIssues", null, "The 7z compression module has known issues and should only be used for experimental purposes");
+
+            // Amazon CD is closing August 16th 2019
+			if (string.Equals(new Library.Utility.Uri(m_backend).Scheme, "amzcd", StringComparison.OrdinalIgnoreCase))
+				Logging.Log.WriteWarningMessage(LOGTAG, "AmzCDClosingApi", null, "The Amazon Cloud Drive API is closing down on August 16th 2019, please migrate your backups before this date");
+
+			//TODO: Based on the action, see if all options are relevant
+		}
+
+		/// <summary>
+		/// Helper method that expands the users chosen source input paths,
+		/// and removes duplicate paths
+		/// </summary>
+		/// <returns>The expanded and filtered sources.</returns>
+		private string[] ExpandInputSources(string[] inputsources, IFilter filter)
         {
             if (inputsources == null || inputsources.Length == 0)
                 throw new Duplicati.Library.Interface.UserInformationException(Strings.Controller.NoSourceFoldersError, "NoSourceFolders");

diff --git a/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js b/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js
@@ -20,7 +20,7 @@ backupApp.service('EditUriBuiltins', function(AppService, AppUtils, SystemInfo,
     EditUriBackendConfig.templates['onedrivev2']  = 'templates/backends/oauth.html';
     EditUriBackendConfig.templates['sharepoint']  = 'templates/backends/sharepoint.html';
     EditUriBackendConfig.templates['msgroup']     = 'templates/backends/msgroup.html';
-    EditUriBackendConfig.templates['amzcd']       = 'templates/backends/oauth.html';
+    EditUriBackendConfig.templates['amzcd']       = 'templates/backends/amzcd.html';
     EditUriBackendConfig.templates['openstack']   = 'templates/backends/openstack.html';
     EditUriBackendConfig.templates['azure']       = 'templates/backends/azure.html';
     EditUriBackendConfig.templates['gcs']         = 'templates/backends/gcs.html';

diff --git a/Duplicati/Server/webroot/ngax/templates/backends/amzcd.html b/Duplicati/Server/webroot/ngax/templates/backends/amzcd.html
@@ -0,0 +1,15 @@
+<h2 style="color: darkred">WARNING: Amazon Cloud Drive API is closing August 16th 2019</h2>
+<p>Do not use this destination for new backups, and migrate any existing backups away before this date</p>
+
+<div class="input text">
+    <label for="oauth_path" translate>Path on server</label>
+    <input type="text" name="oauth_path" id="oauth_path" ng-model="$parent.Path" placeholder="{{'Enter the destination path' | translate}}" />
+</div>
+
+<div class="input text">
+    <label for="oauth_authid">
+        <a ng-show="oauth_in_progress" href="{{oauth_start_link}}" target="_blank" translate>AuthID</a> 
+        <a ng-hide="oauth_in_progress" href ng-click="oauth_start_token_creation()" translate>AuthID</a>
+    </label>
+    <input type="text" name="oauth_authid" id="oauth_authid" ng-model="$parent.AuthID" placeholder="{{'Click the AuthID link to create an AuthID' | translate}}" />
+</div>