License file package - License info should appear only after validation job and redirect to correct Url. (#6738)

* Redirect license file

* only show alert for license file type

* Add indentation

* Refactor and add tests

Author: zhhyu

src/NuGetGallery/UrlHelperExtensions.cs

@@ -1267,6 +1267,20 @@ public static string ContactOwners(this UrlHelper url, string id, string version
                 });
         }
 
+        public static string License(this UrlHelper url, string id, string version, bool relativeUrl = true)
+        {
+            return GetActionLink(
+                url,
+                "License",
+                "Packages",
+                relativeUrl,
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id },
+                    { "version", version }
+                });
+        }
+
         public static string Terms(this UrlHelper url, bool relativeUrl = true)
         {
             if (!String.IsNullOrEmpty(_configuration.Current.ExternalTermsOfUseUrl))

src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs

@@ -7,7 +7,6 @@
 using NuGet.Services.Entities;
 using NuGet.Services.Validation.Issues;
 using NuGet.Versioning;
-using NuGetGallery.Helpers;
 
 namespace NuGetGallery
 {
@@ -62,12 +61,10 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB
                 ProjectUrl = projectUrl;
             }
 
-            var licenseExpression = package.LicenseExpression;
-            if (!string.IsNullOrWhiteSpace(licenseExpression))
-            {
-                LicenseUrl = LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(licenseExpression);
-            }
-            else if (PackageHelper.TryPrepareUrlForRendering(package.LicenseUrl, out string licenseUrl))
+            EmbeddedLicenseType = package.EmbeddedLicenseType;
+            LicenseExpression = package.LicenseExpression;
+
+            if (PackageHelper.TryPrepareUrlForRendering(package.LicenseUrl, out string licenseUrl))
             {
                 LicenseUrl = licenseUrl;
 
@@ -132,6 +129,8 @@ public bool HasNewerRelease
         public string ProjectUrl { get; set; }
         public string LicenseUrl { get; set; }
         public IEnumerable<string> LicenseNames { get; set; }
+        public string LicenseExpression { get; set; }
+        public EmbeddedLicenseFileType EmbeddedLicenseType { get; set; }
 
         private IDictionary<User, string> _pushedByCache = new Dictionary<User, string>();
 

src/NuGetGallery/Views/Packages/DisplayPackage.cshtml

@@ -13,6 +13,16 @@
 
     PackageManagerViewModel[] packageManagers;
 
+    if (!string.IsNullOrWhiteSpace(Model.LicenseExpression))
+    {
+        Model.LicenseUrl = LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(Model.LicenseExpression);
+    }
+
+    if (Model.EmbeddedLicenseType != EmbeddedLicenseFileType.Absent)
+    {
+        Model.LicenseUrl = Url.License(Model.Id, Model.Version);
+    }
+
     if (Model.IsDotnetToolPackageType)
     {
         packageManagers = new PackageManagerViewModel[]
@@ -182,6 +192,14 @@
                         validation and indexing may take up to an hour. <a href="https://aka.ms/NuGetPackageValidation">Read more</a>.
                     </text>
                 )
+                if (Model.EmbeddedLicenseType != EmbeddedLicenseFileType.Absent)
+                {
+                    @ViewHelpers.AlertWarning(
+                        @<text>
+                            The license link will become available once package validation has completed successfully.
+                        </text>
+                    )
+                }
 
                 if (Model.ValidatingTooLong)
                 {
@@ -618,19 +636,23 @@
                 }
                 @if (!Model.Deleted && Model.LicenseUrl != null)
                 {
-                    <li>
-                        <i class="ms-Icon ms-Icon--Certificate" aria-hidden="true"></i>
-                        <a href="@Model.LicenseUrl" data-track="outbound-license-url" title="Make sure you agree with the license" rel="nofollow">
-                            @if (Model.LicenseNames.AnySafe())
-                            {
-                                @(string.Join(", ", Model.LicenseNames.Select(x => x + " License")))
-                            }
-                            else
-                            {
-                                @:License Info
-                            }
-                        </a>
-                    </li>
+                    if (Model.EmbeddedLicenseType == EmbeddedLicenseFileType.Absent || !Model.Validating)
+                    {
+                        <li>
+                            <i class="ms-Icon ms-Icon--Certificate" aria-hidden="true"></i>
+                            <a href="@Model.LicenseUrl"
+                               data-track="outbound-license-url" title="Make sure you agree with the license" rel="nofollow">
+                                @if (Model.LicenseNames.AnySafe())
+                                {
+                                    @(string.Join(", ", Model.LicenseNames.Select(x => x + " License")))
+                                }
+                                else
+                                {
+                                    @:License Info
+                                }
+                            </a>
+                        </li>
+                    }
                 }
                 <li>
                     <i class="ms-Icon ms-Icon--Mail" aria-hidden="true"></i>

tests/NuGetGallery.Facts/UrlHelperExtensionsFacts.cs

@@ -72,6 +72,30 @@ public void ReturnsCorrectRouteLink(string siteRoot, bool relativeUrl, string ex
             }
         }
 
+        public class TheLicenseMethod
+            : TestContainer
+        {
+            [Theory]
+            [InlineData("https://nuget.org", "TestPackageId", "1.0.0", "/packages/TestPackageId/1.0.0/License", true)]
+            [InlineData("https://nuget.org", "TestPackageId", "1.0.0", "https://nuget.org/packages/TestPackageId/1.0.0/License", false)]
+            [InlineData("https://localhost:66", "AnotherTestPackageId", "3.0.0", "/packages/AnotherTestPackageId/3.0.0/License", true)]
+            [InlineData("https://localhost:66", "AnotherTestPackageId", "3.0.0", "https://localhost:66/packages/AnotherTestPackageId/3.0.0/License", false)]
+            public void ReturnsCorrectLicenseLink(string siteRoot, string packageId, string packageVersion, string expectedUrl, bool relativeUrl)
+            {
+                // Arrange
+                var configurationService = GetConfigurationService();
+                configurationService.Current.SiteRoot = siteRoot;
+
+                var urlHelper = TestUtility.MockUrlHelper(siteRoot);
+
+                // Act
+                var result = urlHelper.License(packageId, packageVersion, relativeUrl);
+
+                // Assert
+                Assert.Equal(expectedUrl, result);
+            }
+        }
+
         public class ThePackageRegistrationTemplateHelperMethod
             : TestContainer
         {