Skip to content

Commit 0146ed3

Browse files
author
Scott Bommarito
authored
Merge pull request #6612 from NuGet/sb-ccownersdev
Hotfixes (do not CC sender for contact owners) to dev
2 parents 7e155f7 + e93c1b1 commit 0146ed3

9 files changed

Lines changed: 39 additions & 53 deletions

File tree

‎src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<SignPath>..\..\build</SignPath>
9191
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
9292
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
93+
<SignType Condition="'$(SignType)' == ''">none</SignType>
9394
</PropertyGroup>
9495
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
9596
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />

‎src/NuGetGallery.Core/NuGetGallery.Core.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@
203203
</ItemGroup>
204204
<ItemGroup>
205205
<PackageReference Include="NuGet.Services.Entities">
206-
<Version>2.30.0</Version>
206+
<Version>2.31.0</Version>
207207
</PackageReference>
208208
<PackageReference Include="NuGet.Services.Messaging">
209-
<Version>2.30.0</Version>
209+
<Version>2.31.0</Version>
210210
</PackageReference>
211211
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
212212
<Version>1.2.0</Version>
@@ -242,10 +242,10 @@
242242
<Version>4.8.0</Version>
243243
</PackageReference>
244244
<PackageReference Include="NuGet.Services.Validation">
245-
<Version>2.30.0</Version>
245+
<Version>2.31.0</Version>
246246
</PackageReference>
247247
<PackageReference Include="NuGet.Services.Validation.Issues">
248-
<Version>2.30.0</Version>
248+
<Version>2.31.0</Version>
249249
</PackageReference>
250250
<PackageReference Include="WindowsAzure.Storage">
251251
<Version>7.1.2</Version>
@@ -257,6 +257,7 @@
257257
<SignPath>..\..\build</SignPath>
258258
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
259259
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
260+
<SignType Condition="'$(SignType)' == ''">none</SignType>
260261
</PropertyGroup>
261262
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
262263
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />

‎src/NuGetGallery/Controllers/PackagesController.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,8 +1138,7 @@ public virtual async Task<ActionResult> ContactOwners(string id, string version,
11381138
package,
11391139
Url.Package(package, false),
11401140
HttpUtility.HtmlEncode(contactForm.Message),
1141-
Url.AccountSettings(relativeUrl: false),
1142-
contactForm.CopySender);
1141+
Url.AccountSettings(relativeUrl: false));
11431142

11441143
await _messageService.SendMessageAsync(contactOwnersMessage, contactForm.CopySender, discloseSenderAddress: false);
11451144

