diff --git a/src/NuGetGallery/Views/Authentication/_SignIn.cshtml b/src/NuGetGallery/Views/Authentication/_SignIn.cshtml
index 6ceb4af8f4..2094ff074b 100644
--- a/src/NuGetGallery/Views/Authentication/_SignIn.cshtml
+++ b/src/NuGetGallery/Views/Authentication/_SignIn.cshtml
@@ -56,7 +56,7 @@
- if (Model.External == null || !Model.External.FoundExistingUser)
+ if (!this.Config.Current.DeprecateNuGetPasswordLogins && (Model.External == null || !Model.External.FoundExistingUser))
{
Don't have an account? Register
diff --git a/src/NuGetGallery/Views/Authentication/_SigninAssistance.cshtml b/src/NuGetGallery/Views/Authentication/_SigninAssistance.cshtml
new file mode 100644
index 0000000000..4a87517ef0
--- /dev/null
+++ b/src/NuGetGallery/Views/Authentication/_SigninAssistance.cshtml
@@ -0,0 +1,66 @@
+
+
+ Sign-in assistance
+
+
+
+
+
+
+ Forgot the Microsoft account you used to sign-in?
+
+
+
+ @ViewHelpers.AjaxAntiForgeryToken(Html)
+ @using (Html.BeginForm())
+ {
+
+
+
+ Thanks for providing the details. We have sent the sign-in account details to the email address linked to your account:
+
+
+
+
+
+ Close
+
+
+
+ }
+
+
+
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/NuGetViewBase.cs b/src/NuGetGallery/Views/NuGetViewBase.cs
index 131a744441..8c24c92adb 100644
--- a/src/NuGetGallery/Views/NuGetViewBase.cs
+++ b/src/NuGetGallery/Views/NuGetViewBase.cs
@@ -29,6 +29,8 @@ public User CurrentUser
get { return NuGetContext.CurrentUser; }
}
+ public Lazy
ContentObjectService => new Lazy(() => DependencyResolver.Current.GetService());
+
public CookieConsentMessage CookieConsentMessage
{
get { return _cookieConsentMessage.Value; }
@@ -82,6 +84,8 @@ public User CurrentUser
get { return NuGetContext.CurrentUser; }
}
+ public Lazy ContentObjectService => new Lazy(() => DependencyResolver.Current.GetService());
+
public CookieConsentMessage CookieConsentMessage
{
get { return _cookieConsentMessage.Value; }
diff --git a/src/NuGetGallery/Views/Organizations/Add.cshtml b/src/NuGetGallery/Views/Organizations/Add.cshtml
new file mode 100644
index 0000000000..82cb13714e
--- /dev/null
+++ b/src/NuGetGallery/Views/Organizations/Add.cshtml
@@ -0,0 +1,70 @@
+@model AddOrganizationViewModel
+@{
+ ViewBag.Title = "Add Organization";
+ ViewBag.MdPageColumns = Constants.ColumnsFormMd;
+ Layout = "~/Views/Shared/Gallery/Layout.cshtml";
+
+ var gravatarId = "gravatar-image";
+ var emailBoxGroupId = "email-box-group";
+}
+
+
+
+
+
+
+ Organizations allow you to manage and publish packages as a team or a group.
+
+
+
+ @Html.Label("Logo")
+
+
+
+ @using (Html.BeginForm("Add", "Organizations", FormMethod.Post))
+ {
+ @Html.AntiForgeryToken()
+
+
+ @Html.ShowLabelFor(m => m.OrganizationName)
+ @Html.ShowTextBoxFor(m => m.OrganizationName)
+ @Html.ShowValidationMessagesFor(m => m.OrganizationName)
+ This will be your organization account on @Url.User("your_name_here", relativeUrl: false).
+
+
+
+ @Html.ShowLabelFor(m => m.OrganizationEmailAddress)
+ @Html.ShowTextBoxFor(m => m.OrganizationEmailAddress)
+ @Html.ShowValidationMessagesFor(m => m.OrganizationEmailAddress)
+ Users can contact you at this email address.
+
+
+
+ }
+
+
+
+
+
+@section BottomScripts {
+
+ @Scripts.Render("~/Scripts/gallery/page-add-organization.min.js")
+}
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml b/src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml
index e9a060ff17..69e5f299eb 100644
--- a/src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml
+++ b/src/NuGetGallery/Views/Organizations/_OrganizationAccountManageMembers.cshtml
@@ -22,33 +22,31 @@
}
diff --git a/src/NuGetGallery/Views/Pages/_TransformOrLink.cshtml b/src/NuGetGallery/Views/Pages/_TransformOrLink.cshtml
index d629cacb1f..44c1a58c6e 100644
--- a/src/NuGetGallery/Views/Pages/_TransformOrLink.cshtml
+++ b/src/NuGetGallery/Views/Pages/_TransformOrLink.cshtml
@@ -1,4 +1,6 @@
-
+@model GalleryHomeViewModel
+
+
Sign-in with Microsoft corporate account
@@ -12,23 +14,30 @@
NuGet.org authentication is deprecated
-
-
If this is a team (DL) based account, you must transform it to an organization on NuGet.org:
-
+ @if (Model.TransformIntoOrganization)
+ {
+
We have determined this is a team (DL) based account, so you must transform it to an organization on NuGet.org:
+
+ }
+ else
+ {
+
We have determined this is an account owned by an individual, so you must link it to a Microsoft account:
+
+ }
@if (Model.SuccessfulConfirmation)
{
-
@(Model.ConfirmingNewAccount ? "Account" : "Email") Confirmed
+
@(Model.ConfirmingNewAccount ? (Model.IsOrganization ? "Organization" : "Account") : "Email") Confirmed
}
else
{
@@ -25,7 +25,7 @@
@if (Model.SuccessfulConfirmation)
{
- Your email address has been verified@(Model.ConfirmingNewAccount ? " and your account is confirmed" : "").
+ Your@(Model.IsOrganization ? " organization's" : "") email address has been verified@(Model.ConfirmingNewAccount ? " and your " + (Model.IsOrganization ? "organization" : "account") + " is confirmed" : "").
}
else
diff --git a/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml b/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
index e7ae6737f8..07b05d3644 100644
--- a/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
+++ b/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
@@ -118,7 +118,8 @@
Account Settings API Keys
- @if (CurrentUser.Organizations.Any())
+ @if (CurrentUser.Organizations.Any() ||
+ ContentObjectService.Value.LoginDiscontinuationConfiguration.AreOrganizationsSupportedForUser(CurrentUser))
{
Manage Organizations
}
diff --git a/src/NuGetGallery/Views/Users/Account.cshtml b/src/NuGetGallery/Views/Users/Account.cshtml
index 84faf7baed..d8db587fe9 100644
--- a/src/NuGetGallery/Views/Users/Account.cshtml
+++ b/src/NuGetGallery/Views/Users/Account.cshtml
@@ -47,6 +47,6 @@
@section bottomScripts {
- @ViewHelpers.SectionsScript(this);
+ @ViewHelpers.SectionsScript(this)
@Scripts.Render("~/Scripts/gallery/page-account.min.js")
}
diff --git a/src/NuGetGallery/Views/Users/ForgotPassword.cshtml b/src/NuGetGallery/Views/Users/ForgotPassword.cshtml
index d67d7c7445..69d84bfcc0 100644
--- a/src/NuGetGallery/Views/Users/ForgotPassword.cshtml
+++ b/src/NuGetGallery/Views/Users/ForgotPassword.cshtml
@@ -7,9 +7,13 @@
}
-
- @ViewHelpers.AlertPasswordDeprecation()
-
+ @if (this.Config.Current.DeprecateNuGetPasswordLogins)
+ {
+
+ @ViewHelpers.AlertPasswordDeprecation()
+
+ }
+
Forgot Password
@@ -26,6 +30,9 @@
@Html.ShowTextBoxFor(m => m.Email)
@Html.ShowValidationMessagesFor(m => m.Email)
+
+ @Html.ShowValidationMessagesForEmpty()
+
diff --git a/src/NuGetGallery/Views/Users/Organizations.cshtml b/src/NuGetGallery/Views/Users/Organizations.cshtml
index 2f63c3a112..54ef93505e 100644
--- a/src/NuGetGallery/Views/Users/Organizations.cshtml
+++ b/src/NuGetGallery/Views/Users/Organizations.cshtml
@@ -4,16 +4,28 @@
Layout = "~/Views/Shared/Gallery/Layout.cshtml";
}
-
+
-
Organizations
+
+
+
Organizations
+ @if (Model.Organizations.Any())
+ {
+
+ }
+
+
@if (Model.Organizations.Any())
{
var orgCount = Model.Organizations.Count();
var orgCountString = orgCount > 1 ? orgCount + " organizations" : orgCount + " organization";
-
You have @(orgCountString).
+
+
You have @(orgCountString).
+
@@ -58,7 +70,19 @@
}
else
{
- You do not have any organizations.
+
+
+
+
Organizations allow you to manage and publish packages as a team or a group.
+
+
+
}
diff --git a/src/NuGetGallery/Views/Users/Packages.cshtml b/src/NuGetGallery/Views/Users/Packages.cshtml
index c70befc131..206d47aab2 100644
--- a/src/NuGetGallery/Views/Users/Packages.cshtml
+++ b/src/NuGetGallery/Views/Users/Packages.cshtml
@@ -4,16 +4,12 @@
ViewBag.Title = "Manage My Package";
ViewBag.Tab = "Packages";
Layout = "~/Views/Shared/Gallery/Layout.cshtml";
-
- var namespacesCount = Model.ReservedNamespaces.ReservedNamespaces.Count();
- var ownerRequestsReceivedCount = Model.OwnerRequests.Received.RequestItems.Count();
- var ownerRequestsSentCount = Model.OwnerRequests.Sent.RequestItems.Count();
}
-
+
Manage Packages
@@ -44,36 +40,49 @@
, expanded: false)
- @if (namespacesCount > 0)
+ @if (Model.ReservedNamespaces.ReservedNamespaces.Any())
{
@ViewHelpers.Section(this, "namespaces",
@
Reserved Namespaces ,
- @
@Html.Raw(namespacesCount + " namespace" + (namespacesCount == 1 ? "" : "s")) ,
@
- @Html.Partial("_ReservedNamespacesList", Model.ReservedNamespaces)
+ ,
+ @
+
, expanded: false)
}
- @if (Model.OwnerRequests.Received.RequestItems.Any())
+ @if (Model.OwnerRequests.Received.Requests.Any())
{
@ViewHelpers.Section(this, "requests-received",
@
Ownership Requests (Received) ,
- @
@Html.Raw(ownerRequestsReceivedCount + " request" + (ownerRequestsReceivedCount == 1 ? "" : "s")) ,
@
- @Html.Partial("_OwnerRequestsList", Model.OwnerRequests.Received)
+ ,
+ @
+
, expanded: false)
}
- @if (Model.OwnerRequests.Sent.RequestItems.Any())
+ @if (Model.OwnerRequests.Sent.Requests.Any())
{
@ViewHelpers.Section(this, "requests-sent",
@
Ownership Requests (Sent) ,
- @
@Html.Raw(ownerRequestsSentCount + " request" + (ownerRequestsSentCount == 1 ? "" : "s")) ,
@
- @Html.Partial("_OwnerRequestsList", Model.OwnerRequests.Sent)
+ ,
+ @
+
, expanded: false)
}
+
+
+
+
+
@functions {
+ // Performance: RouteCollection.VirtualPath is expensive, so resolve the path once and save as a template.
+ // Then substitute route values into the template path when rendering links for each package on the page.
private RouteUrlTemplate
userUrlTemplate;
+
private RouteUrlTemplate packageUrlTemplate;
private RouteUrlTemplate editUrlTemplate;
private RouteUrlTemplate manageOwnersUrlTemplate;
private RouteUrlTemplate deleteUrlTemplate;
+ private RouteUrlTemplate searchUrlTemplate;
+
+ private RouteUrlTemplate confirmUrlTemplate;
+ private RouteUrlTemplate rejectUrlTemplate;
+ private RouteUrlTemplate cancelUrlTemplate;
+
dynamic GetSerializablePackage(ListPackageItemViewModel p)
{
- if (deleteUrlTemplate == null)
+ if (packageUrlTemplate == null)
{
- // Performance: RouteCollection.VirtualPath is expensive, so resolve the path once and save as a template.
- // Then substitute route values into the template path when rendering links for each package on the page.
- userUrlTemplate = Url.UserTemplate();
packageUrlTemplate = Url.PackageRegistrationTemplate();
+ }
+
+ if (editUrlTemplate == null)
+ {
editUrlTemplate = Url.EditPackageTemplate();
+ }
+
+ if (manageOwnersUrlTemplate == null)
+ {
manageOwnersUrlTemplate = Url.ManagePackageOwnersTemplate();
+ }
+
+ if (deleteUrlTemplate == null)
+ {
deleteUrlTemplate = Url.DeletePackageTemplate();
}
return new
{
p.Id,
- Owners = p.Owners.Select(o => new
- {
- o.Username,
- ProfileUrl = userUrlTemplate.Resolve(o),
- IsOrganization = o is Organization
- }),
+ Owners = GetSerializableOwners(p.Owners),
p.TotalDownloadCount,
LatestVersion = p.FullVersion.Abbreviate(25),
PackageIconUrl = PackageHelper.ShouldRenderUrl(p.IconUrl) ? p.IconUrl : null,
@@ -184,6 +300,80 @@
CanDelete = p.CanUnlistOrRelist
};
}
+
+ dynamic GetSerializableNamespace(ReservedNamespaceListItemViewModel n)
+ {
+ if (searchUrlTemplate == null)
+ {
+ searchUrlTemplate = Url.SearchTemplate();
+ }
+
+ return new
+ {
+ Pattern = n.GetPattern(),
+ SearchUrl = searchUrlTemplate.Resolve(n.Value),
+ Owners = GetSerializableOwners(n.Owners),
+ n.IsPublic
+ };
+ }
+
+ dynamic GetSerializableOwnerRequest(OwnerRequestsListItemViewModel r)
+ {
+ if (packageUrlTemplate == null)
+ {
+ packageUrlTemplate = Url.PackageRegistrationTemplate();
+ }
+
+ if (confirmUrlTemplate == null)
+ {
+ confirmUrlTemplate = Url.ConfirmPendingOwnershipRequestTemplate();
+ }
+
+ if (rejectUrlTemplate == null)
+ {
+ rejectUrlTemplate = Url.RejectPendingOwnershipRequestTemplate();
+ }
+
+ if (cancelUrlTemplate == null)
+ {
+ cancelUrlTemplate = Url.CancelPendingOwnershipRequestTemplate();
+ }
+
+ return new
+ {
+ r.Request.PackageRegistration.Id,
+ PackageIconUrl = PackageHelper.ShouldRenderUrl(r.Package.IconUrl) ? r.Package.IconUrl : null,
+ PackageUrl = packageUrlTemplate.Resolve(r.Package),
+ Owners = GetSerializableOwners(r.Package.Owners),
+ Requesting = GetSerializableOwner(r.Request.RequestingOwner),
+ New = GetSerializableOwner(r.Request.NewOwner),
+ CanAccept = r.CanAccept,
+ CanCancel = r.CanCancel,
+ ConfirmUrl = confirmUrlTemplate.Resolve(r),
+ RejectUrl = rejectUrlTemplate.Resolve(r),
+ CancelUrl = cancelUrlTemplate.Resolve(r)
+ };
+ }
+
+ dynamic GetSerializableOwners(IEnumerable owners)
+ {
+ return owners.Select(o => GetSerializableOwner(o));
+ }
+
+ dynamic GetSerializableOwner(User user)
+ {
+ if (userUrlTemplate == null)
+ {
+ userUrlTemplate = Url.UserTemplate();
+ }
+
+ return new
+ {
+ user.Username,
+ ProfileUrl = userUrlTemplate.Resolve(user),
+ IsOrganization = user is Organization
+ };
+ }
}
@section BottomScripts {
@@ -195,6 +385,12 @@
.Select(p => GetSerializablePackage(p)),
UnlistedPackages = Model.UnlistedPackages
.Select(p => GetSerializablePackage(p)),
+ ReservedNamespaces = Model.ReservedNamespaces.ReservedNamespaces
+ .Select(n => GetSerializableNamespace(n)),
+ RequestsReceived = Model.OwnerRequests.Received.Requests
+ .Select(r => GetSerializableOwnerRequest(r)),
+ RequestsSent = Model.OwnerRequests.Sent.Requests
+ .Select(r => GetSerializableOwnerRequest(r)),
DefaultPackageIconUrl = Url.Absolute("~/Content/gallery/img/default-package-icon.svg"),
PackageIconUrlFallback = Url.Absolute("~/Content/gallery/img/default-package-icon-256x256.png")
}));
diff --git a/src/NuGetGallery/Views/Users/Transform.cshtml b/src/NuGetGallery/Views/Users/Transform.cshtml
index f5fd1a5bec..4bbd569551 100644
--- a/src/NuGetGallery/Views/Users/Transform.cshtml
+++ b/src/NuGetGallery/Views/Users/Transform.cshtml
@@ -9,7 +9,7 @@
var transformConfirmation = "You have added '{0}' as an administrator. " + transformNote;
}
-
+
-
-
- @Html.Label("Logo")
- @ViewHelpers.GravatarImage(CurrentUser.EmailAddress, CurrentUser.Username, Constants.GravatarImageSizeLarge, responsive: true)
-
+ @using (Html.BeginForm("Transform", "Users", FormMethod.Post, new { id = "transform"}))
+ {
+ @Html.AntiForgeryToken()
-
-
-
-
- @using (Html.BeginForm("Transform", "Users", FormMethod.Post, new { id = "transform"}))
- {
- @Html.AntiForgeryToken()
-
-
+
diff --git a/src/NuGetGallery/Views/Users/_OwnerRequestsList.cshtml b/src/NuGetGallery/Views/Users/_OwnerRequestsList.cshtml
deleted file mode 100644
index 0bbf806709..0000000000
--- a/src/NuGetGallery/Views/Users/_OwnerRequestsList.cshtml
+++ /dev/null
@@ -1,66 +0,0 @@
-@model OwnerRequestsListViewModel
-@{
- var requestsString = "request" + (Model.RequestItems.Count() != 1 ? "s" : "");
-}
-
-
-
-
-
- You have @Model.RequestItems.Count().ToNuGetNumberString() @Model.Name.ToLowerInvariant() @requestsString
-
-
-
-
-
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/Users/_ReservedNamespacesList.cshtml b/src/NuGetGallery/Views/Users/_ReservedNamespacesList.cshtml
deleted file mode 100644
index ea7dc4ee33..0000000000
--- a/src/NuGetGallery/Views/Users/_ReservedNamespacesList.cshtml
+++ /dev/null
@@ -1,50 +0,0 @@
-@model ReservedNamespaceListViewModel
-
-
-
-
-
-
-
-
- Package ID or Prefix
- Owners
- Upload Restrictions
-
-
-
- @foreach (var reservedNamespace in @Model.ReservedNamespaces)
- {
-
-
-
-
- @reservedNamespace.GetPattern()
-
-
- @foreach (var owner in reservedNamespace.Owners)
- {
- @owner.Username
- }
-
- @if (reservedNamespace.IsPublic)
- {
- Any NuGet.org Account
- }
- else
- {
- Prefix or ID Owners Only
- }
-
- }
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/NuGetGallery/Web.config b/src/NuGetGallery/Web.config
index ebd677c464..9560f184d6 100644
--- a/src/NuGetGallery/Web.config
+++ b/src/NuGetGallery/Web.config
@@ -40,6 +40,8 @@
+
+
diff --git a/tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs b/tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs
index 5bdca379d8..84f2cbebcd 100644
--- a/tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs
+++ b/tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs
@@ -23,7 +23,9 @@ public static void CanReadBasicMetadataProperties()
var nuspec = nupkg.GetNuspecReader();
// Act
- var packageMetadata = PackageMetadata.FromNuspecReader(nuspec);
+ var packageMetadata = PackageMetadata.FromNuspecReader(
+ nuspec,
+ strict: true);
// Assert
Assert.Equal("TestPackage", packageMetadata.Id);
@@ -47,7 +49,39 @@ public static void ThrowsPackagingExceptionWhenInvalidDepencencyVersionRangeDete
var nuspec = nupkg.GetNuspecReader();
// Act & Assert
- Assert.Throws
(() => PackageMetadata.FromNuspecReader(nuspec));
+ Assert.Throws(() => PackageMetadata.FromNuspecReader(
+ nuspec,
+ strict: true));
+ }
+
+ [Fact]
+ public static void DoesNotThrowInvalidDepencencyVersionRangeDetectedAndParsingIsNotStrict()
+ {
+ var packageStream = CreateTestPackageStreamWithInvalidDependencyVersion();
+ var nupkg = new PackageArchiveReader(packageStream, leaveStreamOpen: false);
+ var nuspec = nupkg.GetNuspecReader();
+
+ // Act
+ var packageMetadata = PackageMetadata.FromNuspecReader(
+ nuspec,
+ strict: false);
+
+ // Assert
+ Assert.Equal("TestPackage", packageMetadata.Id);
+ Assert.Equal(NuGetVersion.Parse("0.0.0.1"), packageMetadata.Version);
+ Assert.Equal("Package A", packageMetadata.Title);
+ Assert.Equal(2, packageMetadata.Authors.Count);
+ Assert.Equal("ownera, ownerb", packageMetadata.Owners);
+ Assert.False(packageMetadata.RequireLicenseAcceptance);
+ Assert.Equal("package A description.", packageMetadata.Description);
+ Assert.Equal("en-US", packageMetadata.Language);
+ Assert.Equal("http://www.nuget.org/", packageMetadata.ProjectUrl.ToString());
+ Assert.Equal("http://www.nuget.org/", packageMetadata.IconUrl.ToString());
+ Assert.Equal("http://www.nuget.org/", packageMetadata.LicenseUrl.ToString());
+ var dependencyGroup = Assert.Single(packageMetadata.GetDependencyGroups());
+ var dependency = Assert.Single(dependencyGroup.Packages);
+ Assert.Equal("SampleDependency", dependency.Id);
+ Assert.Equal(VersionRange.All, dependency.VersionRange);
}
private static Stream CreateTestPackageStream()
diff --git a/tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs b/tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs
index d2529020b0..c75fbb2a92 100644
--- a/tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs
+++ b/tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceFacts.cs
@@ -625,5 +625,317 @@ private static Tuple, Mock, Uri> Setup(
return Tuple.Create(fakeBlobClient, fakeBlob, blobUri);
}
}
+
+ public class TheCopyFileAsyncMethod
+ {
+ private string _srcFolderName;
+ private string _srcFileName;
+ private string _srcETag;
+ private BlobProperties _srcProperties;
+ private string _destFolderName;
+ private string _destFileName;
+ private string _destETag;
+ private BlobProperties _destProperties;
+ private CopyState _destCopyState;
+ private Mock _blobClient;
+ private Mock _srcContainer;
+ private Mock _destContainer;
+ private Mock _srcBlobMock;
+ private Mock _destBlobMock;
+ private CloudBlobCoreFileStorageService _target;
+
+ public TheCopyFileAsyncMethod()
+ {
+ _srcFolderName = "validation";
+ _srcFileName = "4b6f16cc-7acd-45eb-ac21-33f0d927ec14/nuget.versioning.4.5.0.nupkg";
+ _srcETag = "\"src-etag\"";
+ _srcProperties = new BlobProperties();
+ _destFolderName = "packages";
+ _destFileName = "nuget.versioning.4.5.0.nupkg";
+ _destETag = "\"dest-etag\"";
+ _destProperties = new BlobProperties();
+ _destCopyState = new CopyState();
+ SetDestCopyStatus(CopyStatus.Success);
+
+ _blobClient = new Mock();
+ _srcContainer = new Mock();
+ _destContainer = new Mock();
+ _srcBlobMock = new Mock();
+ _destBlobMock = new Mock();
+ _blobClient
+ .Setup(x => x.GetContainerReference(_srcFolderName))
+ .Returns(() => _srcContainer.Object);
+ _blobClient
+ .Setup(x => x.GetContainerReference(_destFolderName))
+ .Returns(() => _destContainer.Object);
+ _srcContainer
+ .Setup(x => x.GetBlobReference(_srcFileName))
+ .Returns(() => _srcBlobMock.Object);
+ _destContainer
+ .Setup(x => x.GetBlobReference(_destFileName))
+ .Returns(() => _destBlobMock.Object);
+ _srcBlobMock
+ .Setup(x => x.Name)
+ .Returns(() => _srcFileName);
+ _srcBlobMock
+ .Setup(x => x.ETag)
+ .Returns(() => _srcETag);
+ _srcBlobMock
+ .Setup(x => x.Properties)
+ .Returns(() => _srcProperties);
+ _destBlobMock
+ .Setup(x => x.ETag)
+ .Returns(() => _destETag);
+ _destBlobMock
+ .Setup(x => x.Properties)
+ .Returns(() => _destProperties);
+ _destBlobMock
+ .Setup(x => x.CopyState)
+ .Returns(() => _destCopyState);
+
+ _target = CreateService(fakeBlobClient: _blobClient);
+ }
+
+ [Fact]
+ public async Task WillCopyTheFileIfDestinationDoesNotExist()
+ {
+ // Arrange
+ AccessCondition srcAccessCondition = null;
+ AccessCondition destAccessCondition = null;
+ ISimpleCloudBlob srcBlob = null;
+
+ _destBlobMock
+ .Setup(x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()))
+ .Returns(Task.FromResult(0))
+ .Callback((b, s, d) =>
+ {
+ srcBlob = b;
+ srcAccessCondition = s;
+ destAccessCondition = d;
+ });
+
+ // Act
+ await _target.CopyFileAsync(
+ _srcFolderName,
+ _srcFileName,
+ _destFolderName,
+ _destFileName,
+ AccessConditionWrapper.GenerateIfNotExistsCondition());
+
+ // Assert
+ _destBlobMock.Verify(
+ x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()),
+ Times.Once);
+ Assert.Equal(_srcFileName, srcBlob.Name);
+ Assert.Equal(_srcETag, srcAccessCondition.IfMatchETag);
+ Assert.Equal("*", destAccessCondition.IfNoneMatchETag);
+ }
+
+ [Fact]
+ public async Task WillThrowInvalidOperationExceptionForConflict()
+ {
+ // Arrange
+ _destBlobMock
+ .Setup(x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()))
+ .Throws(new StorageException(new RequestResult { HttpStatusCode = (int)HttpStatusCode.Conflict }, "Conflict!", inner: null));
+
+ // Act & Assert
+ await Assert.ThrowsAsync(
+ () => _target.CopyFileAsync(
+ _srcFolderName,
+ _srcFileName,
+ _destFolderName,
+ _destFileName,
+ AccessConditionWrapper.GenerateIfNotExistsCondition()));
+ }
+
+ [Fact]
+ public async Task WillCopyTheFileIfDestinationHasFailedCopy()
+ {
+ // Arrange
+ AccessCondition srcAccessCondition = null;
+ AccessCondition destAccessCondition = null;
+ ISimpleCloudBlob srcBlob = null;
+
+ SetDestCopyStatus(CopyStatus.Failed);
+
+ _destBlobMock
+ .Setup(x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()))
+ .Returns(Task.FromResult(0))
+ .Callback((b, s, d) =>
+ {
+ srcBlob = b;
+ srcAccessCondition = s;
+ destAccessCondition = d;
+ SetDestCopyStatus(CopyStatus.Pending);
+ });
+
+ _destBlobMock
+ .Setup(x => x.ExistsAsync())
+ .ReturnsAsync(true);
+
+ _destBlobMock
+ .Setup(x => x.FetchAttributesAsync())
+ .Returns(Task.FromResult(0))
+ .Callback(() => SetDestCopyStatus(CopyStatus.Success));
+
+ // Act
+ var srcETag = await _target.CopyFileAsync(
+ _srcFolderName,
+ _srcFileName,
+ _destFolderName,
+ _destFileName,
+ AccessConditionWrapper.GenerateIfNotExistsCondition());
+
+ // Assert
+ _destBlobMock.Verify(
+ x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()),
+ Times.Once);
+ Assert.Equal(_srcETag, srcETag);
+ Assert.Equal(_srcFileName, srcBlob.Name);
+ Assert.Equal(_srcETag, srcAccessCondition.IfMatchETag);
+ Assert.Equal(_destETag, destAccessCondition.IfMatchETag);
+ }
+
+ [Fact]
+ public async Task WillDefaultToIfNotExists()
+ {
+ // Arrange
+ AccessCondition srcAccessCondition = null;
+ AccessCondition destAccessCondition = null;
+ ISimpleCloudBlob srcBlob = null;
+ _destBlobMock
+ .Setup(x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()))
+ .Returns(Task.FromResult(0))
+ .Callback((b, s, d) =>
+ {
+ srcBlob = b;
+ srcAccessCondition = s;
+ destAccessCondition = d;
+ SetDestCopyStatus(CopyStatus.Success);
+ });
+
+ // Act
+ await _target.CopyFileAsync(
+ _srcFolderName,
+ _srcFileName,
+ _destFolderName,
+ _destFileName,
+ destAccessCondition: null);
+
+ // Assert
+ _destBlobMock.Verify(
+ x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()),
+ Times.Once);
+ Assert.Null(destAccessCondition.IfMatchETag);
+ Assert.Equal("*", destAccessCondition.IfNoneMatchETag);
+ }
+
+ [Fact]
+ public async Task UsesProvidedMatchETag()
+ {
+ // Arrange
+ AccessCondition srcAccessCondition = null;
+ AccessCondition destAccessCondition = null;
+ ISimpleCloudBlob srcBlob = null;
+ _destBlobMock
+ .Setup(x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()))
+ .Returns(Task.FromResult(0))
+ .Callback((b, s, d) =>
+ {
+ srcBlob = b;
+ srcAccessCondition = s;
+ destAccessCondition = d;
+ SetDestCopyStatus(CopyStatus.Success);
+ });
+
+ // Act
+ await _target.CopyFileAsync(
+ _srcFolderName,
+ _srcFileName,
+ _destFolderName,
+ _destFileName,
+ AccessConditionWrapper.GenerateIfMatchCondition("etag!"));
+
+ // Assert
+ _destBlobMock.Verify(
+ x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()),
+ Times.Once);
+ Assert.NotEqual("etag!", destAccessCondition.IfMatchETag);
+ Assert.Null(destAccessCondition.IfNoneMatchETag);
+ }
+
+ [Fact]
+ public async Task NoOpsIfPackageLengthAndHashMatch()
+ {
+ // Arrange
+ SetBlobContentMD5(_srcProperties, "mwgwUC0MwohHxgMmvQzO7A==");
+ SetBlobLength(_srcProperties, 42);
+ SetBlobContentMD5(_destProperties, _srcProperties.ContentMD5);
+ SetBlobLength(_destProperties, _srcProperties.Length);
+
+ _destBlobMock
+ .Setup(x => x.ExistsAsync())
+ .ReturnsAsync(true);
+
+ // Act
+ await _target.CopyFileAsync(
+ _srcFolderName,
+ _srcFileName,
+ _destFolderName,
+ _destFileName,
+ AccessConditionWrapper.GenerateIfNotExistsCondition());
+
+ // Assert
+ _destBlobMock.Verify(
+ x => x.StartCopyAsync(It.IsAny(), It.IsAny(), It.IsAny()),
+ Times.Never);
+ }
+
+ [Fact]
+ public async Task ThrowsIfCopyOperationFails()
+ {
+ // Arrange
+ _destBlobMock
+ .Setup(x => x.StartCopyAsync(It.IsAny
+ 
-