Upload license expression redirect url logic (#6641)

* Upload license expression redirect url logic * fix nit and update
NuGet · Nov 9, 2018 · 6cb7f30 · 6cb7f30
1 parent 51ca9a7
commit 6cb7f30
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/NuGetGallery/Helpers/LicenseExpressionRedirectUrlHelper.cs b/src/NuGetGallery/Helpers/LicenseExpressionRedirectUrlHelper.cs
@@ -0,0 +1,17 @@
+// 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.Helpers
+{
+    public static class LicenseExpressionRedirectUrlHelper
+    {
+        private const string LicenseExpressionDeprecationUrlFormat = "https://licenses.nuget.org/{0}";
+
+        public static string GetLicenseExpressionRedirectUrl(string licenseExpression)
+        {
+            return new Uri(string.Format(LicenseExpressionDeprecationUrlFormat, licenseExpression)).AbsoluteUri;
+        }
+    }
+}
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
@@ -284,6 +284,7 @@
     <Compile Include="GalleryConstants.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Helpers\GravatarHelper.cs" />
+    <Compile Include="Helpers\LicenseExpressionRedirectUrlHelper.cs" />
     <Compile Include="Helpers\ObfuscationHelper.cs" />
     <Compile Include="Helpers\TextHelper.cs" />
     <Compile Include="Helpers\ZipArchiveHelpers.cs" />

diff --git a/src/NuGetGallery/Services/PackageUploadService.cs b/src/NuGetGallery/Services/PackageUploadService.cs
@@ -22,8 +22,6 @@ namespace NuGetGallery
 {
     public class PackageUploadService : IPackageUploadService
     {
-        private const string LicenseExpressionDeprecationUrlFormat = "https://licenses.nuget.org/{0}";
-
         private static readonly IReadOnlyCollection<string> AllowedLicenseFileExtensions = new HashSet<string>
         {
             "",
@@ -374,7 +372,7 @@ private static string GetExpectedLicenseUrl(LicenseMetadata licenseMetadata)
 
             if (LicenseType.Expression == licenseMetadata.Type)
             {
-                return new Uri(string.Format(LicenseExpressionDeprecationUrlFormat, licenseMetadata.License)).AbsoluteUri;
+                return LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(licenseMetadata.License);
             }
 
             throw new InvalidOperationException($"Unsupported license metadata type: {licenseMetadata.Type}");

diff --git a/src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs b/src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs
@@ -7,6 +7,7 @@
 using NuGet.Services.Entities;
 using NuGet.Services.Validation.Issues;
 using NuGet.Versioning;
+using NuGetGallery.Helpers;
 
 namespace NuGetGallery
 {
@@ -63,7 +64,12 @@ public DisplayPackageViewModel(Package package, User currentUser, string pushedB
                 ProjectUrl = projectUrl;
             }
 
-            if (PackageHelper.TryPrepareUrlForRendering(package.LicenseUrl, out string licenseUrl))
+            var licenseExpression = package.LicenseExpression;
+            if (!String.IsNullOrWhiteSpace(licenseExpression))
+            {
+                LicenseUrl = LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(licenseExpression);
+            }
+            else if (PackageHelper.TryPrepareUrlForRendering(package.LicenseUrl, out string licenseUrl))
             {
                 LicenseUrl = licenseUrl;