Merge pull request #4928 from NuGet/dev

[ReleasePrep][2017.10.30]RI of dev into master

build.ps1

@@ -7,6 +7,7 @@ param (
     [switch]$CleanCache,
     [string]$SimpleVersion = '1.0.0',
     [string]$SemanticVersion = '1.0.0-zlocal',
+    [string]$PackageSuffix,
     [string]$Branch,
     [string]$CommitSHA,
     [string]$BuildBranch = '37ff6e758c38b3f513af39f881399ce85f4ff20b'
@@ -84,12 +85,13 @@ Invoke-BuildStep 'Building solution' {
         Build-Solution $Configuration $BuildNumber -MSBuildVersion "15" $SolutionPath -SkipRestore:$SkipRestore -MSBuildProperties "/p:MvcBuildViews=true" `
     } `
     -ev +BuildErrors
-
-Invoke-BuildStep 'Creating artifacts' {
-        New-Package (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion `
-        -ev +BuildErrors
-    }
 
+Invoke-BuildStep 'Creating artifacts' {
+        $packageId = 'NuGetGallery.Core'+$PackageSuffix 
+		New-Package (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId $packageId `
+		-ev +BuildErrors
+	}
+
 Trace-Log ('-' * 60)
 
 ## Calculating Build time

src/Bootstrap/less/theme/base.less

@@ -272,6 +272,11 @@ img.package-icon {
   margin-right: auto;
 }
 
+img.reserved-indicator-icon {
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .package-list {
   margin-top: 8px;
   margin-bottom: 8px;

src/Bootstrap/less/theme/common-user-package-list.less

@@ -5,6 +5,11 @@
       min-width: 20px;
     }
 
+    .reserved-indicator-icon {
+      max-height: 2em;
+      min-width: 20px;
+    }
+
     .align-middle {
       vertical-align: middle;
     }
@@ -13,6 +18,10 @@
       .break-word;
     }
 
+    .reserved-id {
+      .break-word;
+    }
+
     .package-controls {
       @media (min-width: @screen-sm-min) {
         white-space: nowrap;

src/NuGetGallery.Core/Auditing/AuditedAuthenticatedOperationAction.cs

@@ -19,5 +19,10 @@ public enum AuditedAuthenticatedOperationAction
         /// Login failed, user exists but password is invalid
         /// </summary>
         FailedLoginInvalidPassword,
+
+        /// <summary>
+        /// Login failed, user is an organization and should not have credentials.
+        /// </summary>
+        FailedLoginUserIsOrganization
     }
 }

src/NuGetGallery.Core/Auditing/AuditedPackageAction.cs

@@ -1,6 +1,8 @@
 // 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.Auditing
 {
     public enum AuditedPackageAction
@@ -11,6 +13,7 @@ public enum AuditedPackageAction
         List,
         Unlist,
         Edit,
+        [Obsolete("Undo package edit functionality is being retired.")]
         UndoEdit,
         Verify
     }

src/NuGetGallery.Core/Entities/EntitiesContext.cs

@@ -41,10 +41,14 @@ public EntitiesContext(string connectionString, bool readOnly)
         public IDbSet<PackageRegistration> PackageRegistrations { get; set; }
         public IDbSet<Credential> Credentials { get; set; }
         public IDbSet<Scope> Scopes { get; set; }
-        public IDbSet<User> Users { get; set; }
         public IDbSet<UserSecurityPolicy> UserSecurityPolicies { get; set; }
         public IDbSet<ReservedNamespace> ReservedNamespaces { get; set; }
 
+        /// <summary>
+        /// User or organization accounts.
+        /// </summary>
+        public IDbSet<User> Users { get; set; }
+
         IDbSet<T> IEntitiesContext.Set<T>()
         {
             return base.Set<T>();
@@ -119,6 +123,24 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                            .MapLeftKey("UserKey")
                            .MapRightKey("RoleKey"));
 
+            modelBuilder.Entity<Organization>()
+                .ToTable("Organizations");
+
+            modelBuilder.Entity<Membership>()
+                .HasKey(m => new { m.OrganizationKey, m.MemberKey });
+
+            modelBuilder.Entity<User>()
+                .HasMany(u => u.Organizations)
+                .WithRequired(m => m.Member)
+                .HasForeignKey(m => m.MemberKey)
+                .WillCascadeOnDelete(true); // Membership will be deleted with the Member account.
+
+            modelBuilder.Entity<Organization>()
+                .HasMany(o => o.Members)
+                .WithRequired(m => m.Organization)
+                .HasForeignKey(m => m.OrganizationKey)
+                .WillCascadeOnDelete(true); // Memberships will be deleted with the Organization account.
+
             modelBuilder.Entity<Role>()
                 .HasKey(u => u.Key);
 

src/NuGetGallery.Core/Entities/Membership.cs

@@ -0,0 +1,45 @@
+// 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.
+
+namespace NuGetGallery
+{
+    /// <summary>
+    /// Tracks membership of a User account in an Organization account.
+    /// </summary>
+    public class Membership
+    {
+        /// <summary>
+        /// Organization foreign key.
+        /// </summary>
+        public int OrganizationKey { get; set; }
+
+        /// <summary>
+        /// The <see cref="Organization"/> that contains members.
+        /// </summary>
+        public virtual Organization Organization { get; set; }
+
+        /// <summary>
+        /// Member (User) foreign key.
+        /// </summary>
+        public int MemberKey { get; set; }
+
+        /// <summary>
+        /// The <see cref="User"/> that is a member of the <see cref="Organization"/>.
+        /// 
+        /// Note that there is no database contraint preventing memberships of Organizations into other
+        /// Organizations. For now this is restricted by the Gallery, but could be considered in the
+        /// future if we want to support Organization teams.
+        /// </summary>
+        public virtual User Member { get; set; }
+
+        /// <summary>
+        /// Whether the <see cref="Member"/> is an administrator for the <see cref="Organization"/>.
+        /// 
+        /// Administrators have the following capabilities that collaborators don't:
+        /// - Organization management (e.g., settings, membership)
+        /// - Package owner management
+        /// - Pushing new package registrations
+        /// </summary>
+        public bool IsAdmin { get; set; }
+    }
+}

src/NuGetGallery.Core/Entities/Organization.cs

@@ -0,0 +1,31 @@
+// 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.Collections.Generic;
+
+namespace NuGetGallery
+{
+    /// <summary>
+    /// Organization <see cref="NuGetGallery.User" /> account, based on TPT hierarchy.
+    /// 
+    /// With the addition of organizations, the users table effectively becomes an account table. Organizations accounts
+    /// are child types created using TPT inheritance. User accounts are not child types, but this could be done in the
+    /// future if we want to add constraints for user accounts or user-only settings.
+    /// </summary>
+    /// <see href="https://weblogs.asp.net/manavi/inheritance-mapping-strategies-with-entity-framework-code-first-ctp5-part-2-table-per-type-tpt" />
+    public class Organization : User
+    {
+        public Organization() : base()
+        {
+        }
+
+        public Organization(string name) : base(name)
+        {
+        }
+
+        /// <summary>
+        /// Organization Memberships to this organization.
+        /// </summary>
+        public virtual ICollection<Membership> Members { get; set; }
+    }
+}

src/NuGetGallery.Core/Entities/User.cs

@@ -9,6 +9,12 @@
 
 namespace NuGetGallery
 {
+    /// <summary>
+    /// With the addition of organizations, the users table effectively becomes an account table. Organizations accounts
+    /// are child types created using TPT inheritance. User accounts are not child types, but this could be done in the
+    /// future if we want to add constraints for user accounts or user-only settings.
+    /// </summary>
+    /// <see href="https://weblogs.asp.net/manavi/inheritance-mapping-strategies-with-entity-framework-code-first-ctp5-part-2-table-per-type-tpt" />
     public class User : IEntity
     {
         public User() : this(null)
@@ -24,6 +30,11 @@ public User(string username)
             Username = username;
         }
 
+        /// <summary>
+        /// Organization memberships for a non-organization <see cref="User"/> account.
+        /// </summary>
+        public virtual ICollection<Membership> Organizations { get; set; }
+
         [StringLength(256)]
         public string EmailAddress { get; set; }
 

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -157,6 +157,8 @@
     <Compile Include="Entities\Credential.cs" />
     <Compile Include="Entities\CuratedFeed.cs" />
     <Compile Include="Entities\CuratedPackage.cs" />
+    <Compile Include="Entities\Membership.cs" />
+    <Compile Include="Entities\Organization.cs" />
     <Compile Include="Entities\PackageDelete.cs" />
     <Compile Include="Entities\EmailMessage.cs" />
     <Compile Include="Entities\EntitiesConfiguration.cs" />

src/NuGetGallery.Core/NuGetGallery.Core.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>$id$</id>
+    <id>$PackageId$</id>
     <version>$version$</version>
     <title>$title$</title>
     <authors>$author$</authors>

src/NuGetGallery.Core/Services/CorePackageFileService.cs

@@ -34,6 +34,18 @@ public Task<Stream> DownloadPackageFileAsync(Package package)
             return _fileStorageService.GetFileAsync(CoreConstants.PackagesFolderName, fileName);
         }
 
+        public Task<Uri> GetPackageReadUriAsync(Package package)
+        {
+            var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);
+            return _fileStorageService.GetFileReadUriAsync(CoreConstants.PackagesFolderName, fileName, endOfAccess: null);
+        }
+
+        public Task<bool> DoesPackageFileExistAsync(Package package)
+        {
+            var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);
+            return _fileStorageService.FileExistsAsync(CoreConstants.PackagesFolderName, fileName);
+        }
+
         public Task SaveValidationPackageFileAsync(Package package, Stream packageFile)
         {
             if (packageFile == null)
@@ -110,6 +122,12 @@ public Task<Uri> GetValidationPackageReadUriAsync(Package package, DateTimeOffse
             return _fileStorageService.GetFileReadUriAsync(CoreConstants.ValidationFolderName, fileName, endOfAccess);
         }
 
+        public Task<bool> DoesValidationPackageFileExistAsync(Package package)
+        {
+            var fileName = BuildFileName(package, CoreConstants.PackageFileSavePathTemplate, CoreConstants.NuGetPackageFileExtension);
+            return _fileStorageService.FileExistsAsync(CoreConstants.ValidationFolderName, fileName);
+        }
+
         protected static string BuildFileName(Package package, string format, string extension)
         {
             if (package == null)

src/NuGetGallery.Core/Services/ICorePackageFileService.cs

@@ -19,6 +19,24 @@ public interface ICorePackageFileService
         /// </summary>
         Task<Stream> DownloadPackageFileAsync(Package package);
 
+        /// <summary>
+        /// Generates the URL for the specified package in the public container for available packages.
+        /// </summary>
+        /// <param name="package">The package metadata.</param>
+        /// <returns>Package download URL</returns>
+        /// <remarks>
+        /// The returned URL is only intended to be used by the internal tooling and not for the user:
+        /// it might not make any sense to external users as it can be, for example, a file:/// URL.
+        /// </remarks>
+        Task<Uri> GetPackageReadUriAsync(Package package);
+
+        /// <summary>
+        /// Checks whether package file exists in the public container for available packages
+        /// </summary>
+        /// <param name="">The package metadata</param>
+        /// <returns>True if file exists, false otherwise</returns>
+        Task<bool> DoesPackageFileExistAsync(Package package);
+
         /// <summary>
         /// Saves the contents of the package to the private container for packages that are being validated. If the
         /// file already exists, an exception will be thrown.
@@ -42,6 +60,13 @@ public interface ICorePackageFileService
         /// <returns>Time limited (if implementation supports) URI for the validation package</returns>
         Task<Uri> GetValidationPackageReadUriAsync(Package package, DateTimeOffset endOfAccess);
 
+        /// <summary>
+        /// Checks whether package file exists in the private validation container
+        /// </summary>
+        /// <param name="">The package metadata</param>
+        /// <returns>True if file exists, false otherwise</returns>
+        Task<bool> DoesValidationPackageFileExistAsync(Package package);
+
         /// <summary>
         /// Deletes the validating package from the file storage. If the file does not exist this method will not throw
         /// any exception.

src/NuGetGallery/App_Start/AppActivator.cs

@@ -206,7 +206,8 @@ private static void BundlingPostStart()
             BundleTable.Bundles.Add(homeScriptBundle);
 
             var displayPackageScriptBundle = new ScriptBundle("~/Scripts/gallery/page-display-package.min.js")
-                .Include("~/Scripts/gallery/page-display-package.js");
+                .Include("~/Scripts/gallery/page-display-package.js")
+                .Include("~/Scripts/gallery/clamp.js");
             BundleTable.Bundles.Add(displayPackageScriptBundle);
 
             var managePackagesScriptBundle = new ScriptBundle("~/Scripts/gallery/page-manage-packages.min.js")