‎src/NuGetGallery/Infrastructure/Mail/BackgroundMarkdownMessageService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public BackgroundMarkdownMessageService(
3030
private Func<BackgroundMarkdownMessageService> _messageServiceFactory;
3131
private bool _sentMessage;
3232

33-
protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool copySender = false, bool discloseSenderAddress = false)
33+
protected override Task SendMessageInternalAsync(MailMessage mailMessage)
3434
{
3535
// Some MVC controller actions send more than one message. Since this method sends
3636
// the message async, we need a new IMessageService per email, to avoid calling
@@ -39,7 +39,7 @@ protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool c
3939
if (_sentMessage)
4040
{
4141
var newMessageService = _messageServiceFactory.Invoke();
42-
return newMessageService.SendMessageInternalAsync(mailMessage, copySender, discloseSenderAddress);
42+
return newMessageService.SendMessageInternalAsync(mailMessage);
4343
}
4444
else
4545
{
@@ -55,7 +55,7 @@ protected override Task SendMessageInternalAsync(MailMessage mailMessage, bool c
5555
{
5656
try
5757
{
58-
await base.SendMessageInternalAsync(messageCopy, copySender, discloseSenderAddress);
58+
await base.SendMessageInternalAsync(messageCopy);
5959
}
6060
catch (Exception ex)
6161
{

‎src/NuGetGallery/Infrastructure/Mail/Messages/ContactOwnersMessage.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,21 @@ public ContactOwnersMessage(
1919
Package package,
2020
string packageUrl,
2121
string htmlEncodedMessage,
22-
string emailSettingsUrl,
23-
bool copySender)
22+
string emailSettingsUrl)
2423
{
2524
_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
2625
FromAddress = fromAddress ?? throw new ArgumentNullException(nameof(fromAddress));
2726
Package = package ?? throw new ArgumentNullException(nameof(package));
2827
PackageUrl = packageUrl ?? throw new ArgumentNullException(nameof(packageUrl));
2928
HtmlEncodedMessage = htmlEncodedMessage ?? throw new ArgumentNullException(nameof(htmlEncodedMessage));
3029
EmailSettingsUrl = emailSettingsUrl ?? throw new ArgumentNullException(nameof(emailSettingsUrl));
31-
CopySender = copySender;
3230
}
3331

3432
public MailAddress FromAddress { get; }
3533
public Package Package { get; }
3634
public string PackageUrl { get; }
3735
public string HtmlEncodedMessage { get; }
3836
public string EmailSettingsUrl { get; }
39-
public bool CopySender { get; }
4037

4138
public override MailAddress Sender => _configuration.GalleryOwner;
4239

@@ -48,7 +45,6 @@ public override IEmailRecipients GetRecipients()
4845

4946
return new EmailRecipients(
5047
to,
51-
cc: CopySender ? new[] { FromAddress } : null,
5248
replyTo: new[] { FromAddress });
5349
}
5450

‎src/NuGetGallery/NuGetGallery.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,13 +1981,13 @@
19811981
<Version>0.15.4</Version>
19821982
</PackageReference>
19831983
<PackageReference Include="NuGet.Services.Entities">
1984-
<Version>2.30.0</Version>
1984+
<Version>2.31.0</Version>
19851985
</PackageReference>
19861986
<PackageReference Include="NuGet.Services.Messaging">
1987-
<Version>2.30.0</Version>
1987+
<Version>2.31.0</Version>
19881988
</PackageReference>
19891989
<PackageReference Include="NuGet.Services.Messaging.Email">
1990-
<Version>2.30.0</Version>
1990+
<Version>2.31.0</Version>
19911991
</PackageReference>
19921992
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
19931993
<Version>1.2.0</Version>
@@ -2214,16 +2214,16 @@
22142214
<Version>4.8.0</Version>
22152215
</PackageReference>
22162216
<PackageReference Include="NuGet.Services.KeyVault">
2217-
<Version>2.30.0</Version>
2217+
<Version>2.31.0</Version>
22182218
</PackageReference>
22192219
<PackageReference Include="NuGet.Services.Logging">
2220-
<Version>2.30.0</Version>
2220+
<Version>2.31.0</Version>
22212221
</PackageReference>
22222222
<PackageReference Include="NuGet.Services.Owin">
2223-
<Version>2.30.0</Version>
2223+
<Version>2.31.0</Version>
22242224
</PackageReference>
22252225
<PackageReference Include="NuGet.Services.Sql">
2226-
<Version>2.30.0</Version>
2226+
<Version>2.31.0</Version>
22272227
</PackageReference>
22282228
<PackageReference Include="Owin">
22292229
<Version>1.0.0</Version>
@@ -2280,6 +2280,7 @@
22802280
<SignPath>..\..\build</SignPath>
22812281
<SignPath Condition="'$(BUILD_SOURCESDIRECTORY)' != ''">$(BUILD_SOURCESDIRECTORY)\build</SignPath>
22822282
<SignPath Condition="'$(NuGetBuildPath)' != ''">$(NuGetBuildPath)</SignPath>
2283+
<SignType Condition="'$(SignType)' == ''">none</SignType>
22832284
</PropertyGroup>
22842285
<Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
22852286
<Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />

‎src/NuGetGallery/Views/Users/Thanks.cshtml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
<div class="@ViewHelpers.GetColumnClasses(ViewBag)">
1515
<p class="ms-fontSize-xl">Welcome @CurrentUser.Username! Now that you have a NuGet.org account, let's get you started!</p>
1616

17-
<p>Make sure your email is verified. <a href="@Url.ConfirmationRequired()">Confirm your account</a></p>
17+
@if (!CurrentUser.Confirmed)
18+
{
19+
<p>Make sure your email is verified. <a href="@Url.ConfirmationRequired()">Confirm your account</a></p>
20+
}
1821

1922
<p>Want to update your account? <a href="@Url.AccountSettings()">View Account Settings</a></p>
2023

‎tests/NuGetGallery.Facts/Infrastructure/Mail/Messages/ContactOwnersMessageFacts.cs‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public void GivenANullArgument_ItShouldThrow(
4545
package,
4646
packageUrl,
4747
message,
48-
emailSettingsUrl,
49-
copySender));
48+
emailSettingsUrl));
5049
}
5150
}
5251

@@ -74,19 +73,9 @@ public void AddsFromAddressToReplyToList()
7473
}
7574

