Merge pull request #7938 from NuGet/dev

[ReleasePrep][2020-04-07] RI dev to master

Author: loic-sharma

.gitignore

@@ -29,6 +29,7 @@ tools/
 .nuget/.marker.v*
 nuget.exe
 AssemblyInfo.g.cs
+*.g.txt
 tests/Scripts/Config-*.json
 
 # MSTest test Results

build.ps1

@@ -10,7 +10,7 @@ param (
     [string]$PackageSuffix,
     [string]$Branch,
     [string]$CommitSHA,
-    [string]$BuildBranch = 'd298565f387e93995a179ef8ae6838f1be37904f',
+    [string]$BuildBranch = '6d1fcf147a7af8b6b4db842494bc7beed3b1d0e9',
     [string]$VerifyMicrosoftPackageVersion = $null
 )
 

ops.cmd

@@ -2,6 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ThirdPartyBinaries Include="AnglicanGeek.MarkdownMailer.dll" />
+    <ThirdPartyBinaries Include="Antlr3.Runtime.dll" />
     <ThirdPartyBinaries Include="Autofac.dll" />
     <ThirdPartyBinaries Include="Autofac.Extensions.DependencyInjection.dll" />
     <ThirdPartyBinaries Include="Autofac.Integration.Mvc.dll" />

sign.thirdparty.props

@@ -63,31 +63,42 @@ public async Task<bool> HandleAsync(AccountDeleteMessage command)
                     throw new UserNotFoundException();
                 }
 
-                if (_accountDeleteConfigurationAccessor.Value.RespectEmailContactSetting && !user.EmailAllowed)
-                {
-                    throw new EmailContactNotAllowedException();
-                }
-
                 var recipientEmail = user.EmailAddress;
+                var emailAllowed = user.EmailAllowed;
                 var deleteSuccess = await _accountManager.DeleteAccount(user, source);
                 _telemetryService.TrackDeleteResult(source, deleteSuccess);
 
-                var baseEmailBuilder = _emailBuilderFactory.GetEmailBuilder(source, deleteSuccess);
-                if (baseEmailBuilder != null)
+                if (recipientEmail == null)
+                {
+                    _logger.LogWarning("User has no confirmed email address. The user has been deleted but no email was sent.");
+                    _telemetryService.TrackUnconfirmedUser(source);
+                    messageProcessed = true;
+                }
+                else if (_accountDeleteConfigurationAccessor.Value.RespectEmailContactSetting && !emailAllowed)
                 {
-                    var toEmail = new List<MailAddress>();
+                    _logger.LogWarning("User did not allow Email Contact. The user has been deleted but no email was sent.");
+                    _telemetryService.TrackEmailBlocked(source);
+                    messageProcessed = true;
+                }
+                else
+                {
+                    var baseEmailBuilder = _emailBuilderFactory.GetEmailBuilder(source, deleteSuccess);
+                    if (baseEmailBuilder != null)
+                    {
+                        var toEmail = new List<MailAddress>();
 
-                    var configuration = _accountDeleteConfigurationAccessor.Value;
-                    var senderAddress = configuration.EmailConfiguration.GalleryOwner;
-                    var ccEmail = new List<MailAddress>();
-                    toEmail.Add(new MailAddress(recipientEmail));
-                    ccEmail.Add(new MailAddress(senderAddress));
+                        var configuration = _accountDeleteConfigurationAccessor.Value;
+                        var senderAddress = configuration.EmailConfiguration.GalleryOwner;
+                        var ccEmail = new List<MailAddress>();
+                        toEmail.Add(new MailAddress(recipientEmail));
+                        ccEmail.Add(new MailAddress(senderAddress));
 
-                    var recipients = new EmailRecipients(toEmail, ccEmail);
-                    var emailBuilder = new DisposableEmailBuilder(baseEmailBuilder, recipients, username);
-                    await _messenger.SendMessageAsync(emailBuilder);
-                    _telemetryService.TrackEmailSent(source, user.EmailAllowed);
-                    messageProcessed = true;
+                        var recipients = new EmailRecipients(toEmail, ccEmail);
+                        var emailBuilder = new DisposableEmailBuilder(baseEmailBuilder, recipients, username);
+                        await _messenger.SendMessageAsync(emailBuilder);
+                        _telemetryService.TrackEmailSent(source, emailAllowed);
+                        messageProcessed = true;
+                    }
                 }
             }
             catch (UnknownSourceException)
@@ -98,12 +109,6 @@ public async Task<bool> HandleAsync(AccountDeleteMessage command)
                 _telemetryService.TrackUnknownSource(source);
                 messageProcessed = false;
             }
-            catch (EmailContactNotAllowedException)
-            {
-                // Should we not send? or should we ignore the setting.
-                _logger.LogWarning("User did not allow Email Contact.");
-                _telemetryService.TrackEmailBlocked(source);
-            }
             catch (UserNotFoundException)
             {
                 _logger.LogWarning("User was not found. They may have already been deleted.");
@@ -112,8 +117,8 @@ public async Task<bool> HandleAsync(AccountDeleteMessage command)
             }
             catch (Exception e)
             {
-                _logger.LogError(0, e, "An unknown exception occured: {ExceptionMessage}");
-                throw e;
+                _logger.LogError(e, "An unknown exception occurred.");
+                throw;
             }
 
             return messageProcessed;

src/AccountDeleter/AccountDeleteMessageHandler.cs

@@ -64,7 +64,6 @@
     <Compile Include="Evaluators\IUserEvaluatorFactory.cs" />
     <Compile Include="Evaluators\UserEvaluatorComparer.cs" />
     <Compile Include="Evaluators\UserEvaluatorFactory.cs" />
-    <Compile Include="Exceptions\EmailContactNotAllowedException.cs" />
     <Compile Include="Exceptions\UnknownEvaluatorException.cs" />
     <Compile Include="Exceptions\UnknownSourceException.cs" />
     <Compile Include="Exceptions\UserNotFoundException.cs" />
@@ -107,7 +106,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Common.Job">
-      <Version>4.3.0-dev-3555917</Version>
+      <Version>4.3.0-dev-3612825</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/AccountDeleter/AccountDeleter.csproj

@@ -112,5 +112,6 @@ public string SiteRoot
         public int? MaxWorkerThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public int? MinIoThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public int? MaxIoThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public string InternalMicrosoftTenantKey { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
     }
 }

src/AccountDeleter/Configuration/GalleryConfiguration.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using System;
 
 namespace NuGetGallery.AccountDeleter

src/AccountDeleter/Exceptions/EmailContactNotAllowedException.cs

@@ -17,6 +17,7 @@ public class AccountDeleteTelemetryService : IAccountDeleteTelemetryService, ISu
         private const string EmailBlockedEventName = TelemetryPrefix + "EmailBlocked";
         private const string UnknownSourceEventName = TelemetryPrefix + "UnknownSource";
         private const string UserNotFoundEventName = TelemetryPrefix + "UserNotFound";
+        private const string UnconfirmedUserEventName = TelemetryPrefix + "UnconfirmedUser";
 
         private const string CallGuidDimensionName = "CallGuid";
         private const string ContactAllowedDimensionName = "ContactAllowed";
@@ -130,5 +131,14 @@ public void TrackMessageLockLost<TMessage>(Guid callGuid)
                     { CallGuidDimensionName, callGuid.ToString() }
                    });
         }
+
+        public void TrackUnconfirmedUser(string source)
+        {
+            _telemetryClient.TrackEvent(UnconfirmedUserEventName,
+                new Dictionary<string, string>
+                {
+                    { SourceDimensionName, source }
+                });
+        }
     }
 }