Bug 1575005 - Do not send email announcement upon automated creation of API keys...

diff --git a/auth.cgi b/auth.cgi
index 1f80711d4d22ff096e9da80a71fdf92069101b83..12f22d7202414a2fa1973a9457a37ad7e7dd5cef 100755 (executable)
--- a/auth.cgi
+++ b/auth.cgi
@@ -92,13 +92,6 @@ if ($confirmed || $skip_confirmation) {
       = Bugzilla::User::APIKey->create({
       user_id => $user->id, description => $description, app_id => $app_id,
       });
-    my $template = Bugzilla->template_inner($user->setting('lang'));
-    my $vars = {user => $user, new_key => $api_key};
-    my $message;
-    $template->process('email/new-api-key.txt.tmpl', $vars, \$message)
-      or ThrowTemplateError($template->error());
-
-    MessageToMTA($message);
   }
 
   my $ua = LWP::UserAgent->new();

diff --git a/template/en/default/account/auth/delegation.html.tmpl b/template/en/default/account/auth/delegation.html.tmpl
index f27045ef6722883a4968ea59a0639b2d8b5f0628..db7e0ae16509bce3ea76403649bf733dd5c8db54 100644 (file)
--- a/template/en/default/account/auth/delegation.html.tmpl
+++ b/template/en/default/account/auth/delegation.html.tmpl
@@ -10,16 +10,19 @@
    title = "Auth Delegation Request" %]
 
 <h1>[% title FILTER html %] </h1>
-<p>
-  A third-party website (<a href="[% callback_base FILTER html %]">[% callback_base FILTER html %]</a>)
-    would like to have <strong>complete</strong> access to your [% terms.Bugzilla %] account.
-</p>
+
+<p>A third-party website (<a href="[% callback_base FILTER html %]">[% callback_base FILTER html %]</a>)
+  would like to have <strong>complete</strong> access to your [% terms.Bugzilla %] account.</p>
 
 <p>The description of the site reads:
   <blockquote>
     [% description FILTER html %]
-  </blockquote>
-</p>
+  </blockquote></p>
+
+<p>A new [% terms.Bugzilla %] API key[% IF description %], with the description
+  '[% description FILTER truncate(10) FILTER html %]'[% END %] will also be created. You can
+  view or update the key in <a href="[% basepath FILTER html %]userprefs.cgi?tab=apikey">
+  your preferences</a>.</p>
 
 <p>Do you want this website to have <strong>complete</strong> access to your [% terms.Bugzilla %]
   account?</p>