7675
[Fact]
77-
public void AddsFromAddressToCCListWhenCopyingSender()
76+
public void DoesNotAddFromAddressToCCList()
7877
{
79-
var message = CreateMessage(copySender: true);
80-
var recipients = message.GetRecipients();
81-
82-
Assert.Equal(1, recipients.CC.Count);
83-
Assert.Contains(Fakes.FromAddress, recipients.CC);
84-
}
85-
86-
[Fact]
87-
public void DoesNotAddFromAddressToCCListWhenNotCopyingSender()
88-
{
89-
var message = CreateMessage(copySender: false);
78+
var message = CreateMessage();
9079
var recipients = message.GetRecipients();
9180

9281
Assert.Empty(recipients.CC);
@@ -125,16 +114,15 @@ public void SetsGalleryOwnerAsSender()
125114
Assert.Equal(Configuration.GalleryOwner, message.Sender);
126115
}
127116

128-
private static ContactOwnersMessage CreateMessage(bool copySender = false)
117+
private static ContactOwnersMessage CreateMessage()
129118
{
130119
return new ContactOwnersMessage(
131120
Configuration,
132121
Fakes.FromAddress,
133122
Fakes.Package,
134123
Fakes.PackageUrl,
135124
"user input",
136-
Fakes.EmailSettingsUrl,
137-
copySender);
125+
Fakes.EmailSettingsUrl);
138126
}
139127

140128
private const string _expectedMarkdownBody =

‎tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public class TheSendContactOwnersMessageMethod
235235
: TestContainer
236236
{
237237
[Fact]
238-
public async Task WillCopySenderIfAsked()
238+
public async Task WillSendCopyToSenderIfAsked()
239239
{
240240
// arrange
241241
var packageId = "smangit";
@@ -269,8 +269,7 @@ public async Task WillCopySenderIfAsked()
269269
package,
270270
"http://someurl/",
271271
"Test message",
272-
"http://someotherurl/",
273-
copySender: true);
272+
"http://someotherurl/");
274273

275274
// act
276275
await messageService.SendMessageAsync(contactOwnersMessage, copySender: true, discloseSenderAddress: false);
@@ -287,6 +286,8 @@ public async Task WillCopySenderIfAsked()
287286
Assert.Equal(TestGalleryOwner, messages[1].From);
288287
Assert.Equal(fromAddress, messages[0].ReplyToList.Single().Address);
289288
Assert.Equal(fromAddress, messages[1].ReplyToList.Single().Address);
289+
Assert.Empty(messages[0].CC);
290+
Assert.Empty(messages[1].CC);
290291
}
291292

292293
[Fact]
@@ -322,11 +323,10 @@ public async Task WillSendEmailToAllOwners()
322323
package,
323324
"http://packageUrl/",
324325
"Test message",
325-
"http://emailSettingsUrl/",
326-
copySender: false);
326+
"http://emailSettingsUrl/");
327327

328328
await messageService.SendMessageAsync(contactOwnersMessage);
329-
var message = messageService.MockMailSender.Sent.Last();
329+
var message = messageService.MockMailSender.Sent.Single();
330330

331331
Assert.Equal(owner1Email, message.To[0].Address);
332332
Assert.Equal(owner2Email, message.To[1].Address);
@@ -374,11 +374,10 @@ public async Task WillNotSendEmailToOwnerThatOptsOut()
374374
package,
375375
"http://someurl/",
376376
"Test message",
377-
"http://someotherurl/",
378-
copySender: false);
377+
"http://someotherurl/");
379378

380379
await messageService.SendMessageAsync(contactOwnersMessage);
381-
var message = messageService.MockMailSender.Sent.Last();
380+
var message = messageService.MockMailSender.Sent.Single();
382381

383382
// assert
384383
Assert.Equal(ownerAddress, message.To[0].Address);
@@ -420,8 +419,7 @@ public async Task WillNotAttemptToSendIfNoOwnersAllow()
420419
package,
421420
"http://someurl/",
422421
"Test message",
423-
"http://someotherurl/",
424-
copySender: false);
422+
"http://someotherurl/");
425423

426424
await messageService.SendMessageAsync(contactOwnersMessage);
427425

@@ -430,7 +428,7 @@ public async Task WillNotAttemptToSendIfNoOwnersAllow()
430428
}
431429

432430
[Fact]
433-
public async Task WillNotCopySenderIfNoOwnersAllow()
431+
public async Task WillNotSendCopyToSenderIfNoOwnersAllow()
434432
{
435433
// arrange
436434
var packageId = "smangit";
@@ -463,8 +461,7 @@ public async Task WillNotCopySenderIfNoOwnersAllow()
463461
package,
464462
"http://someurl/",
465463
"Test message",
466-
"http://someotherurl/",
467-
copySender: false);
464+
"http://someotherurl/");
468465
await messageService.SendMessageAsync(contactOwnersMessage);
469466

470467
// assert

0 commit comments

Comments
 (0)