From 85315f88dc72e10c8be8634e737651ba1a2621eb Mon Sep 17 00:00:00 2001
From: Rolf Schmidt <rolf.schmidt@zammad.com>
Date: Fri, 11 Feb 2022 09:18:17 +0100
Subject: [PATCH] Fixes #3960 - Enable migration button feature for account
 migration MS365/Google channel.

---
 .../channel/email_account_overview.jst.eco    | 22 ++-----------------
 i18n/zammad.pot                               | 12 ++++------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco b/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
index d220b1a79..b57c89f62 100644
--- a/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
+++ b/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
@@ -42,34 +42,16 @@
 <% else: %>
   <% for channel in @account_channels: %>
   <div class="action <% if channel.active isnt true: %>is-inactive<% end %>" data-id="<%- channel.id %>">
-    <!-- Google has postponed the authentication removal. No need to show the warning for now.
      <% if channel.active is true && channel.options.inbound && channel.options.inbound.options && channel.options.inbound.options.host == 'imap.gmail.com' && channel.options.outbound && channel.options.outbound.options && channel.options.outbound.options.host == 'smtp.gmail.com': %>
     <div class="action-alert alert alert--danger alert--square horizontal centered" role="alert">
-      <% date_migration_string = '2020-06-15' %>
-      <% date_migration_string_local = App.i18n.translateDate(date_migration_string, 0) %>
-      <% date_migration = new Date("#{date_migration_string}T00:00:00") %>
-      <% date_now = new Date() %>
-      <% if date_now > date_migration: %>
-        <%- @T('%s will only allow access via OAuth. Password-based access has not been supported since %s.', 'G Suite', date_migration_string_local) %> <div class="flex-spacer"></div><div class="double-spacer"></div><button class="btn js-migrateGoogleMail" type="button"><%- @T('Migrate now!') %></button>
-      <% else: %>
-        <%- @T('%s will only allow access via OAuth. Password-based access is no longer supported on %s.', 'G Suite', date_migration_string_local) %> <div class="flex-spacer"></div><div class="double-spacer"></div><button class="btn js-migrateGoogleMail" type="button"><%- @T('Migrate now!') %></button>
-      <% end %>
+      <%- @T('%s recommends using OAuth. %s announced it\'s going to drop Basic Authentication support in the future.', 'G Suite', 'Google') %> <div class="flex-spacer"></div><div class="double-spacer"></div><button class="btn js-migrateGoogleMail" type="button"><%- @T('Migrate now!') %></button>
     </div>
     <% end %>
     <% if channel.active is true && channel.options.inbound && channel.options.inbound.options && channel.options.inbound.options.host == 'outlook.office365.com' && channel.options.outbound && channel.options.outbound.options && channel.options.outbound.options.host == 'smtp.office365.com': %>
     <div class="action-alert alert alert--danger alert--square horizontal centered" role="alert">
-      <% date_migration_string = '2020-10-13' %>
-      <% date_migration_string_local = App.i18n.translateDate(date_migration_string, 0) %>
-      <% date_migration = new Date("#{date_migration_string}T00:00:00") %>
-      <% date_now = new Date() %>
-      <% if date_now > date_migration: %>
-        <%- @T('%s will only allow access via OAuth. Password-based access has not been supported since %s.', 'Microsoft 365', date_migration_string_local) %> <div class="flex-spacer"></div><div class="double-spacer"></div><button class="btn js-migrateMicrosoft365Mail" type="button"><%- @T('Migrate now!') %></button>
-      <% else: %>
-        <%- @T('%s will only allow access via OAuth. Password-based access is no longer supported on %s.', 'Microsoft 365', date_migration_string_local) %> <div class="flex-spacer"></div><div class="double-spacer"></div><button class="btn js-migrateMicrosoft365Mail" type="button"><%- @T('Migrate now!') %></button>
-      <% end %>
+      <%- @T('%s recommends using OAuth. %s announced it\'s going to drop Basic Authentication support in the future.', 'Microsoft 365', 'Microsoft') %> <div class="flex-spacer"></div><div class="double-spacer"></div><button class="btn js-migrateMicrosoft365Mail" type="button"><%- @T('Migrate now!') %></button>
     </div>
     <% end %>
-    -->
     <div class="action-flow" style="width: 100%;">
       <div class="action-block action-block--flex">
         <div class="horizontal">
diff --git a/i18n/zammad.pot b/i18n/zammad.pot
index fc406c643..100b78ba1 100644
--- a/i18n/zammad.pot
+++ b/i18n/zammad.pot
@@ -176,6 +176,10 @@ msgstr ""
 msgid "%s people"
 msgstr ""
 
+#: app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
+msgid "%s recommends using OAuth. %s announced it's going to drop Basic Authentication support in the future."
+msgstr ""
+
 #: app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
 msgid "%s required!"
 msgstr ""
@@ -228,14 +232,6 @@ msgstr ""
 msgid "%s user to %s user"
 msgstr ""
 
-#: app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
-msgid "%s will only allow access via OAuth. Password-based access has not been supported since %s."
-msgstr ""
-
-#: app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
-msgid "%s will only allow access via OAuth. Password-based access is no longer supported on %s."
-msgstr ""
-
 #: app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco
 msgid "%s% are currently in process"
 msgstr ""