author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
455,739 | 11.06.2019 14:14:20 | 25,200 | a0e738f3670a14d0653047c49aba04b78f19fa17 | [GH Usage] Changed to ReadOnly collections | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -9,9 +9,9 @@ namespace NuGetGallery\n{\npublic class GitHubUsageConfiguration : IGitHubUsageConfiguration\n{\n- private readonly Dictionary<string, NuGetPackageGitHubInformation> _nuGetPackagesGitHubDependencies;\n+ private readonly IReadOnlyDictionary<string, NuGetPackageGitHubInformation> _nuGetPackagesGitHubDependencies;\n- public GitHubUsageConfiguration(IReadOnlyList<RepositoryInformation> repositories)\n+ public GitHubUsageConfiguration(IReadOnlyCollection<RepositoryInformation> repositories)\n{\nif (repositories == null)\n{\n@@ -36,7 +36,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nreturn NuGetPackageGitHubInformation.Empty;\n}\n- private static Dictionary<string, NuGetPackageGitHubInformation> GetNuGetPackagesDependents(IReadOnlyList<RepositoryInformation> repositories)\n+ private static IReadOnlyDictionary<string, NuGetPackageGitHubInformation> GetNuGetPackagesDependents(IReadOnlyCollection<RepositoryInformation> repositories)\n{\nvar dependentsPerPackage = new Dictionary<string, List<RepositoryInformation>>(StringComparer.InvariantCultureIgnoreCase);\nforeach (var repo in repositories)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"new_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"diff": "@@ -49,7 +49,7 @@ public async Task Refresh()\nawait Refresh<TyposquattingConfiguration>(ServicesConstants.ContentNames.TyposquattingConfiguration) ??\nnew TyposquattingConfiguration();\n- var reposCache = await Refresh<IReadOnlyList<RepositoryInformation>>(ServicesConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\n+ var reposCache = await Refresh<IReadOnlyCollection<RepositoryInformation>>(ServicesConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\nArray.Empty<RepositoryInformation>();\nGitHubUsageConfiguration = new GitHubUsageConfiguration(reposCache);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Changed to ReadOnly collections |
455,739 | 11.06.2019 14:17:44 | 25,200 | b24d6ca63bedb7e3fde669b1d43acd494db4d878 | [GH Usage] Changed the StringComparer value | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -38,7 +38,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nprivate static IReadOnlyDictionary<string, NuGetPackageGitHubInformation> GetNuGetPackagesDependents(IReadOnlyCollection<RepositoryInformation> repositories)\n{\n- var dependentsPerPackage = new Dictionary<string, List<RepositoryInformation>>(StringComparer.InvariantCultureIgnoreCase);\n+ var dependentsPerPackage = new Dictionary<string, List<RepositoryInformation>>(StringComparer.OrdinalIgnoreCase);\nforeach (var repo in repositories)\n{\nforeach (var dependency in repo.Dependencies)\n@@ -59,7 +59,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nentry => new NuGetPackageGitHubInformation(\nentry.Value.Count,\nentry.Value),\n- StringComparer.InvariantCultureIgnoreCase);\n+ StringComparer.OrdinalIgnoreCase);\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Changed the StringComparer value |
455,739 | 11.06.2019 14:21:14 | 25,200 | 5ce72e422bd23ec160ec36c9c77ad57ed41c3bf3 | [GH Usage] Added contextual information about the result of a func call | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/IGitHubUsageConfiguration.cs",
"diff": "@@ -6,14 +6,15 @@ namespace NuGetGallery\npublic interface IGitHubUsageConfiguration\n{\n/// <summary>\n- /// Returns a NuGetPackageGitHubInformation object that contains the information about a NuGet package.\n+ /// Returns the GitHub dependants information about a NuGet package.\n+ ///\n/// If a packageId has no information, the NuGetPackageGitHubInformation's TotalRepos will be 0\n/// and the Repos list will be empty\n///\n/// </summary>\n/// <exception cref=\"System.ArgumentNullException\">Thrown when packageId is null</exception>\n/// <param name=\"packageId\">NuGet package id, cannot be null</param>\n- /// <returns></returns>\n+ /// <returns>NuGetPackageGitHubInformation that contains the information about a NuGet package.</returns>\nNuGetPackageGitHubInformation GetPackageInformation(string packageId);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Added contextual information about the result of a func call |
455,739 | 11.06.2019 14:24:26 | 25,200 | 7e1a96cd4906a9aad44636fa17bdf1ef7e4c0b23 | [GH Usage] Removed redundant parameter | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"new_path": "src/NuGetGallery.Core/GitHub/GitHubUsageConfiguration.cs",
"diff": "@@ -56,9 +56,7 @@ public NuGetPackageGitHubInformation GetPackageInformation(string packageId)\nreturn dependentsPerPackage\n.ToDictionary(\nentry => entry.Key,\n- entry => new NuGetPackageGitHubInformation(\n- entry.Value.Count,\n- entry.Value),\n+ entry => new NuGetPackageGitHubInformation(entry.Value),\nStringComparer.OrdinalIgnoreCase);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -11,26 +11,19 @@ public class NuGetPackageGitHubInformation\n{\npublic const int ReposPerPackage = 10;\n- public readonly static NuGetPackageGitHubInformation Empty = new NuGetPackageGitHubInformation(\n- 0,\n- new List<RepositoryInformation>());\n+ public readonly static NuGetPackageGitHubInformation Empty = new NuGetPackageGitHubInformation(new List<RepositoryInformation>());\n- public NuGetPackageGitHubInformation(int totalRepos, IReadOnlyList<RepositoryInformation> repos)\n+ public NuGetPackageGitHubInformation(IReadOnlyList<RepositoryInformation> repos)\n{\n- if (totalRepos < 0)\n- {\n- throw new IndexOutOfRangeException(string.Format(\"{0} cannot have a negative value!\", nameof(totalRepos)));\n- }\n-\nif( repos == null)\n{\nthrow new ArgumentNullException(nameof(repos));\n}\n- TotalRepos = totalRepos;\n+ TotalRepos = repos.Count;\nRepos = repos\n.OrderByDescending(x => x.Stars)\n- .ThenBy(x => x.Id)\n+ .ThenBy(x => x.Id, StringComparer.OrdinalIgnoreCase)\n.Take(ReposPerPackage)\n.ToList();\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Removed redundant parameter |
455,739 | 11.06.2019 14:27:51 | 25,200 | a0ef8104791471494ffa5ac04bc6cf1f404adda8 | [GH Usage] Changed IReadOnlyList to IReadOnlyCollection | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"new_path": "src/NuGetGallery.Core/GitHub/NuGetPackageGitHubInformation.cs",
"diff": "@@ -13,7 +13,7 @@ public class NuGetPackageGitHubInformation\npublic readonly static NuGetPackageGitHubInformation Empty = new NuGetPackageGitHubInformation(new List<RepositoryInformation>());\n- public NuGetPackageGitHubInformation(IReadOnlyList<RepositoryInformation> repos)\n+ public NuGetPackageGitHubInformation(IReadOnlyCollection<RepositoryInformation> repos)\n{\nif( repos == null)\n{\n@@ -29,6 +29,6 @@ public NuGetPackageGitHubInformation(IReadOnlyList<RepositoryInformation> repos)\n}\npublic int TotalRepos { get; }\n- public IReadOnlyList<RepositoryInformation> Repos { get; }\n+ public IReadOnlyCollection<RepositoryInformation> Repos { get; }\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Changed IReadOnlyList to IReadOnlyCollection |
455,739 | 11.06.2019 14:29:44 | 25,200 | 5a0764eb2e260fbd4fd6a6d2b92b86b431476b60 | [GH Usage] Fix inconsistent code layout | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"new_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"diff": "@@ -49,7 +49,8 @@ public async Task Refresh()\nawait Refresh<TyposquattingConfiguration>(ServicesConstants.ContentNames.TyposquattingConfiguration) ??\nnew TyposquattingConfiguration();\n- var reposCache = await Refresh<IReadOnlyCollection<RepositoryInformation>>(ServicesConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\n+ var reposCache =\n+ await Refresh<IReadOnlyCollection<RepositoryInformation>>(ServicesConstants.ContentNames.NuGetPackagesGitHubDependencies) ??\nArray.Empty<RepositoryInformation>();\nGitHubUsageConfiguration = new GitHubUsageConfiguration(reposCache);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fix inconsistent code layout |
455,739 | 11.06.2019 16:22:31 | 25,200 | 8435d3f8b517c3c209663d5de3773153439002fe | [GH Usage] The Model isn't modified when the feature flag is off | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -752,9 +752,11 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\nmodel.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\n- model.IsGitHubUsageEnabled = _featureFlagService.IsGitHubUsageEnabled(currentUser);\n+ if(model.IsGitHubUsageEnabled = _featureFlagService.IsGitHubUsageEnabled(currentUser))\n+ {\nmodel.GitHubDependenciesInformation = _contentObjectService.GitHubUsageConfiguration.GetPackageInformation(id);\n+ }\nmodel.ReadMeHtml = await _readMeService.GetReadMeHtmlAsync(package);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] The Model isn't modified when the feature flag is off |
455,739 | 11.06.2019 16:39:12 | 25,200 | 09dc4b37ff492a804ddba70f042ded0650d38447 | [GH Usage] Changed GenRepo to CreateRepo | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"diff": "@@ -10,7 +10,7 @@ namespace NuGetGallery\n{\npublic class GitHubUsageConfigurationFacts\n{\n- private static RepositoryInformation GenRepo(string id, int stars = 100, params string[] nugetDependencies)\n+ private static RepositoryInformation CreateRepo(string id, int stars = 100, params string[] nugetDependencies)\n{\nreturn new RepositoryInformation(\nid,\n@@ -52,7 +52,7 @@ public void NullPackageId()\n[Fact]\npublic void SingleRepoOneDependency()\n{\n- var expectedRepo = GenRepo(\"owner/id1\", 1, \"nupkg1\");\n+ var expectedRepo = CreateRepo(\"owner/id1\", 1, \"nupkg1\");\nvar gh = GenConfig(expectedRepo);\nvar nupkgInformation = gh.GetPackageInformation(\"nupkg1\");\n@@ -64,8 +64,8 @@ public void SingleRepoOneDependency()\n[Fact]\npublic void MultiReposSameDependency()\n{\n- var expectedRepo1 = GenRepo(\"owner/B\", 1, \"nupkg1\");\n- var expectedRepo2 = GenRepo(\"owner/A\", 1, \"nupkg1\");\n+ var expectedRepo1 = CreateRepo(\"owner/B\", 1, \"nupkg1\");\n+ var expectedRepo2 = CreateRepo(\"owner/A\", 1, \"nupkg1\");\nvar gh = GenConfig(expectedRepo1, expectedRepo2);\nvar nupkgInformation = gh.GetPackageInformation(\"nupkg1\");\n@@ -80,7 +80,7 @@ public void MultiReposSameDependency()\n[Fact]\npublic void OneRepoMultiDependencies()\n{\n- var expectedRepo = GenRepo(\"owner/A\", 1, \"nupkg1\", \"nupkg2\");\n+ var expectedRepo = CreateRepo(\"owner/A\", 1, \"nupkg1\", \"nupkg2\");\nvar gh = GenConfig(expectedRepo);\nvar nupkgInformation1 = gh.GetPackageInformation(\"nupkg1\");\nvar nupkgInformation2 = gh.GetPackageInformation(\"nupkg2\");\n@@ -99,11 +99,11 @@ public void MultiReposSameDependencyOrderedByStarCount()\n{\nRepositoryInformation[] expectedRepos =\n{\n- GenRepo(\"owner/A\", 1, \"nupkg1\"),\n- GenRepo(\"owner/B\", 2, \"nupkg1\"),\n- GenRepo(\"owner/C\", 3, \"nupkg1\"),\n- GenRepo(\"owner/D\", 4, \"nupkg1\"),\n- GenRepo(\"owner/E\", 5, \"nupkg1\")\n+ CreateRepo(\"owner/A\", 1, \"nupkg1\"),\n+ CreateRepo(\"owner/B\", 2, \"nupkg1\"),\n+ CreateRepo(\"owner/C\", 3, \"nupkg1\"),\n+ CreateRepo(\"owner/D\", 4, \"nupkg1\"),\n+ CreateRepo(\"owner/E\", 5, \"nupkg1\")\n};\nvar gh = GenConfig(expectedRepos);\n@@ -126,18 +126,18 @@ public void OrderedByStarCountThenByIdThenTrimmed()\n{\nRepositoryInformation[] expectedRepos =\n{\n- GenRepo(\"owner/A\", 1, \"nupkg1\"),\n- GenRepo(\"owner/B\", 2, \"nupkg1\"),\n- GenRepo(\"owner/C\", 3, \"nupkg1\"),\n- GenRepo(\"owner/D\", 5, \"nupkg1\"),\n- GenRepo(\"owner/E\", 5, \"nupkg1\"),\n- GenRepo(\"owner/F\", 7, \"nupkg1\"),\n- GenRepo(\"owner/G\", 7, \"nupkg1\"),\n- GenRepo(\"owner/H\", 7, \"nupkg1\"),\n- GenRepo(\"owner/I\", 8, \"nupkg1\"),\n- GenRepo(\"owner/J\", 9, \"nupkg1\"),\n- GenRepo(\"owner/K\", 1, \"nupkg1\"),\n- GenRepo(\"owner/L\", 10, \"nupkg1\")\n+ CreateRepo(\"owner/A\", 1, \"nupkg1\"),\n+ CreateRepo(\"owner/B\", 2, \"nupkg1\"),\n+ CreateRepo(\"owner/C\", 3, \"nupkg1\"),\n+ CreateRepo(\"owner/D\", 5, \"nupkg1\"),\n+ CreateRepo(\"owner/E\", 5, \"nupkg1\"),\n+ CreateRepo(\"owner/F\", 7, \"nupkg1\"),\n+ CreateRepo(\"owner/G\", 7, \"nupkg1\"),\n+ CreateRepo(\"owner/H\", 7, \"nupkg1\"),\n+ CreateRepo(\"owner/I\", 8, \"nupkg1\"),\n+ CreateRepo(\"owner/J\", 9, \"nupkg1\"),\n+ CreateRepo(\"owner/K\", 1, \"nupkg1\"),\n+ CreateRepo(\"owner/L\", 10, \"nupkg1\")\n};\nvar gh = GenConfig(expectedRepos);\n@@ -157,7 +157,7 @@ public void OrderedByStarCountThenByIdThenTrimmed()\n[Fact]\npublic void CaseInsensitive()\n{\n- var expectedRepo = GenRepo(\"owner/A\", 1, \"nupkg1\");\n+ var expectedRepo = CreateRepo(\"owner/A\", 1, \"nupkg1\");\nvar gh = GenConfig(expectedRepo);\nvar nupkgInformation = gh.GetPackageInformation(\"NuPkG1\");\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Changed GenRepo to CreateRepo |
455,739 | 11.06.2019 16:58:43 | 25,200 | facdcb7fd122093db9fc30ff6910f503e0501666 | [GH Usage] Fixed tests | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/GitHub/GitHubUsageConfigurationFacts.cs",
"diff": "@@ -74,7 +74,7 @@ public void MultiReposSameDependency()\n// Make sure they're alphabetically ordered since they have the same star count!\nAssert.Equal(expectedRepo2, nupkgInformation.Repos.First());\n- Assert.Equal(expectedRepo1, nupkgInformation.Repos[1]);\n+ Assert.Equal(expectedRepo1, nupkgInformation.Repos.ToList()[1]);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -158,6 +158,9 @@ public class PackagesControllerFacts\ncontentObjectService\n.Setup(x => x.SymbolsConfiguration.IsSymbolsUploadEnabledForUser(It.IsAny<User>()))\n.Returns(false);\n+ contentObjectService\n+ .SetupGet(c => c.GitHubUsageConfiguration)\n+ .Returns(new GitHubUsageConfiguration(Array.Empty<RepositoryInformation>()));\n}\nif (symbolPackageUploadService == null)\n@@ -504,17 +507,12 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nhttpContext: httpContext,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(currentUser);\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\n@@ -637,18 +635,13 @@ private async Task CheckValidPackage(User currentUser, User owner)\nvar indexingService = new Mock<IIndexingService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\nhttpContext: httpContext,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(currentUser);\nhttpContext.Setup(c => c.Response.Cache).Returns(httpCachePolicy.Object);\nvar title = \"A test package!\";\n@@ -700,17 +693,12 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -785,17 +773,12 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -847,20 +830,14 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\n-\nvar package = new Package()\n{\nPackageRegistration = new PackageRegistration()\n@@ -959,18 +936,13 @@ private async Task<ActionResult> GetResultWithReadMe(string readMeHtml, bool has\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar fileService = new Mock<IPackageFileService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\npackageFileService: fileService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -1023,10 +995,6 @@ public async Task GetsValidationIssues()\nvar indexingService = new Mock<IIndexingService>();\nvar fileService = new Mock<IPackageFileService>();\nvar validationService = new Mock<IValidationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -1034,8 +1002,7 @@ public async Task GetsValidationIssues()\nindexingService: indexingService,\npackageFileService: fileService,\nvalidationService: validationService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar package = new Package()\n@@ -1091,17 +1058,12 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nfeatureFlagService: featureFlagService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -1152,17 +1114,12 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nfeatureFlagService: featureFlagService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\nvar id = \"Foo\";\nvar package = new Package()\n@@ -1212,17 +1169,12 @@ public async Task ShowsDeprecationIfEnabled(bool isDeprecationEnabled)\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nfeatureFlagService: featureFlagService,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar id = \"Foo\";\n@@ -1308,18 +1260,12 @@ public async Task SplitsLicenseExpressionWhenProvided()\nindexingService.Setup(i => i.GetLastWriteTime()).Returns(Task.FromResult((DateTime?)DateTime.UtcNow));\n- var contentObjectService = new Mock<IContentObjectService>();\n- contentObjectService\n- .SetupGet(c => c.GitHubUsageConfiguration)\n- .Returns(new GitHub.GitHubUsageConfiguration(Array.Empty<GitHub.RepositoryInformation>().ToList()));\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\nindexingService: indexingService,\nlicenseExpressionSplitter: splitterMock,\n- deprecationService: deprecationService,\n- contentObjectService: contentObjectService);\n+ deprecationService: deprecationService);\nvar result = await controller.DisplayPackage(id, version: null);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fixed tests |
455,739 | 11.06.2019 17:02:31 | 25,200 | f3b3dcd1e2feeac61fe6072eb2fca4298be4d41f | [GH Usage] Changed G for B in KiloFormat | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"diff": "@@ -69,7 +69,7 @@ public static string ToUserFriendlyBytesLabel(this long bytes)\n}\n/// <summary>\n- /// Format the number to a 3 digit representation plus a letter to represent the scale (K for kilo, M for mega, or G for giga)\n+ /// Format the number to a 3 digit representation plus a letter to represent the scale (K for kilo, M for mega, or B for billion)\n/// </summary>\n/// <param name=\"number\"></param>\n/// <returns></returns>\n@@ -77,7 +77,7 @@ public static string ToKiloFormat(this int number)\n{\nif (number >= 1_000_000_000)\n{\n- return new StringBuilder((number / 1_000_000_000.0f).ToString(\"F3\")) { [4] = 'G' }.ToString();\n+ return new StringBuilder((number / 1_000_000_000.0f).ToString(\"F3\")) { [4] = 'B' }.ToString();\n}\nif (number >= 100_000_000)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"diff": "@@ -53,8 +53,8 @@ public class TheToKiloFormatMethod\n[InlineData(99_990_000, \"99.9M\")]\n[InlineData(100_990_000, \"100M\")]\n[InlineData(999_990_000, \"999M\")]\n- [InlineData(1_000_000_000, \"1.00G\")]\n- [InlineData(1_999_000_000, \"1.99G\")]\n+ [InlineData(1_000_000_000, \"1.00B\")]\n+ [InlineData(1_999_000_000, \"1.99B\")]\npublic void FormatsUsingExpectedUnit(int number, string expected)\n{\nvar actual = NumberExtensions.ToKiloFormat(number);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Changed G for B in KiloFormat |
455,739 | 11.06.2019 18:29:36 | 25,200 | fa90e5849a844e3b99c32aca7df5ca7a8d3af66b | [GH Usage] Removed redundant newlines | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -507,7 +507,6 @@ public async Task GivenAValidatingPackageThatTheCurrentUserDoesNotOwnThenHideIt(\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -635,7 +634,6 @@ private async Task CheckValidPackage(User currentUser, User owner)\nvar indexingService = new Mock<IIndexingService>();\nvar httpContext = new Mock<HttpContextBase>();\nvar httpCachePolicy = new Mock<HttpCachePolicyBase>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -693,7 +691,6 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -773,7 +770,6 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -830,7 +826,6 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nvar packageService = new Mock<IPackageService>();\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -936,7 +931,6 @@ private async Task<ActionResult> GetResultWithReadMe(string readMeHtml, bool has\nvar indexingService = new Mock<IIndexingService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\nvar fileService = new Mock<IPackageFileService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -1058,7 +1052,6 @@ public async Task ShowsAtomFeedIfEnabled(bool isAtomFeedEnabled)\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -1114,7 +1107,6 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n@@ -1169,7 +1161,6 @@ public async Task ShowsDeprecationIfEnabled(bool isDeprecationEnabled)\nvar featureFlagService = new Mock<IFeatureFlagService>();\nvar packageService = new Mock<IPackageService>();\nvar deprecationService = new Mock<IPackageDeprecationService>();\n-\nvar controller = CreateController(\nGetConfigurationService(),\npackageService: packageService,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Removed redundant newlines |
455,739 | 12.06.2019 14:01:10 | 25,200 | 7077c4e26d74522b5db423c46f38c5fd313149fb | [GH Usage] Fixed ToKiloFormat | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"diff": "@@ -70,28 +70,42 @@ public static string ToUserFriendlyBytesLabel(this long bytes)\n}\n/// <summary>\n- /// Format the number to a 3 digit representation plus a letter to represent the scale (K for kilo, M for mega, or B for billion)\n+ /// Format the number to a 1 decimal precision plus a letter to represent the scale (K for kilo, M for mega, or B for billion)\n/// </summary>\n- /// <param name=\"number\"></param>\n- /// <returns></returns>\n+ /// <param name=\"number\">The number to format</param>\n+ /// <returns>String representation of the formatted number</returns>\npublic static string ToKiloFormat(this int number)\n{\n- var thresholds = new[]\n+ bool isNegative = number < 0;\n+ if (isNegative)\n+ {\n+ number *= -1;\n+ }\n+\n+ if (number < 1000)\n+ {\n+ return (isNegative ? \"-\" : \"\") + number.ToString();\n+ }\n+\n+ var powers = new[]\n{\n- new { Threshold = 1_000_000_000, Transform = new Func<int, float>((x) => x / 1_000_000_000f), Format = \"{0:F3}B\", Trim = true },\n- new { Threshold = 100_000_000, Transform = new Func<int, float>((x) => x / 1_000_000), Format = \"{0:F0}M\", Trim = false},\n- new { Threshold = 10_000_000, Transform = new Func<int, float>((x) => x / 1_000_000f), Format = \"{0:F2}M\", Trim = true},\n- new { Threshold = 1_000_000, Transform = new Func<int, float>((x) => x / 1_000_000f), Format = \"{0:F3}M\", Trim = true},\n- new { Threshold = 100_000, Transform = new Func<int, float>((x) => x / 1_000), Format = \"{0}K\", Trim = false},\n- new { Threshold = 10_000, Transform = new Func<int, float>((x) => x / 1_000f), Format = \"{0:F2}K\", Trim = true},\n- new { Threshold = 1_000, Transform = new Func<int, float>((x) => x / 1_000f), Format = \"{0:F3}K\", Trim = true},\n- new { Threshold = int.MinValue, Transform = new Func<int, float>((x) => x), Format = \"{0}\", Trim = false}\n+ new { Pow = 9 , Value = 1_000_000_000f, Unit = 'B'},\n+ new { Pow = 6 , Value = 1_000_000f , Unit = 'M'},\n+ new { Pow = 3 , Value = 1_000f , Unit = 'K'},\n+ new { Pow = 0 , Value = 1f , Unit = '\\0'}\n};\n- var elem = thresholds.First(d => number >= d.Threshold);\n- var strFormat = string.Format(elem.Format, elem.Transform(number));\n+ var multiplier = powers.First(x => number.ToString().Length > x.Pow);\n+ var simplifiedNumber = (number / multiplier.Value);\n+ var roundValue = (int)float.Parse(string.Format(\"{0:F1}\", simplifiedNumber));\n+\n+ // This is used in some cases to get the right power with its unit (e.g: 999_999_000 is rounded to 1.0B)\n+ if (roundValue > simplifiedNumber)\n+ {\n+ return (roundValue * (int)multiplier.Value * (isNegative ? -1 : 1)).ToKiloFormat();\n+ }\n- return elem.Trim ? strFormat.Remove(4, 1) : strFormat;\n+ return (isNegative ? \"-\" : \"\") + string.Format(\"{0:F1}\", simplifiedNumber) + multiplier.Unit;\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"diff": "@@ -35,26 +35,68 @@ public class TheToKiloFormatMethod\n[Theory]\n[InlineData(1, \"1\")]\n[InlineData(999, \"999\")]\n- [InlineData(1000, \"1.00K\")]\n- [InlineData(1990, \"1.99K\")]\n- [InlineData(1999, \"1.99K\")]\n- [InlineData(9990, \"9.99K\")]\n- [InlineData(9999, \"9.99K\")]\n+ [InlineData(1000, \"1.0K\")]\n+ [InlineData(1450, \"1.5K\")]\n+ [InlineData(1900, \"1.9K\")]\n+ [InlineData(1990, \"2.0K\")]\n+ [InlineData(1999, \"2.0K\")]\n+ [InlineData(9940, \"9.9K\")]\n+ [InlineData(9949, \"9.9K\")]\n+ [InlineData(9950, \"10.0K\")]\n+ [InlineData(9999, \"10.0K\")]\n[InlineData(10_000, \"10.0K\")]\n- [InlineData(10_990, \"10.9K\")]\n- [InlineData(99_990, \"99.9K\")]\n- [InlineData(100_000, \"100K\")]\n- [InlineData(100_990, \"100K\")]\n- [InlineData(100_999, \"100K\")]\n- [InlineData(999_000, \"999K\")]\n- [InlineData(999_999, \"999K\")]\n- [InlineData(1_000_000, \"1.00M\")]\n- [InlineData(1_999_000, \"1.99M\")]\n- [InlineData(99_990_000, \"99.9M\")]\n- [InlineData(100_990_000, \"100M\")]\n- [InlineData(999_990_000, \"999M\")]\n- [InlineData(1_000_000_000, \"1.00B\")]\n- [InlineData(1_999_000_000, \"1.99B\")]\n+ [InlineData(99_949, \"99.9K\")]\n+ [InlineData(99_950, \"100.0K\")]\n+ [InlineData(99_990, \"100.0K\")]\n+ [InlineData(100_000, \"100.0K\")]\n+ [InlineData(100_990, \"101.0K\")]\n+ [InlineData(100_999, \"101.0K\")]\n+ [InlineData(999_000, \"999.0K\")]\n+ [InlineData(999_999, \"1.0M\")]\n+ [InlineData(1_000_000, \"1.0M\")]\n+ [InlineData(9_949_000, \"9.9M\")]\n+ [InlineData(9_950_000, \"10.0M\")]\n+ [InlineData(9_999_000, \"10.0M\")]\n+ [InlineData(99_990_000, \"100.0M\")]\n+ [InlineData(100_940_000, \"100.9M\")]\n+ [InlineData(100_949_000, \"100.9M\")]\n+ [InlineData(100_950_000, \"101.0M\")]\n+ [InlineData(100_990_000, \"101.0M\")]\n+ [InlineData(999_990_000, \"1.0B\")]\n+ [InlineData(1_000_000_000, \"1.0B\")]\n+ [InlineData(1_999_000_000, \"2.0B\")]\n+ [InlineData(-1, \"-1\")]\n+ [InlineData(-999, \"-999\")]\n+ [InlineData(-1000, \"-1.0K\")]\n+ [InlineData(-1450, \"-1.5K\")]\n+ [InlineData(-1900, \"-1.9K\")]\n+ [InlineData(-1990, \"-2.0K\")]\n+ [InlineData(-1999, \"-2.0K\")]\n+ [InlineData(-9940, \"-9.9K\")]\n+ [InlineData(-9949, \"-9.9K\")]\n+ [InlineData(-9950, \"-10.0K\")]\n+ [InlineData(-9999, \"-10.0K\")]\n+ [InlineData(-10_000, \"-10.0K\")]\n+ [InlineData(-99_949, \"-99.9K\")]\n+ [InlineData(-99_950, \"-100.0K\")]\n+ [InlineData(-99_990, \"-100.0K\")]\n+ [InlineData(-100_000, \"-100.0K\")]\n+ [InlineData(-100_990, \"-101.0K\")]\n+ [InlineData(-100_999, \"-101.0K\")]\n+ [InlineData(-999_000, \"-999.0K\")]\n+ [InlineData(-999_999, \"-1.0M\")]\n+ [InlineData(-1_000_000, \"-1.0M\")]\n+ [InlineData(-9_949_000, \"-9.9M\")]\n+ [InlineData(-9_950_000, \"-10.0M\")]\n+ [InlineData(-9_999_000, \"-10.0M\")]\n+ [InlineData(-99_990_000, \"-100.0M\")]\n+ [InlineData(-100_940_000, \"-100.9M\")]\n+ [InlineData(-100_949_000, \"-100.9M\")]\n+ [InlineData(-100_950_000, \"-101.0M\")]\n+ [InlineData(-100_990_000, \"-101.0M\")]\n+ [InlineData(-999_990_000, \"-1.0B\")]\n+ [InlineData(-1_000_000_000, \"-1.0B\")]\n+ [InlineData(-1_999_000_000, \"-2.0B\")]\npublic void FormatsUsingExpectedUnit(int number, string expected)\n{\nvar actual = NumberExtensions.ToKiloFormat(number);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fixed ToKiloFormat |
455,739 | 12.06.2019 16:50:17 | 25,200 | 587a15f48f2e9f95d0e51cc60190674528ebf76a | [GH Usage] Added overflow test case for ToKiloFormat | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Extensions/NumberExtensionsFacts.cs",
"diff": "@@ -65,6 +65,7 @@ public class TheToKiloFormatMethod\n[InlineData(999_990_000, \"1.0B\")]\n[InlineData(1_000_000_000, \"1.0B\")]\n[InlineData(1_999_000_000, \"2.0B\")]\n+ [InlineData(2_147_483_647, \"2.1B\")]\n[InlineData(-1, \"-1\")]\n[InlineData(-999, \"-999\")]\n[InlineData(-1000, \"-1.0K\")]\n@@ -97,6 +98,7 @@ public class TheToKiloFormatMethod\n[InlineData(-999_990_000, \"-1.0B\")]\n[InlineData(-1_000_000_000, \"-1.0B\")]\n[InlineData(-1_999_000_000, \"-2.0B\")]\n+ [InlineData(-2_147_483_648, \"-2.1B\")]\npublic void FormatsUsingExpectedUnit(int number, string expected)\n{\nvar actual = NumberExtensions.ToKiloFormat(number);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Added overflow test case for ToKiloFormat |
455,751 | 12.06.2019 17:07:21 | 25,200 | 15b1ad2366199d828eae74775d8b5b70e83ea534 | Update the App Insights version.
Update the AppInsights version to 2.10 | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n+ <Version>2.10.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.Mvc\">\n<Version>5.2.3</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"System.Runtime\">\n<Version>4.3.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<PackageReference Include=\"Markdig.Signed\">\n<Version>0.15.4</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.ApplicationInsights.TraceListener\">\n+ <Version>2.10.0</Version>\n+ <ExcludeAssets>contentFiles</ExcludeAssets>\n+ </PackageReference>\n+ <PackageReference Include=\"Microsoft.ApplicationInsights.Web\">\n+ <Version>2.10.0</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.Extensions.DependencyInjection\">\n<Version>2.2.0</Version>\n</PackageReference>\n<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.Agent.Intercept\">\n- <Version>2.0.6</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.DependencyCollector\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.PerfCounterCollector\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.TraceListener\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.Web\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.WindowsServer\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.DynamicData.EFProvider\">\n<Version>6.0.0</Version>\n</PackageReference>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.49.0</Version>\n+ <Version>2.50.0-cmanu-ai23-2746063</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n<PackageReference Include=\"System.Diagnostics.Debug\">\n<Version>4.3.0</Version>\n</PackageReference>\n- <PackageReference Include=\"System.Diagnostics.DiagnosticSource\">\n- <Version>4.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"System.Linq.Expressions\">\n<Version>4.3.0</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientInformationTelemetryEnricher.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientInformationTelemetryEnricher.cs",
"diff": "@@ -21,18 +21,18 @@ public void Initialize(ITelemetry telemetry)\n{\n// ClientVersion is available for NuGet clients starting version 4.1.0-~4.5.0\n// Was deprecated and replaced by Protocol version\n- telemetry.Context.Properties.Add(\n+ telemetry.Context.GlobalProperties.Add(\nTelemetryService.ClientVersion,\nhttpContext.Request.Headers[GalleryConstants.ClientVersionHeaderName]);\n- telemetry.Context.Properties.Add(\n+ telemetry.Context.GlobalProperties.Add(\nTelemetryService.ProtocolVersion,\nhttpContext.Request.Headers[GalleryConstants.NuGetProtocolHeaderName]);\n- telemetry.Context.Properties.Add(TelemetryService.ClientInformation, httpContext.GetClientInformation());\n+ telemetry.Context.GlobalProperties.Add(TelemetryService.ClientInformation, httpContext.GetClientInformation());\n// Is the user authenticated or this is an anonymous request?\n- telemetry.Context.Properties.Add(TelemetryService.IsAuthenticated, httpContext.Request.IsAuthenticated.ToString());\n+ telemetry.Context.GlobalProperties.Add(TelemetryService.IsAuthenticated, httpContext.Request.IsAuthenticated.ToString());\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientTelemetryPIIProcessor.cs",
"diff": "@@ -28,7 +28,7 @@ public void Process(ITelemetry item)\nprivate void ModifyItem(ITelemetry item)\n{\nvar requestTelemetryItem = item as RequestTelemetry;\n- if(requestTelemetryItem != null)\n+ if(requestTelemetryItem != null && requestTelemetryItem.Url != null)\n{\nvar route = GetCurrentRoute();\nif(route == null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add name=\"ErrorMail\" type=\"Elmah.ErrorMailModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\"/>\n<add name=\"AsyncFileUpload\" type=\"NuGetGallery.AsyncFileUpload.AsyncFileUploadModule, NuGetGallery\"/>\n<add name=\"ApplicationInsightsWebTracking\" type=\"Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web\"/>\n+ <add name=\"TelemetryCorrelationHttpModule\" type=\"Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation\"/>\n</httpModules>\n<httpHandlers>\n<!-- Remove Default HTTP Handler -->\n<remove name=\"RoleManager\"/>\n<remove name=\"ApplicationInsightsWebTracking\"/>\n<add name=\"ApplicationInsightsWebTracking\" type=\"Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web\" preCondition=\"managedHandler\"/>\n+ <remove name=\"TelemetryCorrelationHttpModule\"/>\n+ <add name=\"TelemetryCorrelationHttpModule\" type=\"Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation\" preCondition=\"managedHandler\"/>\n</modules>\n<validation validateIntegratedModeConfiguration=\"false\"/>\n<httpErrors errorMode=\"DetailedLocalOnly\">\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.ApplicationInsights\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-2.10.0.0\" newVersion=\"2.10.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.IO.Compression\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Telemetry/ClientInformationTelemetryEnricherTests.cs",
"new_path": "tests/NuGetGallery.Facts/Telemetry/ClientInformationTelemetryEnricherTests.cs",
"diff": "@@ -37,7 +37,7 @@ public void EnrichesOnlyRequestsTelemetry(Type telemetryType)\n{\n// Arrange\nvar telemetry = (ITelemetry)telemetryType.GetConstructor(new Type[] { }).Invoke(new object[] { });\n- telemetry.Context.Properties.Add(\"Test\", \"blala\");\n+ telemetry.Context.GlobalProperties.Add(\"Test\", \"blala\");\nvar headers = new NameValueCollection\n{\n@@ -54,11 +54,11 @@ public void EnrichesOnlyRequestsTelemetry(Type telemetryType)\n// Assert\nif (telemetry is RequestTelemetry)\n{\n- Assert.Equal(5, telemetry.Context.Properties.Count);\n+ Assert.Equal(5, telemetry.Context.GlobalProperties.Count);\n}\nelse\n{\n- Assert.Equal(1, telemetry.Context.Properties.Count);\n+ Assert.Equal(1, telemetry.Context.GlobalProperties.Count);\n}\n}\n@@ -79,7 +79,7 @@ public void EnrichesTelemetryWithClientVersion()\nenricher.Initialize(telemetry);\n// Assert\n- Assert.Equal(\"5.0.0\", telemetry.Properties[TelemetryService.ClientVersion]);\n+ Assert.Equal(\"5.0.0\", telemetry.Context.GlobalProperties[TelemetryService.ClientVersion]);\n}\n[Fact]\n@@ -99,7 +99,7 @@ public void EnrichesTelemetryWithProtocolVersion()\nenricher.Initialize(telemetry);\n// Assert\n- Assert.Equal(\"5.0.0\", telemetry.Properties[TelemetryService.ProtocolVersion]);\n+ Assert.Equal(\"5.0.0\", telemetry.Context.GlobalProperties[TelemetryService.ProtocolVersion]);\n}\n[Fact]\n@@ -119,7 +119,7 @@ public void EnrichesTelemetryWithClientInfo()\nenricher.Initialize(telemetry);\n// Assert\n- Assert.NotEmpty(telemetry.Properties[TelemetryService.ClientInformation]);\n+ Assert.NotEmpty(telemetry.Context.GlobalProperties[TelemetryService.ClientInformation]);\n}\n[Theory]\n@@ -135,7 +135,7 @@ public void EnrichesTelemetryWithIsAuthenticated(bool isAuthenticated)\nenricher.Initialize(telemetry);\n// Assert\n- Assert.Equal(isAuthenticated, bool.Parse(telemetry.Properties[TelemetryService.IsAuthenticated]));\n+ Assert.Equal(isAuthenticated, bool.Parse(telemetry.Context.GlobalProperties[TelemetryService.IsAuthenticated]));\n}\nprivate TestableClientInformationTelemetryEnricher CreateTestEnricher(NameValueCollection headers, bool isAuthenticated = false)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update the App Insights version. (#7253)
Update the AppInsights version to 2.10 |
455,739 | 13.06.2019 13:03:29 | 25,200 | 30ba138d5552268f0a6824615b59abd35671379e | [GH Usage] Fixed typo | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "else\n{\n<p class=\"github-usage panel-collapse collapse\" aria-expanded=\"true\" id=\"github-usage\">\n- This package is not used by any popular GitHub repository.\n+ This package is not used by any popular GitHub repositories.\n</p>\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Fixed typo |
455,739 | 13.06.2019 15:34:48 | 25,200 | 80cbd3f520220d63a13513a5aa9dca25ae279c06 | [GH Usage] Added analytics | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -111,4 +111,24 @@ $(function () {\nga('send', 'event', 'dependencies', e.type);\n});\n}\n+\n+ if (window.nuget.isGaAvailable()) {\n+ // Emit a Google Analytics event when the user expands or collapses the GitHub Usage section.\n+ $(\"#github-usage\").on('hide.bs.collapse show.bs.collapse', function (e) {\n+ ga('send', 'event', 'github-usage', e.type);\n+ });\n+\n+ // Emit a Google Analytics event when the user clicks on a repo link in the GitHub Usage section.\n+ $(\".btn-gh-repo\").on('click', function (e) {\n+ let elem = e.delegateTarget.parentElement.parentElement;\n+ let linkIndex = 0;\n+ while ((elem = elem.previousSibling) != null) {\n+ if (elem.nodeName === \"DIV\") {\n+ linkIndex++;\n+ }\n+ }\n+\n+ ga('send', 'event', 'github-usage', 'link-click-' + linkIndex);\n+ });\n+ }\n});\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Added analytics |
455,739 | 13.06.2019 17:28:04 | 25,200 | 28f34c89b82c41e3ac054669becda25c16709868 | Fixing ToKiloFormat method | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/NumberExtensions.cs",
"diff": "@@ -96,7 +96,7 @@ public static string ToKiloFormat(this int number)\nreturn powers\n.Where(pow => Math.Abs(Math.Round(number / pow.Value, 3)) >= 1f)\n- .Select(pow => string.Format(\"{0:F1}{1}\", number / pow.Value, pow.Unit))\n+ .Select(pow => string.Format(CultureInfo.InvariantCulture, \"{0:F1}{1}\", number / pow.Value, pow.Unit))\n.First();\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fixing ToKiloFormat method |
455,739 | 14.06.2019 13:09:03 | 25,200 | 31496c4f72ef247cd89d46e4f2459278c9976bb2 | [GH Usage] Updated analytics click link index | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -119,16 +119,13 @@ $(function () {\n});\n// Emit a Google Analytics event when the user clicks on a repo link in the GitHub Usage section.\n- $(\".btn-gh-repo\").on('click', function (e) {\n- let elem = e.delegateTarget.parentElement.parentElement;\n- let linkIndex = 0;\n- while ((elem = elem.previousSibling) != null) {\n- if (elem.nodeName === \"DIV\") {\n- linkIndex++;\n- }\n- }\n-\n+ $(\".btn-gh-repo\").on('click', function (elem) {\n+ if (!elem.delegateTarget.dataset.indexNumber) {\n+ console.error(\"indexNumber property doesn't exist!\");\n+ } else {\n+ let linkIndex = elem.delegateTarget.dataset.indexNumber;\nga('send', 'event', 'github-usage', 'link-click-' + linkIndex);\n+ }\n});\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@(Model.Id), including the following:\n</p>\n- @foreach (var dep in Model.GitHubDependenciesInformation.Repos)\n+ @foreach (var item in Model.GitHubDependenciesInformation.Repos.Select((elem, i) => new { Value = elem, Idx = i}))\n{\n<div class=\"row top-buffer\">\n<div class=\"col-xs-12\">\n- <a class=\"btn btn-gh-repo text-left\" href=\"@dep.Url\" target=\"_blank\">\n+ <a data-index-number=\"@item.Idx\" class=\"btn btn-gh-repo text-left\" href=\"@item.Value.Url\" target=\"_blank\">\n<span class=\"pull-left\">\n- @(dep.Id)\n+ @(item.Value.Id)\n</span>\n<span class=\"badge pull-right badge-gh-repo\">\n- @(dep.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill star-gh-repo\" aria-hidden=\"true\"></i>\n+ @(item.Value.Stars.ToKiloFormat()) <i class=\"ms-Icon ms-Icon--FavoriteStarFill star-gh-repo\" aria-hidden=\"true\"></i>\n</span>\n</a>\n</div>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Updated analytics click link index |
455,739 | 14.06.2019 13:30:09 | 25,200 | 005e2baa1498a0904baf2b164b7f182325ab13c3 | [GH Usage] Grouped GH Usage analytics with dependencies section | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -105,14 +105,12 @@ $(function () {\n});\n}\n- // Emit a Google Analytics event when the user expands or collapses the Dependencies section.\nif (window.nuget.isGaAvailable()) {\n+ // Emit a Google Analytics event when the user expands or collapses the Dependencies section.\n$(\"#dependency-groups\").on('hide.bs.collapse show.bs.collapse', function (e) {\nga('send', 'event', 'dependencies', e.type);\n});\n- }\n- if (window.nuget.isGaAvailable()) {\n// Emit a Google Analytics event when the user expands or collapses the GitHub Usage section.\n$(\"#github-usage\").on('hide.bs.collapse show.bs.collapse', function (e) {\nga('send', 'event', 'github-usage', e.type);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [GH Usage] Grouped GH Usage analytics with dependencies section |
455,776 | 21.06.2019 10:08:02 | 25,200 | 03e16e405dae74f27a63f873814396127ec3bc1a | Add feature flag for deprecating a package with many versions | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -81,12 +81,6 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\nstatus |= PackageDeprecationStatus.Other;\n}\n- var currentUser = GetCurrentUser();\n- if (!_featureFlagService.IsManageDeprecationEnabled(GetCurrentUser()))\n- {\n- return DeprecateErrorResponse(HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n- }\n-\nif (versions == null || !versions.Any())\n{\nreturn DeprecateErrorResponse(HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n@@ -102,6 +96,12 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\nstring.Format(Strings.DeprecatePackage_MissingRegistration, id));\n}\n+ var currentUser = GetCurrentUser();\n+ if (!_featureFlagService.IsManageDeprecationEnabled(GetCurrentUser(), registration))\n+ {\n+ return DeprecateErrorResponse(HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n+ }\n+\nif (ActionsRequiringPermissions.DeprecatePackage.CheckPermissionsOnBehalfOfAnyAccount(currentUser, registration) != PermissionsCheckResult.Allowed)\n{\nreturn DeprecateErrorResponse(HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -751,7 +751,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\nmodel.SymbolsPackageValidationIssues = _validationService.GetLatestPackageValidationIssues(model.LatestSymbolsPackage);\nmodel.IsCertificatesUIEnabled = _contentObjectService.CertificatesConfiguration?.IsUIEnabledForUser(currentUser) ?? false;\nmodel.IsAtomFeedEnabled = _featureFlagService.IsPackagesAtomFeedEnabled();\n- model.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser);\n+ model.IsPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser, package.PackageRegistration);\nif(model.IsGitHubUsageEnabled = _featureFlagService.IsGitHubUsageEnabled(currentUser))\n{\n@@ -1467,6 +1467,7 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)\n// Load all versions of the package.\nvar packages = _packageService.FindPackagesById(\nid, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);\n+\nif (version != null)\n{\n// Try to find the exact version if it was specified.\n@@ -1492,7 +1493,7 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)\nReportMyPackageReasons,\nUrl,\nawait _readMeService.GetReadMeMdAsync(package),\n- _featureFlagService.IsManageDeprecationEnabled(currentUser));\n+ _featureFlagService.IsManageDeprecationEnabled(currentUser, package.PackageRegistration));\nif (!model.CanEdit && !model.CanManageOwners && !model.CanUnlistOrRelist)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Linq;\nusing NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\nusing NuGetGallery.Features;\n@@ -22,6 +23,7 @@ public class FeatureFlagService : IFeatureFlagService\nprivate const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\nprivate const string ManageDeprecationFeatureName = GalleryPrefix + \"ManageDeprecation\";\n+ private const string ManageDeprecationForManyVersionsFeatureName = GalleryPrefix + \"ManageDeprecationMany\";\nprivate const string ODataReadOnlyDatabaseFeatureName = GalleryPrefix + \"ODataReadOnlyDatabase\";\nprivate readonly IFeatureFlagClient _client;\n@@ -46,9 +48,20 @@ public bool IsPackagesAtomFeedEnabled()\nreturn _client.IsEnabled(PackagesAtomFeedFeatureName, defaultValue: false);\n}\n- public bool IsManageDeprecationEnabled(User user)\n+ /// <summary>\n+ /// The number of versions a package needs to have before it should be flighted using <see cref=\"ManageDeprecationForManyVersionsFeatureName\"/> instead of <see cref=\"ManageDeprecationFeatureName\"/>.\n+ /// </summary>\n+ private const int _manageDeprecationForManyVersionsThreshold = 500;\n+\n+ public bool IsManageDeprecationEnabled(User user, PackageRegistration registration)\n+ {\n+ if (!_client.IsEnabled(ManageDeprecationFeatureName, user, defaultValue: false))\n{\n- return _client.IsEnabled(ManageDeprecationFeatureName, user, defaultValue: false);\n+ return false;\n+ }\n+\n+ return registration.Packages.Count() < _manageDeprecationForManyVersionsThreshold\n+ || _client.IsEnabled(ManageDeprecationForManyVersionsFeatureName, user, defaultValue: true);\n}\npublic bool AreEmbeddedIconsEnabled(User user)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -33,9 +33,7 @@ public interface IFeatureFlagService\n/// Whether or not users can manage their package's deprecation state.\n/// If disabled,\n/// </summary>\n- /// <param name=\"user\"></param>\n- /// <returns></returns>\n- bool IsManageDeprecationEnabled(User user);\n+ bool IsManageDeprecationEnabled(User user, PackageRegistration registration);\n/// <summary>\n/// Whether the user is allowed to publish packages with an embedded icon.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "@@ -130,25 +130,23 @@ public async Task ReturnsBadRequestIfOtherAndNoCustomMessage()\nAssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_CustomMessageRequired);\n}\n- [Fact]\n- public async Task ReturnsForbiddenIfFeatureFlagDisabled()\n+ public static IEnumerable<object[]> ReturnsBadRequestIfNoVersions_Data =\n+ MemberDataHelper.AsDataSet(null, new string[0]);\n+\n+ [Theory]\n+ [MemberData(nameof(ReturnsBadRequestIfNoVersions_Data))]\n+ public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\n{\n// Arrange\nvar currentUser = TestUtility.FakeUser;\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(false)\n- .Verifiable();\n-\nvar controller = GetController<ManageDeprecationJsonApiController>();\ncontroller.SetCurrentUser(currentUser);\n// Act\nvar result = await controller.Deprecate(\nid: \"id\",\n- versions: null,\n+ versions: versions,\nisLegacy: false,\nhasCriticalBugs: false,\nisOther: false,\n@@ -157,24 +155,32 @@ public async Task ReturnsForbiddenIfFeatureFlagDisabled()\ncustomMessage: null);\n// Assert\n- AssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n- featureFlagService.Verify();\n+ AssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n}\n- public static IEnumerable<object[]> ReturnsBadRequestIfNoVersions_Data =\n- MemberDataHelper.AsDataSet(null, new string[0]);\n+ public static IEnumerable<object[]> ReturnsNotFoundIfNoPackagesOrRegistrationMissing_Data\n+ {\n+ get\n+ {\n+ var packageWithNullRegistration = new Package();\n+ return MemberDataHelper.AsDataSet(\n+ new Package[0],\n+ new[] { packageWithNullRegistration });\n+ }\n+ }\n[Theory]\n- [MemberData(nameof(ReturnsBadRequestIfNoVersions_Data))]\n- public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\n+ [MemberData(nameof(ReturnsNotFoundIfNoPackagesOrRegistrationMissing_Data))]\n+ public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<Package> packages)\n{\n// Arrange\n+ var id = \"id\";\nvar currentUser = TestUtility.FakeUser;\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n+ var packageService = GetMock<IPackageService>();\n+ packageService\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n+ .Returns(packages.ToList())\n.Verifiable();\nvar controller = GetController<ManageDeprecationJsonApiController>();\n@@ -182,8 +188,8 @@ public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\n// Act\nvar result = await controller.Deprecate(\n- id: \"id\",\n- versions: versions,\n+ id: id,\n+ versions: new[] { \"1.0.0\" },\nisLegacy: false,\nhasCriticalBugs: false,\nisOther: false,\n@@ -192,39 +198,38 @@ public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\ncustomMessage: null);\n// Assert\n- AssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n- featureFlagService.Verify();\n+ AssertErrorResponse(controller, result, HttpStatusCode.NotFound, string.Format(Strings.DeprecatePackage_MissingRegistration, id));\n+ packageService.Verify();\n}\n- public static IEnumerable<object[]> ReturnsNotFoundIfNoPackagesOrRegistrationMissing_Data\n- {\n- get\n- {\n- var packageWithNullRegistration = new Package();\n- return MemberDataHelper.AsDataSet(\n- new Package[0],\n- new[] { packageWithNullRegistration });\n- }\n- }\n- [Theory]\n- [MemberData(nameof(ReturnsNotFoundIfNoPackagesOrRegistrationMissing_Data))]\n- public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<Package> packages)\n+ [Fact]\n+ public async Task ReturnsForbiddenIfFeatureFlagDisabled()\n{\n// Arrange\nvar id = \"id\";\nvar currentUser = TestUtility.FakeUser;\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n+ var registration = new PackageRegistration\n+ {\n+ Id = id\n+ };\n+\n+ var package = new Package\n+ {\n+ PackageRegistration = registration\n+ };\nvar packageService = GetMock<IPackageService>();\npackageService\n.Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n- .Returns(packages.ToList())\n+ .Returns(new[] { package })\n+ .Verifiable();\n+\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(false)\n.Verifiable();\nvar controller = GetController<ManageDeprecationJsonApiController>();\n@@ -242,9 +247,8 @@ public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<P\ncustomMessage: null);\n// Assert\n- AssertErrorResponse(controller, result, HttpStatusCode.NotFound, string.Format(Strings.DeprecatePackage_MissingRegistration, id));\n+ AssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\nfeatureFlagService.Verify();\n- packageService.Verify();\n}\npublic static IEnumerable<object[]> NotOwner_Data\n@@ -272,17 +276,17 @@ public async Task ReturnsForbiddenIfNotOwner(User currentUser, User owner)\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n@@ -353,18 +357,18 @@ public async Task ReturnsForbiddenIfLocked(User currentUser, User owner)\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id,\nIsLocked = true\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n@@ -409,17 +413,17 @@ public async Task ReturnsNotFoundIfAlternatePackageRegistrationMissing(User curr\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n@@ -470,17 +474,17 @@ public async Task ReturnsNotFoundIfAlternatePackageVersionMissing(User currentUs\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n@@ -532,17 +536,17 @@ public async Task ReturnsNotFoundIfVersionMissing(User currentUser, User owner)\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n@@ -588,17 +592,17 @@ public async Task ReturnsNotFoundIfSomeVersionMissing(User currentUser, User own\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n@@ -750,17 +754,17 @@ public enum ReturnsSuccessful_AlternatePackage_State\n// Arrange\nvar id = \"id\";\n- var featureFlagService = GetMock<IFeatureFlagService>();\n- featureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n- .Returns(true)\n- .Verifiable();\n-\nvar registration = new PackageRegistration\n{\nId = id\n};\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\nregistration.Owners.Add(owner);\nvar package = new Package\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1136,7 +1136,7 @@ public async Task DoesNotShowDeprecationToLoggedOutUsers(bool isDeprecationEnabl\n.Returns(package);\nfeatureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(It.IsAny<User>()))\n+ .Setup(x => x.IsManageDeprecationEnabled(It.IsAny<User>(), package.PackageRegistration))\n.Returns(isDeprecationEnabled);\ndeprecationService\n@@ -1191,7 +1191,7 @@ public async Task ShowsDeprecationIfEnabled(bool isDeprecationEnabled)\n.Returns(package);\nfeatureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(TestUtility.FakeUser))\n+ .Setup(x => x.IsManageDeprecationEnabled(TestUtility.FakeUser, package.PackageRegistration))\n.Returns(isDeprecationEnabled);\ndeprecationService\n@@ -2668,7 +2668,7 @@ public async Task ManageDeprecationFeatureFlagIsSetInModel(User currentUser, Use\nvar featureFlagService = GetMock<IFeatureFlagService>();\nfeatureFlagService\n- .Setup(x => x.IsManageDeprecationEnabled(currentUser))\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, PackageRegistration))\n.Returns(isManageDeprecationEnabled)\n.Verifiable();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Infrastructure\\Lucene\\GallerySearchServiceFacts.cs\" />\n<Compile Include=\"Helpers\\StreamHelperFacts.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\SearchSideBySideMessageFacts.cs\" />\n+ <Compile Include=\"Services\\FeatureFlagServiceFacts.cs\" />\n<Compile Include=\"Services\\PackageDeprecationServiceFacts.cs\" />\n<Compile Include=\"Services\\SearchSideBySideServiceFacts.cs\" />\n<Compile Include=\"Services\\PackageUpdateServiceFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add feature flag for deprecating a package with many versions (#7285) |
455,776 | 21.06.2019 11:20:07 | 25,200 | d8dc32d9992e7cfd231a403cce45f6cc0adfcd7a | Fix deprecation custom message issues | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "using System.Web.Mvc;\nusing NuGet.Services.Entities;\nusing NuGet.Versioning;\n-using NuGetGallery.Auditing;\nusing NuGetGallery.Filters;\n+using NuGetGallery.RequestModels;\nnamespace NuGetGallery\n{\npublic partial class ManageDeprecationJsonApiController\n: AppController\n{\n+ private const int MaxCustomMessageLength = 1000;\n+\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageDeprecationService _deprecationService;\nprivate readonly IFeatureFlagService _featureFlagService;\n@@ -50,28 +52,22 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\n[RequiresAccountConfirmation(\"deprecate a package\")]\n[ValidateAntiForgeryToken]\npublic virtual async Task<JsonResult> Deprecate(\n- string id,\n- IEnumerable<string> versions,\n- bool isLegacy,\n- bool hasCriticalBugs,\n- bool isOther,\n- string alternatePackageId,\n- string alternatePackageVersion,\n- string customMessage)\n+ DeprecatePackageRequest request)\n{\nvar status = PackageDeprecationStatus.NotDeprecated;\n- if (isLegacy)\n+ if (request.IsLegacy)\n{\nstatus |= PackageDeprecationStatus.Legacy;\n}\n- if (hasCriticalBugs)\n+ if (request.HasCriticalBugs)\n{\nstatus |= PackageDeprecationStatus.CriticalBugs;\n}\n- if (isOther)\n+ var customMessage = request.CustomMessage;\n+ if (request.IsOther)\n{\nif (string.IsNullOrWhiteSpace(customMessage))\n{\n@@ -81,19 +77,29 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\nstatus |= PackageDeprecationStatus.Other;\n}\n- if (versions == null || !versions.Any())\n+ if (customMessage != null)\n+ {\n+ if (customMessage.Length > MaxCustomMessageLength)\n+ {\n+ return DeprecateErrorResponse(\n+ HttpStatusCode.BadRequest,\n+ string.Format(Strings.DeprecatePackage_CustomMessageTooLong, MaxCustomMessageLength));\n+ }\n+ }\n+\n+ if (request.Versions == null || !request.Versions.Any())\n{\nreturn DeprecateErrorResponse(HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n}\n- var packages = _packageService.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);\n+ var packages = _packageService.FindPackagesById(request.Id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);\nvar registration = packages.FirstOrDefault()?.PackageRegistration;\nif (registration == null)\n{\n// This should only happen if someone hacks the form or if the package is deleted while the user is filling out the form.\nreturn DeprecateErrorResponse(\nHttpStatusCode.NotFound,\n- string.Format(Strings.DeprecatePackage_MissingRegistration, id));\n+ string.Format(Strings.DeprecatePackage_MissingRegistration, request.Id));\n}\nvar currentUser = GetCurrentUser();\n@@ -111,37 +117,37 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\n{\nreturn DeprecateErrorResponse(\nHttpStatusCode.Forbidden,\n- string.Format(Strings.DeprecatePackage_Locked, id));\n+ string.Format(Strings.DeprecatePackage_Locked, request.Id));\n}\nPackageRegistration alternatePackageRegistration = null;\nPackage alternatePackage = null;\n- if (!string.IsNullOrWhiteSpace(alternatePackageId))\n+ if (!string.IsNullOrWhiteSpace(request.AlternatePackageId))\n{\n- if (!string.IsNullOrWhiteSpace(alternatePackageVersion))\n+ if (!string.IsNullOrWhiteSpace(request.AlternatePackageVersion))\n{\n- alternatePackage = _packageService.FindPackageByIdAndVersionStrict(alternatePackageId, alternatePackageVersion);\n+ alternatePackage = _packageService.FindPackageByIdAndVersionStrict(request.AlternatePackageId, request.AlternatePackageVersion);\nif (alternatePackage == null)\n{\nreturn DeprecateErrorResponse(\nHttpStatusCode.NotFound,\n- string.Format(Strings.DeprecatePackage_NoAlternatePackage, alternatePackageId, alternatePackageVersion));\n+ string.Format(Strings.DeprecatePackage_NoAlternatePackage, request.AlternatePackageId, request.AlternatePackageVersion));\n}\n}\nelse\n{\n- alternatePackageRegistration = _packageService.FindPackageRegistrationById(alternatePackageId);\n+ alternatePackageRegistration = _packageService.FindPackageRegistrationById(request.AlternatePackageId);\nif (alternatePackageRegistration == null)\n{\nreturn DeprecateErrorResponse(\nHttpStatusCode.NotFound,\n- string.Format(Strings.DeprecatePackage_NoAlternatePackageRegistration, alternatePackageId));\n+ string.Format(Strings.DeprecatePackage_NoAlternatePackageRegistration, request.AlternatePackageId));\n}\n}\n}\nvar packagesToUpdate = new List<Package>();\n- foreach (var version in versions)\n+ foreach (var version in request.Versions)\n{\nvar normalizedVersion = NuGetVersionFormatter.Normalize(version);\nvar package = packages.SingleOrDefault(v => v.NormalizedVersion == normalizedVersion);\n@@ -150,7 +156,7 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\n// This should only happen if someone hacks the form or if a version of the package is deleted while the user is filling out the form.\nreturn DeprecateErrorResponse(\nHttpStatusCode.NotFound,\n- string.Format(Strings.DeprecatePackage_MissingVersion, id));\n+ string.Format(Strings.DeprecatePackage_MissingVersion, request.Id));\n}\nelse\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201905071526573_DevelopmentDependencyMetadata.Designer.cs\">\n<DependentUpon>201905071526573_DevelopmentDependencyMetadata.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"RequestModels\\DeprecatePackageRequest.cs\" />\n<Compile Include=\"Services\\IPackageDeprecationService.cs\" />\n<Compile Include=\"Queries\\AutocompleteDatabasePackageIdsQuery.cs\" />\n<Compile Include=\"Queries\\AutocompleteDatabasePackageVersionsQuery.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -775,6 +775,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Your custom message is too long. It must be under {0} characters..\n+ /// </summary>\n+ public static string DeprecatePackage_CustomMessageTooLong {\n+ get {\n+ return ResourceManager.GetString(\"DeprecatePackage_CustomMessageTooLong\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You do not have permission to deprecate this package..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1121,4 +1121,7 @@ The {1} Team</value>\n<data name=\"UploadPackage_EmbeddedIconNotAccepted\" xml:space=\"preserve\">\n<value>The <icon> element is not currently supported.</value>\n</data>\n+ <data name=\"DeprecatePackage_CustomMessageTooLong\" xml:space=\"preserve\">\n+ <value>Your custom message is too long. It must be under {0} characters.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"diff": "@if (!string.IsNullOrEmpty(Model.CustomMessage))\n{\n<b>Additional Details</b>\n- <p>@Model.CustomMessage</p>\n+ <p>@Html.PreFormattedText(Model.CustomMessage)</p>\n}\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "using System.Web.Mvc;\nusing Newtonsoft.Json.Linq;\nusing NuGet.Services.Entities;\n-using NuGetGallery.Auditing;\nusing NuGetGallery.Framework;\n+using NuGetGallery.RequestModels;\nusing Xunit;\nnamespace NuGetGallery.Controllers\n@@ -117,14 +117,7 @@ public async Task ReturnsBadRequestIfOtherAndNoCustomMessage()\n// Act\nvar result = await controller.Deprecate(\n- id: \"id\",\n- versions: null,\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: true,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(\"id\", isOther: true));\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_CustomMessageRequired);\n@@ -145,19 +138,37 @@ public async Task ReturnsBadRequestIfNoVersions(IEnumerable<string> versions)\n// Act\nvar result = await controller.Deprecate(\n- id: \"id\",\n- versions: versions,\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(\"id\", versions));\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.BadRequest, Strings.DeprecatePackage_NoVersions);\n}\n+ [Fact]\n+ public async Task ReturnsBadRequestIfLongCustomMessage()\n+ {\n+ // Arrange\n+ var currentUser = TestUtility.FakeUser;\n+ var controller = GetController<ManageDeprecationJsonApiController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ var customMessage = new string('a', 1001);\n+\n+ // Act\n+ var result = await controller.Deprecate(\n+ CreateDeprecatePackageRequest(\n+ \"id\",\n+ new[] { \"1.0.0\" },\n+ customMessage: customMessage));\n+\n+ // Assert\n+ AssertErrorResponse(\n+ controller,\n+ result,\n+ HttpStatusCode.BadRequest,\n+ string.Format(Strings.DeprecatePackage_CustomMessageTooLong, 1000));\n+ }\n+\npublic static IEnumerable<object[]> ReturnsNotFoundIfNoPackagesOrRegistrationMissing_Data\n{\nget\n@@ -188,14 +199,7 @@ public async Task ReturnsNotFoundIfNoPackagesOrRegistrationMissing(IEnumerable<P\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(\"id\", new[] { \"1.0.0\" }));\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.NotFound, string.Format(Strings.DeprecatePackage_MissingRegistration, id));\n@@ -237,14 +241,7 @@ public async Task ReturnsForbiddenIfFeatureFlagDisabled()\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(id, new[] { \"1.0.0\" }));\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n@@ -305,14 +302,7 @@ public async Task ReturnsForbiddenIfNotOwner(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(id, new[] { \"1.0.0\" }));\n// Assert\nAssertErrorResponse(controller, result, HttpStatusCode.Forbidden, Strings.DeprecatePackage_Forbidden);\n@@ -387,14 +377,7 @@ public async Task ReturnsForbiddenIfLocked(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(id, new[] { \"1.0.0\" }));\n// Assert\nAssertErrorResponse(\n@@ -448,14 +431,10 @@ public async Task ReturnsNotFoundIfAlternatePackageRegistrationMissing(User curr\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: alternatePackageId,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(\n+ id,\n+ new[] { \"1.0.0\" },\n+ alternatePackageId: alternatePackageId));\n// Assert\nAssertErrorResponse(\n@@ -510,14 +489,11 @@ public async Task ReturnsNotFoundIfAlternatePackageVersionMissing(User currentUs\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n+ CreateDeprecatePackageRequest(\n+ id,\n+ new[] { \"1.0.0\" },\nalternatePackageId: alternatePackageId,\n- alternatePackageVersion: alternatePackageVersion,\n- customMessage: null);\n+ alternatePackageVersion: alternatePackageVersion));\n// Assert\nAssertErrorResponse(\n@@ -566,14 +542,7 @@ public async Task ReturnsNotFoundIfVersionMissing(User currentUser, User owner)\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(id, new[] { \"1.0.0\" }));\n// Assert\nAssertErrorResponse(\n@@ -622,14 +591,7 @@ public async Task ReturnsNotFoundIfSomeVersionMissing(User currentUser, User own\n// Act\nvar result = await controller.Deprecate(\n- id: id,\n- versions: new[] { \"1.0.0\" },\n- isLegacy: false,\n- hasCriticalBugs: false,\n- isOther: false,\n- alternatePackageId: null,\n- alternatePackageVersion: null,\n- customMessage: null);\n+ CreateDeprecatePackageRequest(id, new[] { \"1.0.0\" }));\n// Assert\nAssertErrorResponse(\n@@ -822,7 +784,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\nvar deprecationService = GetMock<IPackageDeprecationService>();\n- var customMessage = hasCustomMessage ? \"message\" : null;\n+ var customMessage = hasCustomMessage ? \"<message>\" : null;\ndeprecationService\n.Setup(x => x.UpdateDeprecation(\n@@ -842,6 +804,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\n// Act\nvar result = await controller.Deprecate(\n+ CreateDeprecatePackageRequest(\nid,\npackageNormalizedVersions,\nisLegacy,\n@@ -849,7 +812,7 @@ public enum ReturnsSuccessful_AlternatePackage_State\nisOther,\nalternatePackageId,\nalternatePackageVersion,\n- customMessage);\n+ customMessage));\n// Assert\nAssertSuccessResponse(controller);\n@@ -871,6 +834,29 @@ public enum ReturnsSuccessful_AlternatePackage_State\n{\nAssert.Equal((int)code, controller.Response.StatusCode);\n}\n+\n+ private static DeprecatePackageRequest CreateDeprecatePackageRequest(\n+ string id = null,\n+ IEnumerable<string> versions = null,\n+ bool isLegacy = false,\n+ bool hasCriticalBugs = false,\n+ bool isOther = false,\n+ string alternatePackageId = null,\n+ string alternatePackageVersion = null,\n+ string customMessage = null)\n+ {\n+ return new DeprecatePackageRequest\n+ {\n+ Id = id,\n+ Versions = versions,\n+ IsLegacy = isLegacy,\n+ HasCriticalBugs = hasCriticalBugs,\n+ IsOther = isOther,\n+ AlternatePackageId = alternatePackageId,\n+ AlternatePackageVersion = alternatePackageVersion,\n+ CustomMessage = customMessage\n+ };\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix deprecation custom message issues (#7284) |
455,736 | 20.06.2019 11:33:00 | 25,200 | 4a5d7fa79ee2ed78af6a728ab69a76e72b745120 | Emit Application Insights metric from browser for search selection
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "return typeof ga === 'function';\n};\n+ nuget.isAiAvailable = function () {\n+ return typeof window.appInsights === 'object';\n+ };\n+\nnuget.getDateFormats = function (input) {\nvar datetime = moment.utc(input);\n}\n};\n+ nuget.sendAiMetric = function (name, value, properties) {\n+ if (window.nuget.isAiAvailable()) {\n+ window.appInsights.trackMetric(name, value, 1, value, value, properties);\n+ }\n+ };\n+\nwindow.nuget = nuget;\njQuery.extend(jQuery.expr[':'], {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "@section bottomScripts {\n<script type=\"text/javascript\">\n+ // Used to track how long the user waited before clicking a search selection.\n+ var pageLoadTime = Date.now();\n+ // Used to track how many selections were made on this page. Multiple selections can happen if the user opens\n+ // a search selection in a new tab, instead of navigating away from this page.\n+ var sincePageLoadCount = 0;\n@if (!string.IsNullOrWhiteSpace(Model.SearchTerm) && (Model.PageIndex == 0 || Model.Items.Count() > 0))\n{\nvar action = Model.IncludePrerelease ? \"search-prerel\" : \"search-stable\";\n// event to be correlated in Google Analytics.\n<text>\nwindow.nuget.sendAnalyticsEvent('search-page', '@action', @Html.Raw(Json.Encode(Model.SearchTerm)), @Model.PageIndex);\n+ window.nuget.sendAiMetric('BrowserSearchPage', @Model.PageIndex, {\n+ SearchTerm: @Html.Raw(Json.Encode(Model.SearchTerm)),\n+ IncludePrerelease: '@Model.IncludePrerelease',\n+ PageIndex: @Model.PageIndex,\n+ TotalCount: @Model.TotalCount\n+ });\n</text>\n}\nqueryString\n].join('');\nwindow.location.href = url;\n- })\n+ });\n+\n+ var emitAiClickEvent = function () {\n+ if (!window.nuget.isAiAvailable()) {\n+ return;\n+ }\n+\n+ var $this = $(this);\n+ var data = $this.data();\n+ if ($this.attr('href') && data.track) {\n+ window.nuget.sendAiMetric('BrowserSearchSelection', data.trackValue, {\n+ SearchTerm: @Html.Raw(Json.Encode(Model.SearchTerm)),\n+ IncludePrerelease: '@Model.IncludePrerelease',\n+ PageIndex: @Model.PageIndex,\n+ TotalCount: @Model.TotalCount,\n+ ClickIndex: data.trackValue,\n+ PackageId: data.packageId,\n+ PackageVersion: data.packageVersion,\n+ UseVersion: data.useVersion,\n+ SincePageLoadMs: Date.now() - pageLoadTime,\n+ SincePageLoadCount: sincePageLoadCount\n+ });\n+\n+ sincePageLoadCount++;\n+ }\n+ };\n+ $.each($('a[data-track]'), function () {\n+ $(this).mouseup(function (e) {\n+ if (e.which === 2) { // Middle-mouse click\n+ emitAiClickEvent.call(this, e);\n+ }\n+ });\n+ $(this).click(function (e) {\n+ emitAiClickEvent.call(this, e);\n+ });\n+ });\n});\n</script>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "}\n}\n-\n<article class=\"package\" role=\"listitem\">\n<div class=\"row\">\n@if (itemIndex.HasValue)\n{\n@:data-track=\"@eventName\" data-track-value=\"@itemIndex\"\n+ @:data-package-id=\"@Model.Id\" data-package-version=\"@Model.Version\" data-use-version=\"@Model.UseVersion\"\n}\n>@Html.BreakWord(Model.Id)</a>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Emit Application Insights metric from browser for search selection (#7288)
Address https://github.com/NuGet/NuGetGallery/issues/7287 |
455,744 | 24.06.2019 10:20:17 | 25,200 | ae8037072778bd4394670218529d0944e432076a | Removed the "RejectPackagesWithLicense" configuration option. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery.Services/Configuration/AppConfiguration.cs",
"diff": "@@ -353,9 +353,6 @@ public string ExternalBrandingMessage\npublic bool AsynchronousEmailServiceEnabled { get; set; }\n- [DefaultValue(false)]\n- public bool RejectPackagesWithLicense { get; set; }\n-\n[DefaultValue(false)]\npublic bool BlockLegacyLicenseUrl { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IAppConfiguration.cs",
"diff": "@@ -370,11 +370,6 @@ public interface IAppConfiguration : IMessageServiceConfiguration\n/// </summary>\nbool AsynchronousEmailServiceEnabled { get; set; }\n- /// <summary>\n- /// Flag that indicates whether packages with `license` node in them should be rejected.\n- /// </summary>\n- bool RejectPackagesWithLicense { get; set; }\n-\n/// <summary>\n/// Indicates whether packages that specify the license the \"old\" way (with a \"licenseUrl\" node only) should be rejected.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/ServicesStrings.Designer.cs",
"new_path": "src/NuGetGallery.Services/ServicesStrings.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace NuGetGallery {\n// class via a tool like ResGen or Visual Studio.\n// To add or remove a member, edit your .ResX file then rerun ResGen\n// with the /str option, or rebuild your VS project.\n- [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"15.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"16.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\npublic class ServicesStrings {\n@@ -2435,15 +2435,6 @@ public class ServicesStrings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to License files are not yet supported..\n- /// </summary>\n- public static string UploadPackage_LicenseFilesAreNotAllowed {\n- get {\n- return ResourceManager.GetString(\"UploadPackage_LicenseFilesAreNotAllowed\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to The license file cannot be longer than {0}..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/ServicesStrings.resx",
"new_path": "src/NuGetGallery.Services/ServicesStrings.resx",
"diff": "@@ -1053,9 +1053,6 @@ The {1} Team</value>\n<value>Unsupported license type '{0}'.</value>\n<comment>{0} is the license type read from the nuspec</comment>\n</data>\n- <data name=\"UploadPackage_LicenseFilesAreNotAllowed\" xml:space=\"preserve\">\n- <value>License files are not yet supported.</value>\n- </data>\n<data name=\"UploadPackage_DeprecationUrlRequiredForLicenseExpressions\" xml:space=\"preserve\">\n<value>To provide a better experience for older clients when a license expression is specified, <licenseUrl> must be set to '{0}'.</value>\n<comment>{0} is the licenses.nuget.org link with license expression</comment>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"new_path": "src/NuGetGallery/Services/PackageUploadService.cs",
"diff": "@@ -150,11 +150,6 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc\nif (licenseElement != null)\n{\n- if (_config.RejectPackagesWithLicense)\n- {\n- return PackageValidationResult.Invalid(Strings.UploadPackage_NotAcceptingPackagesWithLicense);\n- }\n-\nif (licenseElement.Value.Length > MaxAllowedLicenseNodeValueLength)\n{\nreturn PackageValidationResult.Invalid(Strings.UploadPackage_LicenseNodeValueTooLong);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -2444,15 +2444,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to License files are not yet supported..\n- /// </summary>\n- public static string UploadPackage_LicenseFilesAreNotAllowed {\n- get {\n- return ResourceManager.GetString(\"UploadPackage_LicenseFilesAreNotAllowed\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to The license file cannot be longer than {0}..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1053,9 +1053,6 @@ The {1} Team</value>\n<value>Unsupported license type '{0}'.</value>\n<comment>{0} is the license type read from the nuspec</comment>\n</data>\n- <data name=\"UploadPackage_LicenseFilesAreNotAllowed\" xml:space=\"preserve\">\n- <value>License files are not yet supported.</value>\n- </data>\n<data name=\"UploadPackage_DeprecationUrlRequiredForLicenseExpressions\" xml:space=\"preserve\">\n<value>To provide a better experience for older clients when a license expression is specified, <licenseUrl> must be set to '{0}'.</value>\n<comment>{0} is the licenses.nuget.org link with license expression</comment>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"PackageDelete.StatisticsUpdateFrequencyInHours\" value=\"\"/>\n<add key=\"PackageDelete.HourLimitWithMaximumDownloads\" value=\"\"/>\n<add key=\"PackageDelete.MaximumDownloadsForPackageVersion\" value=\"\"/>\n- <add key=\"Gallery.RejectPackagesWithLicense\" value=\"false\"/>\n<add key=\"Gallery.BlockLegacyLicenseUrl\" value=\"false\"/>\n<add key=\"Gallery.AllowLicenselessPackages\" value=\"true\"/>\n</appSettings>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs",
"diff": "@@ -866,58 +866,6 @@ private static Uri GetLicenseExpressionDeprecationUrl(string licenseExpression)\nreturn new Uri(string.Format(\"https://licenses.nuget.org/{0}\", licenseExpression));\n}\n- private static string[] LicenseNodeVariants => new string[]\n- {\n- \"<license/>\",\n- \"<license></license>\",\n- \"<license> </license>\",\n- \"<license>ttt</license>\",\n- \"<license type='file'>fff</license>\",\n- \"<license type='expression'>ee</license>\",\n- \"<license type='foobar'>ttt</license>\",\n- \"<license type='file'><someChildNode /></license>\",\n- \"<license type='file' version='1.0.0'>fff</license>\",\n- \"<license type='expression' version='1.0.0'>ee</license>\",\n- \"<license type='foobar' version='1.0.0'>ttt</license>\",\n- \"<license type='file' version='1.0.0'><someChildNode /></license>\",\n- \"<license type='file' version='2.0.0'>fff</license>\",\n- \"<license type='expression' version='2.0.0'>ee</license>\",\n- \"<license type='foobar' version='2.0.0'>ttt</license>\",\n- \"<license type='file' version='2.0.0'><someChildNode /></license>\",\n- };\n-\n- public static IEnumerable<object[]> RejectsLicensedPackagesWhenConfigured_Input =>\n- from licenseNode in LicenseNodeVariants\n- select new object[] { licenseNode, true, false };\n-\n- [Theory]\n- [MemberData(nameof(RejectsLicensedPackagesWhenConfigured_Input))]\n- public async Task RejectsLicensedPackagesWhenConfigured(string licenseNode, bool rejectPackagesWithLicense, bool expectedSuccess)\n- {\n- _config\n- .SetupGet(x => x.RejectPackagesWithLicense)\n- .Returns(rejectPackagesWithLicense);\n- _nuGetPackage = GeneratePackageWithUserContent(getCustomNuspecNodes: () => licenseNode);\n-\n- var result = await _target.ValidateBeforeGeneratePackageAsync(\n- _nuGetPackage.Object,\n- GetPackageMetadata(_nuGetPackage),\n- _currentUser);\n-\n- if (expectedSuccess)\n- {\n- Assert.Equal(PackageValidationResultType.Accepted, result.Type);\n- Assert.Null(result.Message);\n- Assert.Empty(result.Warnings);\n- }\n- else\n- {\n- Assert.Equal(PackageValidationResultType.Invalid, result.Type);\n- Assert.Contains(\"license\", result.Message.PlainTextMessage);\n- Assert.Empty(result.Warnings);\n- }\n- }\n-\n[Fact]\npublic async Task RejectsLongLicenses()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Removed the "RejectPackagesWithLicense" configuration option. (#7290) |
455,736 | 25.06.2019 12:04:30 | 25,200 | 00c15cd01e5a8993d70ca180ffc5a8d1470b0e5a | Fix overlap in stats chart title
Address | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1652,6 +1652,9 @@ img.reserved-indicator-icon {\n.page-stats-per-package #stats-graph-svg .bartext {\nfont-size: 1em;\n}\n+.page-stats-per-package #stats-graph-svg body {\n+ background-color: transparent;\n+}\n.page-stats-per-package #stats-graph-svg p {\nmargin-bottom: none;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-statistics-per-package.less",
"new_path": "src/Bootstrap/less/theme/page-statistics-per-package.less",
"diff": "}\n}\n-\n.long {\ntext {\nfont-size: .8em;\nfont-size: 1em;\n}\n+ body {\n+ background-color: transparent;\n+ }\n+\np {\nmargin-bottom: none;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/stats-perpackagestatsgraphs.js",
"new_path": "src/NuGetGallery/Scripts/gallery/stats-perpackagestatsgraphs.js",
"diff": "svg.append(\"foreignObject\")\n.attr(\"x\", \"1.71em\")\n- .attr(\"y\", -10)\n+ .attr(\"y\", -30)\n.attr(\"width\", width - 20 + \"px\")\n.attr(\"height\", \"2em\")\n.attr(\"font-weight\", \"bold\")\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix overlap in stats chart title (#7302)
Address https://github.com/NuGet/NuGetGallery/issues/7286 |
455,737 | 25.06.2019 16:41:03 | 25,200 | 0241e0c1f1f6c1b8b98530dcb5f1c53ea7477d3d | Update GalleryConfiguration to consume updated IAppConfiguration. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Configuration/GalleryConfiguration.cs",
"new_path": "src/AccountDeleter/Configuration/GalleryConfiguration.cs",
"diff": "@@ -93,5 +93,6 @@ public class GalleryConfiguration : IAppConfiguration\npublic int SearchHttpClientTimeoutInMilliseconds { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic MailAddress GalleryOwner { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic MailAddress GalleryNoReplyAddress { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n+ public string SqlReadOnlyReplicaConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update GalleryConfiguration to consume updated IAppConfiguration. (#7304) |
455,751 | 26.06.2019 09:31:49 | 25,200 | 06a528c40f67d96d9bcf472bf6ffc059d8d54678 | Clean orphan package registration on user delete
Clean orphan package registration on user delete | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/AccountManagement/DeleteAccountService.cs",
"new_path": "src/NuGetGallery.Services/AccountManagement/DeleteAccountService.cs",
"diff": "@@ -203,21 +203,24 @@ private async Task RemoveReservedNamespaces(User user)\nprivate async Task RemovePackageOwnership(User user, User requestingUser, AccountDeletionOrphanPackagePolicy orphanPackagePolicy)\n{\n- foreach (var package in GetPackagesOwnedByUser(user))\n+ foreach (var packageRegistration in GetPackageRegistrationsOwnedByUser(user))\n{\n- if (_packageService.WillPackageBeOrphanedIfOwnerRemoved(package.PackageRegistration, user))\n+ if (_packageService.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, user))\n{\nif (orphanPackagePolicy == AccountDeletionOrphanPackagePolicy.DoNotAllowOrphans)\n{\n- throw new InvalidOperationException($\"Deleting user '{user.Username}' will make package '{package.PackageRegistration.Id}' an orphan, but no orphans were expected.\");\n+ throw new InvalidOperationException($\"Deleting user '{user.Username}' will make package '{packageRegistration.Id}' an orphan, but no orphans were expected.\");\n}\nelse if (orphanPackagePolicy == AccountDeletionOrphanPackagePolicy.UnlistOrphans)\n+ {\n+ foreach (var package in packageRegistration.Packages)\n{\nawait _packageUpdateService.MarkPackageUnlistedAsync(package, commitChanges: false, updateIndex: false);\n}\n}\n+ }\n- await _packageOwnershipManagementService.RemovePackageOwnerAsync(package.PackageRegistration, requestingUser, user, commitChanges: false);\n+ await _packageOwnershipManagementService.RemovePackageOwnerAsync(packageRegistration, requestingUser, user, commitChanges: false);\n}\n}\n@@ -232,10 +235,10 @@ private void RemovePackagePushedBy(User user)\n}\n}\n- private List<Package> GetPackagesOwnedByUser(User user)\n+ private List<PackageRegistration> GetPackageRegistrationsOwnedByUser(User user)\n{\nreturn _packageService\n- .FindPackagesByAnyMatchingOwner(user, includeUnlisted: true, includeVersions: true)\n+ .FindPackageRegistrationsByOwner(user)\n.ToList();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageService.cs",
"diff": "@@ -386,9 +386,14 @@ public async Task RemovePackageOwnerAsync(PackageRegistration package, User user\n}\n}\n- public bool WillPackageBeOrphanedIfOwnerRemoved(PackageRegistration package, User ownerToRemove)\n+ public bool WillPackageBeOrphanedIfOwnerRemoved(PackageRegistration packageRegistration, User ownerToRemove)\n{\n- return WillPackageBeOrphanedIfOwnerRemovedHelper(package.Owners, ownerToRemove);\n+ // If the registration has no packages, no packages will be orphaned if the owner is removed.\n+ if (!packageRegistration.Packages.Any())\n+ {\n+ return false;\n+ }\n+ return WillPackageBeOrphanedIfOwnerRemovedHelper(packageRegistration.Owners, ownerToRemove);\n}\nprivate bool WillPackageBeOrphanedIfOwnerRemovedHelper(IEnumerable<User> owners, User ownerToRemove)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/DeleteAccountServiceFacts.cs",
"diff": "@@ -389,6 +389,56 @@ public async Task FailsWhenFeatureFlagsRemovalFails()\nAssert.Contains(\"An exception was encountered while trying to delete the account 'TestsUser'\", result.Description);\n}\n+ /// <summary>\n+ /// An user that does not own any package but owns a registration will have the registration cleaned after deletion.\n+ /// </summary>\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public async Task DeleteUserThatOwnsOrphanRegistrationWillCleanTheRegistration(bool multipleOwners)\n+ {\n+ // Arrange\n+ PackageRegistration registration = null;\n+ var testUser = CreateTestUserWithRegistration(ref registration);\n+ var newOwner = new User(\"newOwner\");\n+ newOwner.EmailAddress = \"[email protected]\";\n+ if (multipleOwners)\n+ {\n+ registration.Owners.Add(newOwner);\n+ }\n+\n+ var testableService = new DeleteAccountTestService(testUser, registration);\n+ var deleteAccountService = testableService.GetDeleteAccountService(isPackageOrphaned: true);\n+\n+ // Act\n+ await deleteAccountService.DeleteAccountAsync(\n+ userToBeDeleted: testUser,\n+ userToExecuteTheDelete: testUser,\n+ orphanPackagePolicy: AccountDeletionOrphanPackagePolicy.UnlistOrphans);\n+\n+ // Assert\n+ if (multipleOwners)\n+ {\n+ Assert.Contains<User>(newOwner, registration.Owners);\n+ Assert.Equal(1, registration.Owners.Count());\n+ }\n+ else\n+ {\n+ Assert.Empty(registration.Owners);\n+ }\n+ }\n+\n+\n+ private static User CreateTestUserWithRegistration(ref PackageRegistration registration)\n+ {\n+ var testUser = new User(\"TestUser\") { Key = Key++ };\n+ testUser.EmailAddress = \"[email protected]\";\n+ registration = new PackageRegistration();\n+ registration.Id = \"TestRegistration\";\n+ registration.Owners.Add(testUser);\n+ return testUser;\n+ }\n+\nprivate static User CreateTestUser(ref PackageRegistration registration)\n{\nvar testUser = new User(\"TestUser\") { Key = Key++ };\n@@ -756,6 +806,12 @@ private Mock<IPackageService> SetupPackageService(bool isPackageOrphaned)\nif (_user != null)\n{\npackageService.Setup(m => m.FindPackagesByAnyMatchingOwner(_user, true, It.IsAny<bool>())).Returns(_userPackages);\n+ var packageRegistraionList = new List<PackageRegistration>();\n+ if(_userPackagesRegistration != null)\n+ {\n+ packageRegistraionList.Add(_userPackagesRegistration);\n+ }\n+ packageService.Setup(m => m.FindPackageRegistrationsByOwner(_user)).Returns(packageRegistraionList.AsQueryable());\n}\npackageService\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1906,25 +1906,28 @@ public void WillBeOrphaned(OwnershipState state, AccountToDelete accountToDelete\n}\n// Configure package ownership\n- var package = new PackageRegistration() { Key = 4 };\n+ var package = new Package();\n+ var packageRegistration = new PackageRegistration() { Key = 4 };\n+ packageRegistration.Packages.Add(package);\n+\nif (state.HasFlag(OwnershipState.OwnedByUser1))\n{\n- package.Owners.Add(user1);\n+ packageRegistration.Owners.Add(user1);\n}\nif (state.HasFlag(OwnershipState.OwnedByUser2))\n{\n- package.Owners.Add(user2);\n+ packageRegistration.Owners.Add(user2);\n}\nif (state.HasFlag(OwnershipState.OwnedByOrganization1))\n{\n- package.Owners.Add(organization1);\n+ packageRegistration.Owners.Add(organization1);\n}\nif (state.HasFlag(OwnershipState.OwnedByOrganization2))\n{\n- package.Owners.Add(organization2);\n+ packageRegistration.Owners.Add(organization2);\n}\n// Determine expected result and account to delete\n@@ -1985,12 +1988,30 @@ public void WillBeOrphaned(OwnershipState state, AccountToDelete accountToDelete\n// Delete account\nvar service = CreateService();\n- var result = service.WillPackageBeOrphanedIfOwnerRemoved(package, userToDelete);\n+ var result = service.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, userToDelete);\n// Assert expected result\nAssert.Equal(expectedResult, result);\n}\n+ [Fact]\n+ public void APackageIdThatHasOnlyARegistrationCannotBeOrphaned()\n+ {\n+ // Create users to test\n+ var user = new User(\"testUser\") { Key = 0 };\n+\n+ // Configure package registration ownership\n+ var packageRegistration = new PackageRegistration() { Key = 1 };\n+ packageRegistration.Owners.Add(user);\n+\n+ // Delete account\n+ var service = CreateService();\n+ var result = service.WillPackageBeOrphanedIfOwnerRemoved(packageRegistration, user);\n+\n+ // Assert expected result\n+ Assert.False(result);\n+ }\n+\nprivate void AddMemberToOrganization(Organization organization, User member)\n{\nvar membership = new Membership() { Member = member, Organization = organization };\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Clean orphan package registration on user delete (#7299)
Clean orphan package registration on user delete |
455,737 | 27.06.2019 16:05:47 | 25,200 | 39740158a8718c50b689d54917b202fbb631309e | Move TelemetryService.cs implementation. | [
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Infrastructure/MessageQueue.cs",
"new_path": "src/NuGetGallery.Core/Infrastructure/MessageQueue.cs",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Infrastructure\\Mail\\Messages\\SymbolPackageAddedMessage.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\SymbolPackageValidationFailedMessage.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\SymbolPackageValidationTakingTooLongMessage.cs\" />\n+ <Compile Include=\"Infrastructure\\MessageQueue.cs\" />\n<Compile Include=\"Infrastructure\\TableErrorLog.cs\" />\n<Compile Include=\"Authentication\\NuGetClaims.cs\" />\n<Compile Include=\"PackageMetadataExtensions.cs\" />\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/DiagnosticsService.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/DiagnosticsService.cs",
"diff": "@@ -27,7 +27,7 @@ public IDiagnosticsSource GetSource(string name)\n{\nif (String.IsNullOrEmpty(name))\n{\n- throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, Strings.ParameterCannotBeNullOrEmpty, \"name\"), nameof(name));\n+ throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, ServicesStrings.ParameterCannotBeNullOrEmpty, \"name\"), nameof(name));\n}\nreturn new TraceDiagnosticsSource(name, _telemetryClient);\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/ElmahHandleErrorAttribute.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/ElmahHandleErrorAttribute.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/PerfCounters.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/PerfCounters.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/PerfEvent.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/PerfEvent.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/ProcessPerfEvents.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/ProcessPerfEvents.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/SendErrorsToTelemetryAttribute.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/SendErrorsToTelemetryAttribute.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/TraceDiagnosticsSource.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/TraceDiagnosticsSource.cs",
"diff": "@@ -63,7 +63,7 @@ public virtual void TraceEvent(TraceEventType type, int id, string message, [Cal\n}\nif (String.IsNullOrEmpty(message))\n{\n- throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, Strings.ParameterCannotBeNullOrEmpty, nameof(message)), nameof(message));\n+ throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, ServicesStrings.ParameterCannotBeNullOrEmpty, nameof(message)), nameof(message));\n}\n_source.TraceEvent(type, id, FormatMessage(message, member, file, line));\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Diagnostics/TraceDiagnosticsSourceScope.cs",
"new_path": "src/NuGetGallery.Services/Diagnostics/TraceDiagnosticsSourceScope.cs",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<Compile Include=\"Configuration\\LoginDiscontinuationConfiguration.cs\" />\n<Compile Include=\"Configuration\\SymbolsConfiguration.cs\" />\n<Compile Include=\"Configuration\\TyposquattingConfiguration.cs\" />\n+ <Compile Include=\"Diagnostics\\DiagnosticsService.cs\" />\n+ <Compile Include=\"Diagnostics\\ElmahHandleErrorAttribute.cs\" />\n+ <Compile Include=\"Diagnostics\\PerfCounters.cs\" />\n+ <Compile Include=\"Diagnostics\\PerfEvent.cs\" />\n+ <Compile Include=\"Diagnostics\\ProcessPerfEvents.cs\" />\n+ <Compile Include=\"Diagnostics\\SendErrorsToTelemetryAttribute.cs\" />\n+ <Compile Include=\"Diagnostics\\TraceDiagnosticsSource.cs\" />\n+ <Compile Include=\"Diagnostics\\TraceDiagnosticsSourceScope.cs\" />\n<Compile Include=\"Extensions\\Base32Encoder.cs\" />\n<Compile Include=\"Extensions\\ClaimsExtensions.cs\" />\n<Compile Include=\"Extensions\\CredentialExtensions.cs\" />\n<Compile Include=\"Telemetry\\Obfuscator.cs\" />\n<Compile Include=\"Telemetry\\QuietLog.cs\" />\n<Compile Include=\"Telemetry\\TelemetryClientWrapper.cs\" />\n+ <Compile Include=\"Telemetry\\TelemetryService.cs\" />\n<Compile Include=\"Telemetry\\UserPackageDeleteEvent.cs\" />\n<Compile Include=\"Telemetry\\UserPackageDeleteOutcome.cs\" />\n<Compile Include=\"UserManagement\\IUserService.cs\" />\n<PackageReference Include=\"NuGet.Services.Logging\">\n<Version>2.50.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"NuGet.StrongName.WebBackgrounder\">\n+ <Version>0.2.0</Version>\n+ </PackageReference>\n<PackageReference Include=\"System.Runtime\">\n<Version>4.3.1</Version>\n</PackageReference>\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/TelemetryService.cs",
"diff": "@@ -211,7 +211,7 @@ public TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient\n}\n// Used by ODataQueryVerifier. Should consider refactoring to make this non-static.\n- internal TelemetryService() : this(new DiagnosticsService(), TelemetryClientWrapper.Instance)\n+ public TelemetryService() : this(new DiagnosticsService(), TelemetryClientWrapper.Instance)\n{\n}\n@@ -469,7 +469,7 @@ public void TrackRequiredSignerSet(string packageId)\n{\nif (string.IsNullOrEmpty(packageId))\n{\n- throw new ArgumentException(Strings.ArgumentCannotBeNullOrEmpty, nameof(packageId));\n+ throw new ArgumentException(ServicesStrings.ArgumentCannotBeNullOrEmpty, nameof(packageId));\n}\nTrackMetric(Events.PackageRegistrationRequiredSignerSet, 1, properties => {\n@@ -530,7 +530,7 @@ private void TrackMetricForCertificateActivity(string eventName, string thumbpri\n{\nif (string.IsNullOrEmpty(thumbprint))\n{\n- throw new ArgumentException(Strings.ArgumentCannotBeNullOrEmpty, nameof(thumbprint));\n+ throw new ArgumentException(ServicesStrings.ArgumentCannotBeNullOrEmpty, nameof(thumbprint));\n}\nTrackMetric(eventName, 1, properties => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Queries\\AutocompleteServiceQuery.cs\" />\n<Compile Include=\"Queries\\IAutocompletePackageVersionsQuery.cs\" />\n<Compile Include=\"Queries\\IAutocompletePackageIdsQuery.cs\" />\n- <Compile Include=\"Diagnostics\\TraceDiagnosticsSourceScope.cs\" />\n<Compile Include=\"Configuration\\IGalleryConfigurationService.cs\" />\n<Compile Include=\"Configuration\\IPackageDeleteConfiguration.cs\" />\n<Compile Include=\"Configuration\\IServiceBusConfiguration.cs\" />\n<Compile Include=\"Controllers\\AccountsController.cs\" />\n<Compile Include=\"Controllers\\NuGetContext.cs\" />\n<Compile Include=\"Controllers\\OrganizationsController.cs\" />\n- <Compile Include=\"Diagnostics\\ElmahHandleErrorAttribute.cs\" />\n<Compile Include=\"Extensions\\DateTimeExtensions.cs\" />\n<Compile Include=\"Controllers\\ODataV1FeedController.cs\" />\n<Compile Include=\"Controllers\\ODataV2CuratedFeedController.cs\" />\n<Compile Include=\"Controllers\\ODataV2FeedController.cs\" />\n- <Compile Include=\"Diagnostics\\PerfCounters.cs\" />\n- <Compile Include=\"Diagnostics\\ProcessPerfEvents.cs\" />\n<Compile Include=\"App_Start\\OwinStartup.cs\" />\n<Compile Include=\"Areas\\Admin\\DynamicData\\OrderedFieldGenerator.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\LuceneController.cs\" />\n<Compile Include=\"OData\\QueryInterceptors\\ODataRemoveSorter.cs\" />\n<Compile Include=\"OData\\SearchService\\SearchAdaptorResult.cs\" />\n<Compile Include=\"OData\\SearchService\\SearchHijacker.cs\" />\n- <Compile Include=\"Diagnostics\\DiagnosticsService.cs\" />\n- <Compile Include=\"Diagnostics\\PerfEvent.cs\" />\n- <Compile Include=\"Diagnostics\\SendErrorsToTelemetryAttribute.cs\" />\n<Compile Include=\"Extensions\\NumberExtensions.cs\">\n<SubType>Code</SubType>\n</Compile>\n<Compile Include=\"Helpers\\HostMachine.cs\" />\n<Compile Include=\"Infrastructure\\DependencyResolverServiceProviderAdapter.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\CloudDownloadCountServiceRefreshJob.cs\" />\n- <Compile Include=\"Infrastructure\\MessageQueue.cs\" />\n- <Compile Include=\"Diagnostics\\TraceDiagnosticsSource.cs\" />\n<Compile Include=\"UrlHelperExtensions.cs\" />\n<Compile Include=\"ViewModels\\AddOrganizationViewModel.cs\" />\n<Compile Include=\"ViewModels\\AddPackageOwnerViewModel.cs\" />\n<Compile Include=\"Services\\ISourceDestinationRedirectPolicy.cs\" />\n<Compile Include=\"Services\\NoLessSecureDestinationRedirectPolicy.cs\" />\n<Compile Include=\"Services\\ReflowPackageService.cs\" />\n- <Compile Include=\"Services\\TelemetryService.cs\" />\n<Compile Include=\"ViewModels\\ManageOrganizationsItemViewModel.cs\" />\n<Compile Include=\"ViewModels\\ManageOrganizationsViewModel.cs\" />\n<Compile Include=\"ViewModels\\ChangeEmailViewModel.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Move TelemetryService.cs implementation. |
455,737 | 28.06.2019 15:17:28 | 25,200 | 4cdf1d0ed86bd3e812a13aba534e481e4444c949 | Add recaptcha to Contact page. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PagesController.cs",
"diff": "@@ -74,6 +74,7 @@ public virtual ActionResult Downloads()\n[HttpPost]\n[UIAuthorize]\n[ValidateAntiForgeryToken]\n+ [ValidateRecaptchaResponse]\npublic virtual async Task<ActionResult> Contact(ContactSupportViewModel contactForm)\n{\nif (!ModelState.IsValid)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Contact.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Contact.cshtml",
"diff": "@Html.ShowValidationMessagesFor(m => m.CopySender)\n</div>\n<div class=\"form-group\">\n- <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Contact\" title=\"Contact Support\" />\n+ <input id=\"Submit\" type=\"submit\" class=\"btn btn-primary form-control\" value=\"Contact\" title=\"Contact Support\" />\n</div>\n</fieldset>\n}\n$(\"#emailUs\").append(link);\n});\n</script>\n+ @ViewHelpers.RecatpchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add recaptcha to Contact page. (#7306) |
455,736 | 28.06.2019 17:10:34 | 25,200 | 1c11e12266c97d57a4bc0bec022c001fdba3dc14 | [Hotfix] Update to Application Insights 2.3.0
Address | [
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"new_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"new_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n- <Version>9.0.1</Version>\n+ <Version>10.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Build.Tasks.Pack\">\n<Version>4.8.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Version>2.49.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.AspNet.Mvc\">\n- <Version>5.2.3</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.Mvc\">\n<Version>5.2.3</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"System.Runtime\">\n<Version>4.3.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.Agent.Intercept\">\n- <Version>2.0.6</Version>\n+ <Version>2.0.7</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.DependencyCollector\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.PerfCounterCollector\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.TraceListener\">\n<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.Web\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.WindowsServer\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.DynamicData.EFProvider\">\n<Version>6.0.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientInformationTelemetryEnricher.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientInformationTelemetryEnricher.cs",
"diff": "@@ -19,20 +19,25 @@ public void Initialize(ITelemetry telemetry)\nvar httpContext = GetHttpContext();\nif (httpContext != null && httpContext.Request != null)\n{\n+ // Note that telemetry initializers can be called multiple times for the same telemetry item, so\n+ // these operations need to not fail if called again. In this particular case, Dictionary.Add\n+ // cannot be used since it will fail if the key already exists.\n+ // https://github.com/microsoft/ApplicationInsights-dotnet-server/issues/977\n+\n// ClientVersion is available for NuGet clients starting version 4.1.0-~4.5.0\n// Was deprecated and replaced by Protocol version\n- telemetry.Context.Properties.Add(\n- TelemetryService.ClientVersion,\n- httpContext.Request.Headers[ServicesConstants.ClientVersionHeaderName]);\n+ telemetry.Context.Properties[TelemetryService.ClientVersion]\n+ = httpContext.Request.Headers[ServicesConstants.ClientVersionHeaderName];\n- telemetry.Context.Properties.Add(\n- TelemetryService.ProtocolVersion,\n- httpContext.Request.Headers[ServicesConstants.NuGetProtocolHeaderName]);\n+ telemetry.Context.Properties[TelemetryService.ProtocolVersion]\n+ = httpContext.Request.Headers[ServicesConstants.NuGetProtocolHeaderName];\n- telemetry.Context.Properties.Add(TelemetryService.ClientInformation, httpContext.GetClientInformation());\n+ telemetry.Context.Properties[TelemetryService.ClientInformation]\n+ = httpContext.GetClientInformation();\n// Is the user authenticated or this is an anonymous request?\n- telemetry.Context.Properties.Add(TelemetryService.IsAuthenticated, httpContext.Request.IsAuthenticated.ToString());\n+ telemetry.Context.Properties[TelemetryService.IsAuthenticated]\n+ = httpContext.Request.IsAuthenticated.ToString();\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "</system.webServer>\n<runtime>\n<assemblyBinding xmlns=\"urn:schemas-microsoft-com:asm.v1\">\n- <dependentAssembly>\n- <assemblyIdentity name=\"NuGet.Services.Contracts\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-2.50.0.0\" newVersion=\"2.50.0.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Xml.XPath.XDocument\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.0.0\" newVersion=\"4.1.0.0\"/>\n<assemblyIdentity name=\"System.Xml.XDocument\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.11.0\" newVersion=\"4.0.11.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Xml.ReaderWriter\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.ValueTuple\" publicKeyToken=\"CC7B13FFCD2DDD51\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.2.0\" newVersion=\"4.0.2.0\"/>\n<assemblyIdentity name=\"System.Runtime.Numerics\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Runtime.InteropServices\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Runtime.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Runtime\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Resources.ResourceManager\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n<assemblyIdentity name=\"System.Reflection.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Reflection\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.ObjectModel\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.11.0\" newVersion=\"4.0.11.0\"/>\n<assemblyIdentity name=\"System.Net.NetworkInformation\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Net.Http\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Linq.Queryable\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n<assemblyIdentity name=\"System.Linq\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.IO\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.IO.Compression\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Globalization.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.0.0\" newVersion=\"4.1.0.0\"/>\n<assemblyIdentity name=\"System.Dynamic.Runtime\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.11.0\" newVersion=\"4.0.11.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Diagnostics.Tracing\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Diagnostics.Tools\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.2.0\" newVersion=\"4.0.2.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.ComponentModel.Annotations\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.1.0\" newVersion=\"4.2.1.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Extensions.DependencyInjection.Abstractions\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"MonAgentListener\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-33.1.0.0\" newVersion=\"33.1.0.0\"/>\n+ <assemblyIdentity name=\"System.Spatial\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"NuGet.Frameworks\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.0.0.1\" newVersion=\"5.0.0.1\"/>\n+ <assemblyIdentity name=\"System.ComponentModel.Annotations\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.1.0\" newVersion=\"4.2.1.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"NuGet.Versioning\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-5.0.0.1\" newVersion=\"5.0.0.1\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Autofac.Integration.Owin\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"NuGet.Frameworks\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.0.0.1\" newVersion=\"5.0.0.1\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Diagnostics.Tracing\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"Newtonsoft.Json\" publicKeyToken=\"30AD4FE6B2A6AEED\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-10.0.0.0\" newVersion=\"10.0.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Owin\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-3.0.1.0\" newVersion=\"3.0.1.0\"/>\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Web.Http\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"EntityFramework\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-6.0.0.0\" newVersion=\"6.0.0.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Net.Http.Primitives\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.2.29.0\" newVersion=\"4.2.29.0\"/>\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Xml.ReaderWriter\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Autofac\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.6.2.0\" newVersion=\"4.6.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.IO\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Runtime\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Security.Cryptography.X509Certificates\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Data.Edm\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.IdentityModel.Clients.ActiveDirectory.Platform\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-3.13.9.1126\" newVersion=\"3.13.9.1126\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Net.Http.Formatting\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Runtime.InteropServices\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Extensions.Logging.Abstractions\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Spatial\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Extensions.Logging\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Runtime.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.ApplicationInsights\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <assemblyIdentity name=\"Microsoft.Extensions.DependencyInjection.Abstractions\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.IO.Compression\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"Microsoft.Data.OData\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Data.OData\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <assemblyIdentity name=\"Microsoft.Data.Edm\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Newtonsoft.Json\" publicKeyToken=\"30AD4FE6B2A6AEED\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-10.0.0.0\" newVersion=\"10.0.0.0\"/>\n+ <assemblyIdentity name=\"System.Web.Http\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Net.Http.Formatting\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Web.Mvc\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Net.Http\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"Microsoft.ApplicationInsights\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-2.3.0.0\" newVersion=\"2.3.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Reflection\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ <assemblyIdentity name=\"EntityFramework\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-6.0.0.0\" newVersion=\"6.0.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Data.Services.Client\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.7.0.0\" newVersion=\"5.7.0.0\"/>\n+ <assemblyIdentity name=\"Autofac.Integration.Owin\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.IdentityModel.Clients.ActiveDirectory\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-3.13.9.1126\" newVersion=\"3.13.9.1126\"/>\n+ <assemblyIdentity name=\"Autofac\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.6.2.0\" newVersion=\"4.6.2.0\"/>\n</dependentAssembly>\n</assemblyBinding>\n</runtime>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [Hotfix] Update to Application Insights 2.3.0 (#7309)
Address https://github.com/NuGet/Engineering/issues/2527 |
455,736 | 01.07.2019 12:18:25 | 25,200 | 049c77749f811e307499c5bebafc3e8d072cf555 | Add A/B test content, flight, and telemetry
Add a config type to content object service to define test percentage
Add a flight to turn the whole thing off if necessary
Add telemetry when A/B tests are evaluated and when users are enrolled
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Telemetry/GalleryTelemetryService.cs",
"new_path": "src/AccountDeleter/Telemetry/GalleryTelemetryService.cs",
"diff": "@@ -17,6 +17,16 @@ public void TraceException(Exception exception)\nthrow new NotImplementedException();\n}\n+ public void TrackABTestEnrollmentInitialized(int schemaVersion, int previewSearchBucket)\n+ {\n+ throw new NotImplementedException();\n+ }\n+\n+ public void TrackABTestEvaluated(string name, bool isActive, bool isAuthenticated, int testBucket, int testPercentage)\n+ {\n+ throw new NotImplementedException();\n+ }\n+\npublic void TrackAccountDeletionCompleted(User deletedUser, User deletedBy, bool success)\n{\nthrow new NotImplementedException();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<Compile Include=\"Authentication\\IdentityInformation.cs\" />\n<Compile Include=\"Authentication\\NuGetScopes.cs\" />\n<Compile Include=\"Authentication\\V3Hasher.cs\" />\n+ <Compile Include=\"Configuration\\ABTestConfiguration.cs\" />\n<Compile Include=\"Configuration\\AppConfiguration.cs\" />\n<Compile Include=\"Configuration\\CertificatesConfiguration.cs\" />\n+ <Compile Include=\"Configuration\\IABTestConfiguration.cs\" />\n<Compile Include=\"Configuration\\IAppConfiguration.cs\" />\n<Compile Include=\"Configuration\\ICertificatesConfiguration.cs\" />\n<Compile Include=\"Configuration\\ILoginDiscontinuationConfiguration.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/ServicesConstants.cs",
"new_path": "src/NuGetGallery.Services/ServicesConstants.cs",
"diff": "@@ -40,6 +40,7 @@ public static class ContentNames\npublic static readonly string SymbolsConfiguration = \"Symbols-Configuration\";\npublic static readonly string TyposquattingConfiguration = \"Typosquatting-Configuration\";\npublic static readonly string NuGetPackagesGitHubDependencies = \"GitHubUsage.v1\";\n+ public static readonly string ABTestConfiguration = \"AB-Test-Configuration\";\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"new_path": "src/NuGetGallery.Services/Storage/ContentObjectService.cs",
"diff": "@@ -23,13 +23,15 @@ public ContentObjectService(IContentService contentService)\nCertificatesConfiguration = new CertificatesConfiguration();\nSymbolsConfiguration = new SymbolsConfiguration();\nTyposquattingConfiguration = new TyposquattingConfiguration();\n+ ABTestConfiguration = new ABTestConfiguration();\n}\n- public ILoginDiscontinuationConfiguration LoginDiscontinuationConfiguration { get; set; }\n- public ICertificatesConfiguration CertificatesConfiguration { get; set; }\n- public ISymbolsConfiguration SymbolsConfiguration { get; set; }\n- public ITyposquattingConfiguration TyposquattingConfiguration { get; set; }\n- public IGitHubUsageConfiguration GitHubUsageConfiguration { get; set; }\n+ public ILoginDiscontinuationConfiguration LoginDiscontinuationConfiguration { get; private set; }\n+ public ICertificatesConfiguration CertificatesConfiguration { get; private set; }\n+ public ISymbolsConfiguration SymbolsConfiguration { get; private set; }\n+ public ITyposquattingConfiguration TyposquattingConfiguration { get; private set; }\n+ public IGitHubUsageConfiguration GitHubUsageConfiguration { get; private set; }\n+ public IABTestConfiguration ABTestConfiguration { get; private set; }\npublic async Task Refresh()\n{\n@@ -54,6 +56,10 @@ public async Task Refresh()\nArray.Empty<RepositoryInformation>();\nGitHubUsageConfiguration = new GitHubUsageConfiguration(reposCache);\n+\n+ ABTestConfiguration =\n+ await Refresh<ABTestConfiguration>(ServicesConstants.ContentNames.ABTestConfiguration) ??\n+ new ABTestConfiguration();\n}\nprivate async Task<T> Refresh<T>(string contentName)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/IContentObjectService.cs",
"new_path": "src/NuGetGallery.Services/Storage/IContentObjectService.cs",
"diff": "@@ -14,6 +14,7 @@ public interface IContentObjectService\nISymbolsConfiguration SymbolsConfiguration { get; }\nITyposquattingConfiguration TyposquattingConfiguration { get; }\nIGitHubUsageConfiguration GitHubUsageConfiguration { get; }\n+ IABTestConfiguration ABTestConfiguration { get; }\nTask Refresh();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/ITelemetryService.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/ITelemetryService.cs",
"diff": "@@ -335,5 +335,29 @@ public interface ITelemetryService\nint oldHits,\nbool newSuccess,\nint newHits);\n+\n+ /// <summary>\n+ /// Track when an A/B test enrollment is initialized.\n+ /// </summary>\n+ /// <param name=\"schemaVersion\">The schema version.</param>\n+ /// <param name=\"previewSearchBucket\">The bucket for the preview search test.</param>\n+ void TrackABTestEnrollmentInitialized(\n+ int schemaVersion,\n+ int previewSearchBucket);\n+\n+ /// <summary>\n+ /// Track when an A/B test is evaluated.\n+ /// </summary>\n+ /// <param name=\"name\">The name of the A/B test.</param>\n+ /// <param name=\"isActive\">Whether or not the test evaluated to being active.</param>\n+ /// <param name=\"isAuthenticated\">Whether or not the user is authenticated.</param>\n+ /// <param name=\"testBucket\">The bucket the user is in.</param>\n+ /// <param name=\"testPercentage\">The percentage of users in the test.</param>\n+ void TrackABTestEvaluated(\n+ string name,\n+ bool isActive,\n+ bool isAuthenticated,\n+ int testBucket,\n+ int testPercentage);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/App_Data/Files/Content/AB-Test-Configuration.json",
"diff": "+{\n+ \"PreviewSearchPercentage\": 0\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"new_path": "src/NuGetGallery/App_Data/Files/Content/flags.json",
"diff": "\"SiteAdmins\": false,\n\"Accounts\": [],\n\"Domains\": []\n+ },\n+ \"NuGetGallery.ABTesting\": {\n+ \"All\": true,\n+ \"SiteAdmins\": false,\n+ \"Accounts\": [],\n+ \"Domains\": []\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Areas\\Admin\\Views\\Features\\_AddFeature.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\Features\\_AddFlight.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\Features\\_EditFlight.cshtml\" />\n+ <Content Include=\"App_Data\\Files\\Content\\AB-Test-Configuration.json\" />\n<None Include=\"Properties\\PublishProfiles\\nuget-staging-frontend.pubxml\" />\n<Content Include=\"Scripts\\gallery\\**\\*\" />\n<Content Include=\"Web.config\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/FeatureFlagService.cs",
"diff": "@@ -13,18 +13,17 @@ public class FeatureFlagService : IFeatureFlagService\n{\nprivate const string GalleryPrefix = \"NuGetGallery.\";\n- // Typosquatting detection\n- private const string TyposquattingFeatureName = GalleryPrefix + \"Typosquatting\";\n- private const string TyposquattingFlightName = GalleryPrefix + \"TyposquattingFlight\";\n+ private const string ABTestingFlightName = GalleryPrefix + \"ABTesting\";\nprivate const string EmbeddedIconFlightName = GalleryPrefix + \"EmbeddedIcons\";\n- private const string SearchSideBySideFlightName = GalleryPrefix + \"SearchSideBySide\";\nprivate const string GitHubUsageFlightName = GalleryPrefix + \"GitHubUsage\";\n-\n- private const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\n-\nprivate const string ManageDeprecationFeatureName = GalleryPrefix + \"ManageDeprecation\";\nprivate const string ManageDeprecationForManyVersionsFeatureName = GalleryPrefix + \"ManageDeprecationMany\";\nprivate const string ODataReadOnlyDatabaseFeatureName = GalleryPrefix + \"ODataReadOnlyDatabase\";\n+ private const string PackagesAtomFeedFeatureName = GalleryPrefix + \"PackagesAtomFeed\";\n+ private const string SearchCircuitBreakerFeatureName = GalleryPrefix + \"SearchCircuitBreaker\";\n+ private const string SearchSideBySideFlightName = GalleryPrefix + \"SearchSideBySide\";\n+ private const string TyposquattingFeatureName = GalleryPrefix + \"Typosquatting\";\n+ private const string TyposquattingFlightName = GalleryPrefix + \"TyposquattingFlight\";\nprivate readonly IFeatureFlagClient _client;\n@@ -88,5 +87,10 @@ public bool IsGitHubUsageEnabled(User user)\n{\nreturn _client.IsEnabled(GitHubUsageFlightName, user, defaultValue: false);\n}\n+\n+ public bool IsABTestingEnabled(User user)\n+ {\n+ return _client.IsEnabled(ABTestingFlightName, user, defaultValue: false);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"new_path": "src/NuGetGallery/Services/IFeatureFlagService.cs",
"diff": "@@ -58,5 +58,10 @@ public interface IFeatureFlagService\n/// Whether the OData controllers use the read-only replica.\n/// </summary>\nbool IsODataDatabaseReadOnlyEnabled();\n+\n+ /// <summary>\n+ /// Whether the user can participate in A/B tests.\n+ /// </summary>\n+ bool IsABTestingEnabled(User user);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System.Net.Http;\nusing System.Security.Principal;\nusing System.Web;\n-using System.Web.Helpers;\nusing Newtonsoft.Json;\nusing NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\n@@ -78,10 +77,12 @@ internal class Events\npublic const string SearchOnRetry = \"SearchOnRetry\";\npublic const string SearchSideBySideFeedback = \"SearchSideBySideFeedback\";\npublic const string SearchSideBySide = \"SearchSideBySide\";\n+ public const string ABTestEnrollmentInitialized = \"ABTestEnrollmentInitialized\";\n+ public const string ABTestEvaluated = \"ABTestEvaluated\";\n}\n- private IDiagnosticsSource _diagnosticsSource;\n- private ITelemetryClient _telemetryClient;\n+ private readonly IDiagnosticsSource _diagnosticsSource;\n+ private readonly ITelemetryClient _telemetryClient;\nprivate readonly JsonSerializerSettings _defaultJsonSerializerSettings = new JsonSerializerSettings\n{\n@@ -198,6 +199,14 @@ internal class Events\npublic const string HasComments = \"HasComments\";\npublic const string HasEmailAddress = \"HasEmailAddress\";\n+ // A/B testing properties\n+ public const string SchemaVersion = \"SchemaVersion\";\n+ public const string PreviewSearchBucket = \"PreviewSearchBucket\";\n+ public const string TestName = \"TestName\";\n+ public const string IsActive = \"IsActive\";\n+ public const string TestBucket = \"TestBucket\";\n+ public const string TestPercentage = \"TestPercentage\";\n+\npublic TelemetryService(IDiagnosticsService diagnosticsService, ITelemetryClient telemetryClient = null)\n{\nif (diagnosticsService == null)\n@@ -590,27 +599,6 @@ private static string GetApiKeyCreationDate(User user, IIdentity identity)\n});\n}\n- private void TrackMetricForPackage(\n- string metricName,\n- Package package,\n- User user,\n- IIdentity identity,\n- Action<Dictionary<string, string>> addProperties = null)\n- {\n- if (package == null)\n- {\n- throw new ArgumentNullException(nameof(package));\n- }\n-\n- TrackMetricForPackage(\n- metricName,\n- package.PackageRegistration.Id,\n- package.NormalizedVersion,\n- user,\n- identity,\n- addProperties);\n- }\n-\nprivate void TrackMetricForPackage(\nstring metricName,\nstring packageId,\n@@ -948,6 +936,32 @@ public void TrackMetricForSearchOnRetry(string searchName, Exception exception,\n});\n}\n+ public void TrackABTestEnrollmentInitialized(\n+ int schemaVersion,\n+ int previewSearchBucket)\n+ {\n+ TrackMetric(Events.ABTestEnrollmentInitialized, 1, properties => {\n+ properties.Add(SchemaVersion, schemaVersion.ToString());\n+ properties.Add(PreviewSearchBucket, previewSearchBucket.ToString());\n+ });\n+ }\n+\n+ public void TrackABTestEvaluated(\n+ string name,\n+ bool isActive,\n+ bool isAuthenticated,\n+ int testBucket,\n+ int testPercentage)\n+ {\n+ TrackMetric(Events.ABTestEvaluated, 1, properties => {\n+ properties.Add(TestName, name);\n+ properties.Add(IsActive, isActive.ToString());\n+ properties.Add(IsAuthenticated, isAuthenticated.ToString());\n+ properties.Add(TestBucket, testBucket.ToString());\n+ properties.Add(TestPercentage, testPercentage.ToString());\n+ });\n+ }\n+\n/// <summary>\n/// We use <see cref=\"ITelemetryClient.TrackMetric(string, double, IDictionary{string, string})\"/> instead of\n/// <see cref=\"ITelemetryClient.TrackEvent(string, IDictionary{string, string}, IDictionary{string, double})\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs",
"diff": "@@ -42,6 +42,10 @@ public void ObjectsHaveDefaultStateIfNotRefreshed()\nAssert.False(typosquattingConfiguration.IsCheckEnabled);\nAssert.False(typosquattingConfiguration.IsBlockUsersEnabled);\nAssert.Equal(TyposquattingConfiguration.DefaultPackageIdChecklistCacheExpireTimeInHours, typosquattingConfiguration.PackageIdChecklistCacheExpireTimeInHours);\n+\n+ var abTestConfiguration = service.ABTestConfiguration as ABTestConfiguration;\n+\n+ Assert.Equal(0, abTestConfiguration.PreviewSearchPercentage);\n}\n[Fact]\n@@ -61,9 +65,6 @@ public async Task RefreshRefreshesObject()\nvar alwaysEnabledForDomains = new[] { \"a\" };\nvar alwaysEnabledForEmailAddresses = new[] { \"b\" };\n- var packageIdChecklistLength = 20000;\n- var packageIdChecklistCacheExpireTimeInHours = 12.0;\n-\nvar certificatesConfiguration = new CertificatesConfiguration(\nisUIEnabledByDefault,\nalwaysEnabledForDomains,\n@@ -76,6 +77,9 @@ public async Task RefreshRefreshesObject()\nalwaysEnabledForEmailAddresses: alwaysEnabledForEmailAddresses);\nvar symbolsJson = JsonConvert.SerializeObject(symbolsConfiguration);\n+ var packageIdChecklistLength = 20000;\n+ var packageIdChecklistCacheExpireTimeInHours = 12.0;\n+\nvar typosquattingConfiguration = new TyposquattingConfiguration(\npackageIdChecklistLength: packageIdChecklistLength,\nisCheckEnabled: true,\n@@ -83,6 +87,12 @@ public async Task RefreshRefreshesObject()\npackageIdChecklistCacheExpireTimeInHours: packageIdChecklistCacheExpireTimeInHours);\nvar typosquattingJson = JsonConvert.SerializeObject(typosquattingConfiguration);\n+ var previewSearchPercentage = 2;\n+\n+ var abTestConfiguration = new ABTestConfiguration(\n+ previewSearchPercentage);\n+ var abTestJson = JsonConvert.SerializeObject(abTestConfiguration);\n+\nvar contentService = GetMock<IContentService>();\ncontentService\n@@ -101,6 +111,10 @@ public async Task RefreshRefreshesObject()\n.Setup(x => x.GetContentItemAsync(ServicesConstants.ContentNames.TyposquattingConfiguration, It.IsAny<TimeSpan>()))\n.Returns(Task.FromResult<IHtmlString>(new HtmlString(typosquattingJson)));\n+ contentService\n+ .Setup(x => x.GetContentItemAsync(ServicesConstants.ContentNames.ABTestConfiguration, It.IsAny<TimeSpan>()))\n+ .Returns(Task.FromResult<IHtmlString>(new HtmlString(abTestJson)));\n+\nvar service = GetService<ContentObjectService>();\n// Act\n@@ -110,6 +124,7 @@ public async Task RefreshRefreshesObject()\ncertificatesConfiguration = service.CertificatesConfiguration as CertificatesConfiguration;\nsymbolsConfiguration = service.SymbolsConfiguration as SymbolsConfiguration;\ntyposquattingConfiguration = service.TyposquattingConfiguration as TyposquattingConfiguration;\n+ abTestConfiguration = service.ABTestConfiguration as ABTestConfiguration;\n// Assert\nAssert.Equal(emails, loginDiscontinuationConfiguration.DiscontinuedForEmailAddresses);\n@@ -129,6 +144,8 @@ public async Task RefreshRefreshesObject()\nAssert.True(typosquattingConfiguration.IsCheckEnabled);\nAssert.True(typosquattingConfiguration.IsBlockUsersEnabled);\nAssert.Equal(packageIdChecklistCacheExpireTimeInHours, typosquattingConfiguration.PackageIdChecklistCacheExpireTimeInHours);\n+\n+ Assert.Equal(previewSearchPercentage, abTestConfiguration.PreviewSearchPercentage);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "@@ -288,6 +288,14 @@ public static IEnumerable<object[]> TrackMetricNames_Data\nyield return new object[] { \"SearchSideBySide\",\n(TrackAction)(s => s.TrackSearchSideBySide(\"nuget\", true, 1, true, 2))\n};\n+\n+ yield return new object[] { \"ABTestEnrollmentInitialized\",\n+ (TrackAction)(s => s.TrackABTestEnrollmentInitialized(1, 42))\n+ };\n+\n+ yield return new object[] { \"ABTestEvaluated\",\n+ (TrackAction)(s => s.TrackABTestEvaluated(\"SearchPreview\", true, true, 0, 20))\n+ };\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add A/B test content, flight, and telemetry (#7310)
Add a config type to content object service to define test percentage
Add a flight to turn the whole thing off if necessary
Add telemetry when A/B tests are evaluated and when users are enrolled
Progress on https://github.com/NuGet/NuGetGallery/issues/7166 |
455,736 | 01.07.2019 12:53:44 | 25,200 | 401bf8599dd4565b636b6af67672af5e50d2b0f2 | Add A/B test enrollment service and cookie
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -412,6 +412,8 @@ protected override void Load(ContainerBuilder builder)\nRegisterCookieComplianceService(builder, configuration, diagnosticsService);\n+ RegisterABTestServices(builder);\n+\nbuilder.RegisterType<MicrosoftTeamSubscription>()\n.AsSelf()\n.InstancePerLifetimeScope();\n@@ -433,6 +435,17 @@ protected override void Load(ContainerBuilder builder)\nbuilder.Populate(services);\n}\n+ private void RegisterABTestServices(ContainerBuilder builder)\n+ {\n+ builder\n+ .RegisterType<ABTestEnrollmentFactory>()\n+ .As<IABTestEnrollmentFactory>();\n+\n+ builder\n+ .RegisterType<CookieBasedABTestService>()\n+ .As<IABTestService>();\n+ }\n+\nprivate static void RegisterFeatureFlagsService(ContainerBuilder builder, ConfigurationService configuration)\n{\nbuilder\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Controllers\\ExperimentsController.cs\" />\n<Compile Include=\"Controllers\\ManageDeprecationJsonApiController.cs\" />\n<Compile Include=\"ExtensionMethods.cs\" />\n+ <Compile Include=\"Infrastructure\\ABTestEnrollment.cs\" />\n+ <Compile Include=\"Infrastructure\\ABTestEnrollmentState.cs\" />\n+ <Compile Include=\"Infrastructure\\ABTestEnrollmentFactory.cs\" />\n+ <Compile Include=\"Infrastructure\\CookieBasedABTestService.cs\" />\n+ <Compile Include=\"Infrastructure\\IABTestEnrollmentFactory.cs\" />\n+ <Compile Include=\"Infrastructure\\IABTestService.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\Correlation\\CorrelatingHttpClientHandler.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\Correlation\\WebApiCorrelationHandler.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\IIndexingJobFactory.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Controllers\\AccountsControllerFacts.cs\" />\n<Compile Include=\"Controllers\\OrganizationsControllerFacts.cs\" />\n<Compile Include=\"Controllers\\SupportControllerFacts.cs\" />\n+ <Compile Include=\"Infrastructure\\ABTestEnrollmentFactoryFacts.cs\" />\n+ <Compile Include=\"Infrastructure\\CookieBasedABTestServiceFacts.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\SearchPolicyFacts.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\ResilientSearchServiceFacts.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\GallerySearchServiceFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add A/B test enrollment service and cookie (#7311)
Progress on https://github.com/NuGet/NuGetGallery/issues/7166 |
455,736 | 01.07.2019 12:55:17 | 25,200 | 45eec66d923dc176d12cc6d2ecb71beb24c58149 | Integrate A/B test service with package search
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -68,6 +68,11 @@ public static class BindingKeys\npublic const string PreviewSearchClient = \"PreviewSearchClientBindingKey\";\n}\n+ public static class ParameterNames\n+ {\n+ public const string PackagesController_PreviewSearchService = \"previewSearchService\";\n+ }\n+\nprotected override void Load(ContainerBuilder builder)\n{\nvar services = new ServiceCollection();\n@@ -802,6 +807,14 @@ private static List<(string name, Uri searchUri)> GetPreviewSearchClientsFromCon\nc.Resolve<IMessageServiceConfiguration>()))\n.As<ISearchSideBySideService>()\n.InstancePerLifetimeScope();\n+\n+ builder\n+ .RegisterType<PackagesController>()\n+ .WithParameter(new ResolvedParameter(\n+ (pi, ctx) => pi.ParameterType == typeof(ISearchService) && pi.Name == ParameterNames.PackagesController_PreviewSearchService,\n+ (pi, ctx) => ctx.ResolveKeyed<ISearchService>(BindingKeys.PreviewSearchClient)))\n+ .As<PackagesController>()\n+ .InstancePerLifetimeScope();\n}\nprivate static void RegisterSearchService(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -90,6 +90,7 @@ public partial class PackagesController\nprivate readonly IPackageUpdateService _packageUpdateService;\nprivate readonly IPackageFileService _packageFileService;\nprivate readonly ISearchService _searchService;\n+ private readonly ISearchService _previewSearchService;\nprivate readonly IUploadFileService _uploadFileService;\nprivate readonly IUserService _userService;\nprivate readonly IEntitiesContext _entitiesContext;\n@@ -112,6 +113,7 @@ public partial class PackagesController\nprivate readonly ILicenseExpressionSplitter _licenseExpressionSplitter;\nprivate readonly IFeatureFlagService _featureFlagService;\nprivate readonly IPackageDeprecationService _deprecationService;\n+ private readonly IABTestService _abTestService;\npublic PackagesController(\nIPackageService packageService,\n@@ -120,6 +122,7 @@ public partial class PackagesController\nIUserService userService,\nIMessageService messageService,\nISearchService searchService,\n+ ISearchService previewSearchService,\nIPackageFileService packageFileService,\nIEntitiesContext entitiesContext,\nIAppConfiguration config,\n@@ -141,14 +144,16 @@ public partial class PackagesController\nICoreLicenseFileService coreLicenseFileService,\nILicenseExpressionSplitter licenseExpressionSplitter,\nIFeatureFlagService featureFlagService,\n- IPackageDeprecationService deprecationService)\n+ IPackageDeprecationService deprecationService,\n+ IABTestService abTestService)\n{\n_packageService = packageService;\n_packageUpdateService = packageUpdateService ?? throw new ArgumentNullException(nameof(packageUpdateService));\n_uploadFileService = uploadFileService;\n_userService = userService;\n_messageService = messageService;\n- _searchService = searchService;\n+ _searchService = searchService ?? throw new ArgumentNullException(nameof(searchService));\n+ _previewSearchService = previewSearchService ?? throw new ArgumentNullException(nameof(previewSearchService));\n_packageFileService = packageFileService;\n_entitiesContext = entitiesContext;\n_config = config;\n@@ -171,6 +176,7 @@ public partial class PackagesController\n_licenseExpressionSplitter = licenseExpressionSplitter ?? throw new ArgumentNullException(nameof(licenseExpressionSplitter));\n_featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));\n_deprecationService = deprecationService ?? throw new ArgumentNullException(nameof(deprecationService));\n+ _abTestService = abTestService ?? throw new ArgumentNullException(nameof(abTestService));\n}\n[HttpGet]\n@@ -980,8 +986,11 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\nSearchResults results;\n+ var isPreviewSearchEnabled = !string.IsNullOrEmpty(q) && _abTestService.IsPreviewSearchEnabled(GetCurrentUser());\n+ var searchService = isPreviewSearchEnabled ? _previewSearchService : _searchService;\n+\n// fetch most common query from cache to relieve load on the search service\n- if (string.IsNullOrEmpty(q) && page == 1 && includePrerelease)\n+ if (string.IsNullOrEmpty(q) && page == 1 && includePrerelease && !isPreviewSearchEnabled)\n{\nvar cachedResults = HttpContext.Cache.Get(\"DefaultSearchResults\");\nif (cachedResults == null)\n@@ -994,7 +1003,7 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\ncontext: SearchFilter.UISearchContext,\nsemVerLevel: SemVerLevelKey.SemVerLevel2);\n- results = await _searchService.Search(searchFilter);\n+ results = await searchService.Search(searchFilter);\n// note: this is a per instance cache\nHttpContext.Cache.Add(\n@@ -1021,7 +1030,7 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\ncontext: SearchFilter.UISearchContext,\nsemVerLevel: SemVerLevelKey.SemVerLevel2);\n- results = await _searchService.Search(searchFilter);\n+ results = await searchService.Search(searchFilter);\n}\nint totalHits = results.Hits;\n@@ -1040,7 +1049,8 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\npage - 1,\nGalleryConstants.DefaultPackageListPageSize,\nUrl,\n- includePrerelease);\n+ includePrerelease,\n+ isPreviewSearchEnabled);\nViewBag.SearchTerm = q;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageListViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageListViewModel.cs",
"diff": "@@ -20,7 +20,8 @@ public class PackageListViewModel\nint pageIndex,\nint pageSize,\nUrlHelper url,\n- bool includePrerelease)\n+ bool includePrerelease,\n+ bool isPreviewSearch)\n{\n// TODO: Implement actual sorting\nIEnumerable<ListPackageItemViewModel> items = packages.ToList().Select(pv => new ListPackageItemViewModel(pv, currentUser));\n@@ -41,6 +42,7 @@ public class PackageListViewModel\nLastResultIndex = FirstResultIndex + Items.Count() - 1;\nPager = pager;\nIncludePrerelease = includePrerelease;\n+ IsPreviewSearch = isPreviewSearch;\n}\npublic int FirstResultIndex { get; }\n@@ -62,5 +64,7 @@ public class PackageListViewModel\npublic DateTime? IndexTimestampUtc { get; }\npublic bool IncludePrerelease { get; }\n+\n+ public bool IsPreviewSearch { get; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "}\n<div class=\"list-packages\" role=\"list\">\n- @{ var itemIndex = Model.PageIndex * Model.PageSize; }\n+ @{\n+ var itemIndex = Model.PageIndex * Model.PageSize;\n+ var eventName = Model.IsPreviewSearch ? \"preview-search-selection\" : \"search-selection\";\n+ }\n@foreach (var package in Model.Items)\n{\n// Only set an item index when there is a search query, for now.\nvar thisItemIndex = string.IsNullOrWhiteSpace(Model.SearchTerm) ? null : (int?) itemIndex;\n- @Html.Partial(\"_ListPackage\", package, new ViewDataDictionary { { \"itemIndex\", thisItemIndex } })\n+ @Html.Partial(\"_ListPackage\", package, new ViewDataDictionary { { \"itemIndex\", thisItemIndex }, { \"eventName\", eventName } })\nitemIndex++;\n}\n</div>\nvar sincePageLoadCount = 0;\n@if (!string.IsNullOrWhiteSpace(Model.SearchTerm) && (Model.PageIndex == 0 || Model.Items.Count() > 0))\n{\n+ var category = Model.IsPreviewSearch ? \"preview-search-page\" : \"search-page\";\nvar action = Model.IncludePrerelease ? \"search-prerel\" : \"search-stable\";\n// Emit an event representing the search page and the page index. This make it easier for the search selection\n// event to be correlated in Google Analytics.\n<text>\n- window.nuget.sendAnalyticsEvent('search-page', '@action', @Html.Raw(Json.Encode(Model.SearchTerm)), @Model.PageIndex);\n+ window.nuget.sendAnalyticsEvent('@category', '@action', @Html.Raw(Json.Encode(Model.SearchTerm)), @Model.PageIndex);\nwindow.nuget.sendAiMetric('BrowserSearchPage', @Model.PageIndex, {\nSearchTerm: @Html.Raw(Json.Encode(Model.SearchTerm)),\nIncludePrerelease: '@Model.IncludePrerelease',\nPageIndex: @Model.PageIndex,\n- TotalCount: @Model.TotalCount\n+ TotalCount: @Model.TotalCount,\n+ IsPreviewSearch: '@Model.IsPreviewSearch'\n});\n</text>\n}\nPackageVersion: data.packageVersion,\nUseVersion: data.useVersion,\nSincePageLoadMs: Date.now() - pageLoadTime,\n- SincePageLoadCount: sincePageLoadCount\n+ SincePageLoadCount: sincePageLoadCount,\n+ IsPreviewSearch: '@Model.IsPreviewSearch'\n});\nsincePageLoadCount++;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections;\nusing System.Collections.Generic;\nusing System.Globalization;\nusing System.IO;\nusing System.Text;\nusing System.Threading.Tasks;\nusing System.Web;\n+using System.Web.Caching;\nusing System.Web.Mvc;\nusing System.Web.Routing;\nusing Moq;\n@@ -52,6 +54,7 @@ public class PackagesControllerFacts\nMock<HttpContextBase> httpContext = null,\nStream fakeNuGetPackage = null,\nMock<ISearchService> searchService = null,\n+ Mock<ISearchService> previewSearchService = null,\nException readPackageException = null,\nMock<IPackageFileService> packageFileService = null,\nMock<IEntitiesContext> entitiesContext = null,\n@@ -72,7 +75,8 @@ public class PackagesControllerFacts\nMock<ICoreLicenseFileService> coreLicenseFileService = null,\nMock<ILicenseExpressionSplitter> licenseExpressionSplitter = null,\nMock<IFeatureFlagService> featureFlagService = null,\n- Mock<IPackageDeprecationService> deprecationService = null)\n+ Mock<IPackageDeprecationService> deprecationService = null,\n+ Mock<IABTestService> abTestService = null)\n{\npackageService = packageService ?? new Mock<IPackageService>();\npackageUpdateService = packageUpdateService ?? new Mock<IPackageUpdateService>();\n@@ -85,8 +89,11 @@ public class PackagesControllerFacts\n}\nuserService = userService ?? new Mock<IUserService>();\nmessageService = messageService ?? new Mock<IMessageService>();\n+\nsearchService = searchService ?? new Mock<ISearchService>();\n+ previewSearchService = previewSearchService ?? new Mock<ISearchService>();\n+\nif (packageFileService == null)\n{\npackageFileService = new Mock<IPackageFileService>();\n@@ -197,7 +204,10 @@ public class PackagesControllerFacts\ndeprecationService = deprecationService ?? new Mock<IPackageDeprecationService>();\n+ abTestService = abTestService ?? new Mock<IABTestService>();\n+\nvar diagnosticsService = new Mock<IDiagnosticsService>();\n+\nvar controller = new Mock<PackagesController>(\npackageService.Object,\npackageUpdateService.Object,\n@@ -205,6 +215,7 @@ public class PackagesControllerFacts\nuserService.Object,\nmessageService.Object,\nsearchService.Object,\n+ previewSearchService.Object,\npackageFileService.Object,\nentitiesContext.Object,\nconfigurationService.Current,\n@@ -226,7 +237,8 @@ public class PackagesControllerFacts\ncoreLicenseFileService.Object,\nlicenseExpressionSplitter.Object,\nfeatureFlagService.Object,\n- deprecationService.Object);\n+ deprecationService.Object,\n+ abTestService.Object);\ncontroller.CallBase = true;\ncontroller.Object.SetOwinContextOverride(Fakes.CreateOwinContext());\n@@ -317,6 +329,30 @@ private static Mock<IPackageUploadService> GetValidPackageUploadService(string p\nreturn fakePackageUploadService;\n}\n+ public class TheConstructor\n+ : TestContainer\n+ {\n+ /// <summary>\n+ /// This test is to verify that the preview search service parameter name for the constructor has the\n+ /// expected value. This is necessary because the dependency injection configuration uses the parameter\n+ /// name to identify which search service should be preview implementation.\n+ /// </summary>\n+ [Fact]\n+ public void HasPreviewSearchServiceParameter()\n+ {\n+ var type = typeof(PackagesController);\n+\n+ var constructors = type.GetConstructors();\n+ var constructor = Assert.Single(constructors);\n+\n+ var parameters = constructor.GetParameters();\n+ var parameter = Assert.Single(\n+ parameters,\n+ p => p.Name == DefaultDependenciesModule.ParameterNames.PackagesController_PreviewSearchService);\n+ Assert.Equal(typeof(ISearchService), parameter.ParameterType);\n+ }\n+ }\n+\npublic class TheCancelVerifyPackageAction\n: TestContainer\n{\n@@ -3716,6 +3752,13 @@ public async Task WhenPackageRegistrationIsLockedReturns403(User currentUser, Us\npublic class TheListPackagesMethod\n: TestContainer\n{\n+ private readonly Cache _cache;\n+\n+ public TheListPackagesMethod()\n+ {\n+ _cache = new Cache();\n+ }\n+\n[Fact]\npublic async Task TrimsSearchTerm()\n{\n@@ -3770,6 +3813,83 @@ public async Task PassesPrerelParameterOnToSearchFilter(bool prerel)\nAssert.Equal(prerel, model.IncludePrerelease);\nsearchService.Verify(x => x.Search(It.Is<SearchFilter>(f => f.IncludePrerelease == prerel)));\n}\n+\n+ [Fact]\n+ public async Task UsesPreviewSearchServiceWhenABTestServiceSaysSo()\n+ {\n+ var abTestService = new Mock<IABTestService>();\n+ abTestService\n+ .Setup(x => x.IsPreviewSearchEnabled(It.IsAny<User>()))\n+ .Returns(true);\n+\n+ var searchService = new Mock<ISearchService>();\n+ var previewSearchService = new Mock<ISearchService>();\n+ previewSearchService\n+ .Setup(s => s.Search(It.IsAny<SearchFilter>()))\n+ .ReturnsAsync(() => new SearchResults(0, DateTime.UtcNow));\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ searchService: searchService,\n+ previewSearchService: previewSearchService,\n+ abTestService: abTestService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.ListPackages(new PackageListSearchViewModel { Q = \"test\", Prerel = true });\n+\n+ searchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Never);\n+ previewSearchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Once);\n+ abTestService.Verify(\n+ x => x.IsPreviewSearchEnabled(TestUtility.FakeUser),\n+ Times.Once);\n+ }\n+\n+ [Theory]\n+ [InlineData(null)]\n+ [InlineData(\"\")]\n+ [InlineData(\" \")]\n+ public async Task DoesNotUsePreviewSearchServiceForEmptyQuery(string q)\n+ {\n+ var abTestService = new Mock<IABTestService>();\n+ abTestService\n+ .Setup(x => x.IsPreviewSearchEnabled(It.IsAny<User>()))\n+ .Returns(true);\n+\n+ var httpContext = new Mock<HttpContextBase>();\n+ httpContext.Setup(c => c.Cache).Returns(_cache);\n+\n+ var searchService = new Mock<ISearchService>();\n+ searchService\n+ .Setup(s => s.Search(It.IsAny<SearchFilter>()))\n+ .ReturnsAsync(() => new SearchResults(0, DateTime.UtcNow));\n+ var previewSearchService = new Mock<ISearchService>();\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ httpContext: httpContext,\n+ searchService: searchService,\n+ previewSearchService: previewSearchService,\n+ abTestService: abTestService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.ListPackages(new PackageListSearchViewModel { Q = q, Prerel = true });\n+\n+ searchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Once);\n+ previewSearchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Never);\n+ abTestService.Verify(\n+ x => x.IsPreviewSearchEnabled(TestUtility.FakeUser),\n+ Times.Never);\n+ }\n+\n+ protected override void Dispose(bool disposing)\n+ {\n+ // Clear the cache to avoid test interaction.\n+ foreach (DictionaryEntry entry in _cache)\n+ {\n+ _cache.Remove((string)entry.Key);\n+ }\n+\n+ base.Dispose(disposing);\n+ }\n}\npublic class TheReportAbuseMethod\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Integrate A/B test service with package search (#7313)
Address https://github.com/NuGet/NuGetGallery/issues/7166 |
455,736 | 01.07.2019 09:50:38 | 25,200 | c2e5b1c4aa8677a87e70ddd11bad578d178c686d | Update to Application Insights 2.3.0
Address | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.ServiceBus\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Common.Job\">\n<Version>4.1.0-dev-2759568</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Version>4.1.0-master-2758883</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"new_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"new_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n- <Version>9.0.1</Version>\n+ <Version>10.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Build.Tasks.Pack\">\n<Version>4.8.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.49.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.Mvc\">\n<Version>5.2.3</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"System.Runtime\">\n<Version>4.3.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.Agent.Intercept\">\n- <Version>2.0.6</Version>\n+ <Version>2.0.7</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.DependencyCollector\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.PerfCounterCollector\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.TraceListener\">\n<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.Web\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.WindowsServer\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel\">\n- <Version>2.2.0</Version>\n+ <Version>2.3.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.AspNet.DynamicData.EFProvider\">\n<Version>6.0.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.50.0</Version>\n+ <Version>2.52.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/ClientInformationTelemetryEnricher.cs",
"new_path": "src/NuGetGallery/Telemetry/ClientInformationTelemetryEnricher.cs",
"diff": "@@ -19,20 +19,25 @@ public void Initialize(ITelemetry telemetry)\nvar httpContext = GetHttpContext();\nif (httpContext != null && httpContext.Request != null)\n{\n+ // Note that telemetry initializers can be called multiple times for the same telemetry item, so\n+ // these operations need to not fail if called again. In this particular case, Dictionary.Add\n+ // cannot be used since it will fail if the key already exists.\n+ // https://github.com/microsoft/ApplicationInsights-dotnet-server/issues/977\n+\n// ClientVersion is available for NuGet clients starting version 4.1.0-~4.5.0\n// Was deprecated and replaced by Protocol version\n- telemetry.Context.Properties.Add(\n- TelemetryService.ClientVersion,\n- httpContext.Request.Headers[ServicesConstants.ClientVersionHeaderName]);\n+ telemetry.Context.Properties[TelemetryService.ClientVersion]\n+ = httpContext.Request.Headers[ServicesConstants.ClientVersionHeaderName];\n- telemetry.Context.Properties.Add(\n- TelemetryService.ProtocolVersion,\n- httpContext.Request.Headers[ServicesConstants.NuGetProtocolHeaderName]);\n+ telemetry.Context.Properties[TelemetryService.ProtocolVersion]\n+ = httpContext.Request.Headers[ServicesConstants.NuGetProtocolHeaderName];\n- telemetry.Context.Properties.Add(TelemetryService.ClientInformation, httpContext.GetClientInformation());\n+ telemetry.Context.Properties[TelemetryService.ClientInformation]\n+ = httpContext.GetClientInformation();\n// Is the user authenticated or this is an anonymous request?\n- telemetry.Context.Properties.Add(TelemetryService.IsAuthenticated, httpContext.Request.IsAuthenticated.ToString());\n+ telemetry.Context.Properties[TelemetryService.IsAuthenticated]\n+ = httpContext.Request.IsAuthenticated.ToString();\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "</system.webServer>\n<runtime>\n<assemblyBinding xmlns=\"urn:schemas-microsoft-com:asm.v1\">\n- <dependentAssembly>\n- <assemblyIdentity name=\"NuGet.Services.Contracts\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-2.50.0.0\" newVersion=\"2.50.0.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Xml.XPath.XDocument\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.0.0\" newVersion=\"4.1.0.0\"/>\n<assemblyIdentity name=\"System.Xml.XDocument\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.11.0\" newVersion=\"4.0.11.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Xml.ReaderWriter\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.ValueTuple\" publicKeyToken=\"CC7B13FFCD2DDD51\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.2.0\" newVersion=\"4.0.2.0\"/>\n<assemblyIdentity name=\"System.Runtime.Numerics\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Runtime.InteropServices\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Runtime.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Runtime\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Resources.ResourceManager\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n<assemblyIdentity name=\"System.Reflection.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Reflection\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.ObjectModel\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.11.0\" newVersion=\"4.0.11.0\"/>\n<assemblyIdentity name=\"System.Net.NetworkInformation\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Net.Http\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Linq.Queryable\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n<assemblyIdentity name=\"System.Linq\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.IO\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.IO.Compression\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Globalization.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.1.0.0\" newVersion=\"4.1.0.0\"/>\n<assemblyIdentity name=\"System.Dynamic.Runtime\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.11.0\" newVersion=\"4.0.11.0\"/>\n</dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Diagnostics.Tracing\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Diagnostics.Tools\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.1.0\" newVersion=\"4.0.1.0\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.0.2.0\" newVersion=\"4.0.2.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.ComponentModel.Annotations\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.1.0\" newVersion=\"4.2.1.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Extensions.DependencyInjection.Abstractions\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"MonAgentListener\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-33.1.0.0\" newVersion=\"33.1.0.0\"/>\n+ <assemblyIdentity name=\"System.Spatial\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"NuGet.Frameworks\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.0.0.1\" newVersion=\"5.0.0.1\"/>\n+ <assemblyIdentity name=\"System.ComponentModel.Annotations\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.1.0\" newVersion=\"4.2.1.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"NuGet.Versioning\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-5.0.0.1\" newVersion=\"5.0.0.1\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Autofac.Integration.Owin\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"NuGet.Frameworks\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.0.0.1\" newVersion=\"5.0.0.1\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Diagnostics.Tracing\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"Newtonsoft.Json\" publicKeyToken=\"30AD4FE6B2A6AEED\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-10.0.0.0\" newVersion=\"10.0.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Owin\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-3.0.1.0\" newVersion=\"3.0.1.0\"/>\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Web.Http\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"EntityFramework\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-6.0.0.0\" newVersion=\"6.0.0.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Net.Http.Primitives\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-4.2.29.0\" newVersion=\"4.2.29.0\"/>\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Xml.ReaderWriter\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Autofac\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.6.2.0\" newVersion=\"4.6.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.IO\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Runtime\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Security.Cryptography.X509Certificates\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.1.0\" newVersion=\"4.1.1.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Data.Edm\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.IdentityModel.Clients.ActiveDirectory.Platform\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-3.13.9.1126\" newVersion=\"3.13.9.1126\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Net.Http.Formatting\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Runtime.InteropServices\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Extensions.Logging.Abstractions\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n</dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"System.Spatial\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n- </dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Extensions.Logging\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Runtime.Extensions\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n- </dependentAssembly>\n- <dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.ApplicationInsights\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <assemblyIdentity name=\"Microsoft.Extensions.DependencyInjection.Abstractions\" publicKeyToken=\"ADB9793829DDAE60\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-2.2.0.0\" newVersion=\"2.2.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.IO.Compression\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"Microsoft.Data.OData\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Data.OData\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <assemblyIdentity name=\"Microsoft.Data.Edm\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-5.8.4.0\" newVersion=\"5.8.4.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Newtonsoft.Json\" publicKeyToken=\"30AD4FE6B2A6AEED\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-10.0.0.0\" newVersion=\"10.0.0.0\"/>\n+ <assemblyIdentity name=\"System.Web.Http\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n+ </dependentAssembly>\n+ <dependentAssembly>\n+ <assemblyIdentity name=\"System.Net.Http.Formatting\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"System.Web.Mvc\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n<bindingRedirect oldVersion=\"0.0.0.0-5.2.3.0\" newVersion=\"5.2.3.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Net.Http\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n+ <assemblyIdentity name=\"Microsoft.ApplicationInsights\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-2.3.0.0\" newVersion=\"2.3.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"System.Reflection\" publicKeyToken=\"B03F5F7F11D50A3A\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-4.1.2.0\" newVersion=\"4.1.2.0\"/>\n+ <assemblyIdentity name=\"EntityFramework\" publicKeyToken=\"B77A5C561934E089\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-6.0.0.0\" newVersion=\"6.0.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.Data.Services.Client\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-5.7.0.0\" newVersion=\"5.7.0.0\"/>\n+ <assemblyIdentity name=\"Autofac.Integration.Owin\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.2.0.0\" newVersion=\"4.2.0.0\"/>\n</dependentAssembly>\n<dependentAssembly>\n- <assemblyIdentity name=\"Microsoft.IdentityModel.Clients.ActiveDirectory\" publicKeyToken=\"31BF3856AD364E35\" culture=\"neutral\"/>\n- <bindingRedirect oldVersion=\"0.0.0.0-3.13.9.1126\" newVersion=\"3.13.9.1126\"/>\n+ <assemblyIdentity name=\"Autofac\" publicKeyToken=\"17863AF14B0044DA\" culture=\"neutral\"/>\n+ <bindingRedirect oldVersion=\"0.0.0.0-4.6.2.0\" newVersion=\"4.6.2.0\"/>\n</dependentAssembly>\n</assemblyBinding>\n</runtime>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update to Application Insights 2.3.0 (#7307)
Address https://github.com/NuGet/Engineering/issues/2527 |
455,776 | 09.07.2019 15:43:21 | 25,200 | 6b06d9e71a311ca49c5dee8464e17c5a9cbdae7b | Small Deprecation fixes | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -882,6 +882,7 @@ img.reserved-indicator-icon {\njustify-content: space-between;\nvertical-align: middle;\nwidth: 100%;\n+ outline: none;\n}\n.page-package-details .deprecation-container .deprecation-expander .deprecation-expander-container {\ndisplay: -webkit-box;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-display-package.less",
"new_path": "src/Bootstrap/less/theme/page-display-package.less",
"diff": "justify-content: space-between;\nvertical-align: middle;\nwidth: 100%;\n+ outline: none;\n.deprecation-expander-container {\ndisplay: flex;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs",
"diff": "@@ -38,10 +38,10 @@ public partial class ManageDeprecationJsonApiController\npublic virtual JsonResult GetAlternatePackageVersions(string id)\n{\nvar versions = _packageService.FindPackagesById(id)\n- .Where(p => p.PackageStatusKey == PackageStatus.Available)\n+ .Where(p => p.PackageStatusKey == PackageStatus.Available && p.Listed)\n.Select(p => NuGetVersion.Parse(p.Version))\n.OrderByDescending(v => v)\n- .Select(v => v.ToFullString())\n+ .Select(v => v.ToNormalizedString())\n.ToList();\nreturn Json(HttpStatusCode.OK, versions, JsonRequestBehavior.AllowGet);\n@@ -164,6 +164,13 @@ public virtual JsonResult GetAlternatePackageVersions(string id)\n}\n}\n+ if (alternatePackage != null && packagesToUpdate.Any(p => p == alternatePackage))\n+ {\n+ return DeprecateErrorResponse(\n+ HttpStatusCode.BadRequest,\n+ Strings.DeprecatePackage_AlternateOfSelf);\n+ }\n+\nawait _deprecationService.UpdateDeprecation(\npackagesToUpdate,\nstatus,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-deprecation.js",
"diff": "@@ -75,6 +75,20 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n// The version chosen by the alternate package version dropdown.\nthis.chosenAlternatePackageVersion = ko.observable();\n+ this.isAlternateOfSelf = ko.pureComputed(function () {\n+ var alternateId = self.alternatePackageId();\n+ if (!alternateId) {\n+ return false;\n+ }\n+\n+ var alternateVersion = self.chosenAlternatePackageVersion();\n+ if (!alternateVersion || alternateVersion === strings_SelectAlternateVersionOption) {\n+ return false;\n+ }\n+\n+ var chosenVersions = self.dropdown.chosenItems();\n+ return alternateId === id && chosenVersions && chosenVersions.includes(alternateVersion);\n+ }, this);\n// The cached list of versions associated with the currently entered alternate package ID.\nthis.alternatePackageVersionsCached = ko.observableArray();\n@@ -92,13 +106,26 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n// The error to show with the currently entered alternate package ID.\n// E.g. the package does not exist or cannot be chosen as an alternate.\n- this.chosenAlternatePackageIdError = ko.observable();\n+ this.chosenAlternatePackageIdError = ko.pureComputed(function () {\n+ var serverError = self.chosenAlternatePackageIdServerError();\n+ if (serverError) {\n+ return serverError;\n+ }\n+\n+ if (self.isAlternateOfSelf()) {\n+ return \"A package cannot be the alternate package of itself. Please choose a different alternate package.\";\n+ }\n+\n+ return null;\n+ }, this);\n// When a new alternate package ID is entered, load the list of versions from the server.\n+ this.chosenAlternatePackageIdServerError = ko.observable();\nthis.chosenAlternatePackageId.subscribe(function (id) {\nif (!id) {\n// If the user hasn't input an ID, don't query the server.\n- self.chosenAlternatePackageIdError(null);\n+ self.alternatePackageVersionsCached.removeAll();\n+ self.chosenAlternatePackageIdServerError(null);\nreturn;\n}\n@@ -115,10 +142,10 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nif (self.alternatePackageId() === id) {\nif (data.length) {\nself.alternatePackageVersionsCached(data);\n- self.chosenAlternatePackageIdError(null);\n+ self.chosenAlternatePackageIdServerError(null);\n} else {\nself.alternatePackageVersionsCached.removeAll();\n- self.chosenAlternatePackageIdError(\"Could not find alternate package '\" + id + \"'.\");\n+ self.chosenAlternatePackageIdServerError(\"Could not find alternate package '\" + id + \"'.\");\n}\n}\n}\n@@ -127,7 +154,7 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\nerror: function () {\nif (self.alternatePackageId() === id) {\nself.alternatePackageVersionsCached.removeAll();\n- self.chosenAlternatePackageIdError(\"An unknown occurred when searching for alternate package '\" + id + \"'.\");\n+ self.chosenAlternatePackageIdServerError(\"An unknown error occurred when searching for alternate package '\" + id + \"'.\");\n}\n}\n});\n@@ -195,6 +222,10 @@ function ManageDeprecationViewModel(id, versionDeprecationStateDictionary, defau\n});\n};\n+ this.submitDisabled = ko.pureComputed(function () {\n+ return self.requiresCustomMessage() || self.isAlternateOfSelf();\n+ }, this);\n+\n// Clone the version deprecation state dictionary so that we can remember form state when the selected versions change.\n// The default state for a selected version is its current deprecation state.\n// Converting the existing dictionary to JSON and then parsing it is a very cheap way to do a deep copy.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -766,6 +766,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to A package cannot be the alternate package of itself..\n+ /// </summary>\n+ public static string DeprecatePackage_AlternateOfSelf {\n+ get {\n+ return ResourceManager.GetString(\"DeprecatePackage_AlternateOfSelf\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to You must add a custom message if you are deprecating a package due to another reason!.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1121,4 +1121,7 @@ The {1} Team</value>\n<data name=\"DeprecatePackage_CustomMessageTooLong\" xml:space=\"preserve\">\n<value>Your custom message is too long. It must be under {0} characters.</value>\n</data>\n+ <data name=\"DeprecatePackage_AlternateOfSelf\" xml:space=\"preserve\">\n+ <value>A package cannot be the alternate package of itself.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_DisplayPackageDeprecation.cshtml",
"diff": "{\nif (isLegacy)\n{\n- @:This package has been deprecated because it's <b>legacy</b> and has <b>critical bugs</b>.\n+ @:This package has been deprecated as it is <b>legacy</b> and has <b>critical bugs</b>.\n}\nelse\n{\n- @:This package has been deprecated because it has <b>critical bugs</b>.\n+ @:This package has been deprecated as it has <b>critical bugs</b>.\n}\n}\nelse if (isLegacy)\n{\n- @:This package has been deprecated because it's <b>legacy</b> and no longer maintained.\n+ @:This package has been deprecated as it is <b>legacy</b> and is no longer maintained.\n}\nelse\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageDeprecation.cshtml",
"diff": "</div>\n<div class=\"deprecation-section form-group\">\n- <button class=\"btn btn-primary full-line\" type=\"submit\" aria-label=\"Save package deprecation information\" data-bind=\"click: submit, disable: requiresCustomMessage\">Save</button>\n+ <button class=\"btn btn-primary full-line\" type=\"submit\" aria-label=\"Save package deprecation information\" data-bind=\"click: submit, disable: submitDisabled\">Save</button>\n</div>\n</script>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "using System.Web.Mvc;\nusing Newtonsoft.Json.Linq;\nusing NuGet.Services.Entities;\n+using NuGet.Versioning;\nusing NuGetGallery.Framework;\nusing NuGetGallery.RequestModels;\nusing Xunit;\n@@ -45,35 +46,47 @@ public void ReturnsAllAvailableVersionsInReverseVersionOrder()\nvar id = \"Crested.Gecko\";\nvar firstPackage = new Package\n{\n- Version = \"1.0.0+build\"\n+ Version = \"1.0.0+build\",\n+ Listed = true\n};\nvar secondPackage = new Package\n{\n- Version = \"2.0.0+build\"\n+ Version = \"2.0.0+build\",\n+ Listed = true\n};\nvar thirdPackage = new Package\n{\n- Version = \"3.0.0+build\"\n+ Version = \"3.0.0+build\",\n+ Listed = true\n};\nvar deletedPackage = new Package\n{\n- Version = \"2.1.0\",\n- PackageStatusKey = PackageStatus.Deleted\n+ Version = \"2.1.0-deleted\",\n+ PackageStatusKey = PackageStatus.Deleted,\n+ Listed = true\n};\nvar validatingPackage = new Package\n{\n- Version = \"2.1.0\",\n- PackageStatusKey = PackageStatus.Validating\n+ Version = \"2.2.0-validating\",\n+ PackageStatusKey = PackageStatus.Validating,\n+ Listed = true\n};\nvar failedValidationPackage = new Package\n{\n- Version = \"2.1.0\",\n- PackageStatusKey = PackageStatus.FailedValidation\n+ Version = \"2.3.0-failedValidation\",\n+ PackageStatusKey = PackageStatus.FailedValidation,\n+ Listed = true\n+ };\n+\n+ var unlistedPackage = new Package\n+ {\n+ Version = \"2.4.0-unlisted\",\n+ Listed = false\n};\nvar packages = new[]\n@@ -83,7 +96,8 @@ public void ReturnsAllAvailableVersionsInReverseVersionOrder()\nvalidatingPackage,\nfailedValidationPackage,\nthirdPackage,\n- secondPackage\n+ secondPackage,\n+ unlistedPackage\n};\nGetMock<IPackageService>()\n@@ -100,7 +114,7 @@ public void ReturnsAllAvailableVersionsInReverseVersionOrder()\nAssert.Equal((int)HttpStatusCode.OK, controller.Response.StatusCode);\nvar expected = new[] { thirdPackage, secondPackage, firstPackage }\n- .Select(v => v.Version)\n+ .Select(v => NuGetVersion.Parse(v.Version).ToNormalizedString())\n.ToList();\nAssert.Equal(expected, result.Data);\n@@ -603,6 +617,65 @@ public async Task ReturnsNotFoundIfSomeVersionMissing(User currentUser, User own\npackageService.Verify();\n}\n+ [Theory]\n+ [MemberData(nameof(Owner_Data))]\n+ public async Task ReturnsNotFoundIfAlternateOfSelf(User currentUser, User owner)\n+ {\n+ // Arrange\n+ var id = \"id\";\n+\n+ var registration = new PackageRegistration\n+ {\n+ Id = id\n+ };\n+\n+ var featureFlagService = GetMock<IFeatureFlagService>();\n+ featureFlagService\n+ .Setup(x => x.IsManageDeprecationEnabled(currentUser, registration))\n+ .Returns(true)\n+ .Verifiable();\n+\n+ registration.Owners.Add(owner);\n+\n+ var version = \"1.0.0\";\n+ var package = new Package\n+ {\n+ NormalizedVersion = version,\n+ PackageRegistration = registration\n+ };\n+\n+ var packageService = GetMock<IPackageService>();\n+ packageService\n+ .Setup(x => x.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships))\n+ .Returns(new[] { package })\n+ .Verifiable();\n+\n+ packageService\n+ .Setup(x => x.FindPackageByIdAndVersionStrict(id, version))\n+ .Returns(package)\n+ .Verifiable();\n+\n+ var controller = GetController<ManageDeprecationJsonApiController>();\n+ controller.SetCurrentUser(currentUser);\n+\n+ // Act\n+ var result = await controller.Deprecate(\n+ CreateDeprecatePackageRequest(\n+ id,\n+ new[] { version },\n+ alternatePackageId: id,\n+ alternatePackageVersion: version));\n+\n+ // Assert\n+ AssertErrorResponse(\n+ controller,\n+ result,\n+ HttpStatusCode.BadRequest,\n+ Strings.DeprecatePackage_AlternateOfSelf);\n+ featureFlagService.Verify();\n+ packageService.Verify();\n+ }\n+\nprivate static void AssertErrorResponse(\nManageDeprecationJsonApiController controller,\nJsonResult result,\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Small Deprecation fixes (#7326) |
455,737 | 09.07.2019 17:50:50 | 25,200 | b902de1fcb3e78dcc3f2dca0927917f2d94dcb19 | Move support rrequests and file storage. | [
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Project>{097b2cdd-9623-4c34-93c2-d373d51f5b4e}</Project>\n<Name>NuGetGallery.Core</Name>\n</ProjectReference>\n+ <ProjectReference Include=\"..\\NuGetGallery.Services\\NuGetGallery.Services.csproj\">\n+ <Project>{c7d5e850-33fa-4ec5-8d7f-b1c8dd5d48f9}</Project>\n+ <Name>NuGetGallery.Services</Name>\n+ </ProjectReference>\n<ProjectReference Include=\"..\\NuGetGallery\\NuGetGallery.csproj\">\n<Project>{1dacf781-5cd0-4123-8bac-cd385d864be5}</Project>\n<Name>NuGetGallery</Name>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Authentication/Providers/Authenticator.cs",
"new_path": "src/NuGetGallery.Services/Authentication/Providers/Authenticator.cs",
"diff": "@@ -59,7 +59,7 @@ public static string GetName(Type authenticator)\nreturn name;\n}\n- internal static IEnumerable<Authenticator> GetAllAvailable()\n+ public static IEnumerable<Authenticator> GetAllAvailable()\n{\n// Find all available auth providers\nreturn GetAllAvailable(typeof(Authenticator)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/ConfigurationService.cs",
"new_path": "src/NuGetGallery.Services/Configuration/ConfigurationService.cs",
"diff": "@@ -31,7 +31,7 @@ public class ConfigurationService : IGalleryConfigurationService\nprivate readonly Lazy<IServiceBusConfiguration> _lazyServiceBusConfiguration;\nprivate readonly Lazy<IPackageDeleteConfiguration> _lazyPackageDeleteConfiguration;\n- internal ISecretInjector SecretInjector { get; set; }\n+ public ISecretInjector SecretInjector { get; set; }\npublic ConfigurationService()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"Providers\\DateTimeProvider.cs\" />\n<Compile Include=\"Providers\\IDateTimeProvider.cs\" />\n+ <Compile Include=\"Security\\AllowLocalHttpRedirectPolicy.cs\" />\n<Compile Include=\"Security\\AutomaticOverwriteRequiredSignerPolicy.cs\" />\n<Compile Include=\"Security\\ControlRequiredSignerPolicy.cs\" />\n<Compile Include=\"Security\\DefaultSubscription.cs\" />\n<Compile Include=\"Security\\ISecurityPolicyService.cs\" />\n+ <Compile Include=\"Security\\ISourceDestinationRedirectPolicy.cs\" />\n<Compile Include=\"Security\\IUserSecurityPolicySubscription.cs\" />\n<Compile Include=\"Security\\MicrosoftTeamSubscription.cs\" />\n+ <Compile Include=\"Security\\NoLessSecureDestinationRedirectPolicy.cs\" />\n<Compile Include=\"Security\\PackageSecurityPolicyEvaluationContext.cs\" />\n<Compile Include=\"Security\\PackageSecurityPolicyHandler.cs\" />\n<Compile Include=\"Security\\RequiredSignerPolicy.cs\" />\n<Compile Include=\"Security\\UserSecurityPolicyEvaluationContext.cs\" />\n<Compile Include=\"Security\\UserSecurityPolicyHandler.cs\" />\n<Compile Include=\"Security\\UserSecurityPolicySubscriptionContext.cs\" />\n+ <Compile Include=\"Storage\\CloudBlobFileStorageService.cs\" />\n<Compile Include=\"Storage\\ContentObjectService.cs\" />\n<Compile Include=\"Storage\\ContentService.cs\" />\n<Compile Include=\"Storage\\HttpContextCacheService.cs\" />\n<Compile Include=\"SupportRequest\\Issue.cs\" />\n<Compile Include=\"SupportRequest\\IssueStatus.cs\" />\n<Compile Include=\"SupportRequest\\ISupportRequestService.cs\" />\n+ <Compile Include=\"SupportRequest\\Models\\IssueStatusKeys.cs\" />\n+ <Compile Include=\"SupportRequest\\Models\\ISupportRequestDbContext.cs\" />\n+ <Compile Include=\"SupportRequest\\Models\\SupportRequestDbContext.cs\" />\n+ <Compile Include=\"SupportRequest\\SupportRequestService.cs\" />\n<Compile Include=\"Telemetry\\ITelemetryClient.cs\" />\n<Compile Include=\"Telemetry\\ITelemetryService.cs\" />\n<Compile Include=\"Telemetry\\Obfuscator.cs\" />\n<Version>3.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Owin.Security\">\n- <Version>4.0.1</Version>\n+ <Version>3.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Owin.Security.OpenIdConnect\">\n<Version>3.0.1</Version>\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Services/AllowLocalHttpRedirectPolicy.cs",
"new_path": "src/NuGetGallery.Services/Security/AllowLocalHttpRedirectPolicy.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Services/ISourceDestinationRedirectPolicy.cs",
"new_path": "src/NuGetGallery.Services/Security/ISourceDestinationRedirectPolicy.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Services/NoLessSecureDestinationRedirectPolicy.cs",
"new_path": "src/NuGetGallery.Services/Security/NoLessSecureDestinationRedirectPolicy.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Services/CloudBlobFileStorageService.cs",
"new_path": "src/NuGetGallery.Services/Storage/CloudBlobFileStorageService.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Areas/Admin/Models/ISupportRequestDbContext.cs",
"new_path": "src/NuGetGallery.Services/SupportRequest/Models/ISupportRequestDbContext.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Areas/Admin/Models/IssueStatusKeys.cs",
"new_path": "src/NuGetGallery.Services/SupportRequest/Models/IssueStatusKeys.cs",
"diff": "@@ -14,6 +14,6 @@ public class IssueStatusKeys\n/// <remark>\n/// If one day we have 99 real issue status keys in the db, we can easily bump this one up in code.\n/// </remark>\n- internal const int Unresolved = 99;\n+ public const int Unresolved = 99;\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Areas/Admin/Models/SupportRequestDbContext.cs",
"new_path": "src/NuGetGallery.Services/SupportRequest/Models/SupportRequestDbContext.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs",
"new_path": "src/NuGetGallery.Services/SupportRequest/SupportRequestService.cs",
"diff": "@@ -219,8 +219,8 @@ public async Task UpdateIssueAsync(int issueId, int? assignedToId, int issueStat\npublic async Task<bool> TryAddDeleteSupportRequestAsync(User user)\n{\nvar requestSent = await AddNewSupportRequestAsync(\n- Strings.AccountDelete_SupportRequestTitle,\n- Strings.AccountDelete_SupportRequestTitle,\n+ ServicesStrings.AccountDelete_SupportRequestTitle,\n+ ServicesStrings.AccountDelete_SupportRequestTitle,\nuser.EmailAddress,\n\"The user requested to have the account deleted.\",\nuser) != null;\n@@ -297,11 +297,11 @@ public async Task DeleteSupportRequestsAsync(User user)\nvar userIssues = GetIssues().Where(i => i.UserKey.HasValue && i.UserKey.Value == user.Key).ToList();\n// Delete all the support requests with exception of the delete account request.\n// For the DeleteAccount support request clean the user data.\n- foreach (var issue in userIssues.Where(i => !string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))\n+ foreach (var issue in userIssues.Where(i => !string.Equals(i.IssueTitle, ServicesStrings.AccountDelete_SupportRequestTitle)))\n{\n_supportRequestDbContext.Issues.Remove(issue);\n}\n- foreach (var accountDeletedIssue in userIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))\n+ foreach (var accountDeletedIssue in userIssues.Where(i => string.Equals(i.IssueTitle, ServicesStrings.AccountDelete_SupportRequestTitle)))\n{\naccountDeletedIssue.OwnerEmail = \"deletedaccount\";\nif(!accountDeletedIssue.CreatedBy.Equals(_NuGetDSRAccount, StringComparison.OrdinalIgnoreCase))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/Providers/LocalUser/LocalUserAuthenticator.cs",
"new_path": "src/NuGetGallery/Authentication/Providers/LocalUser/LocalUserAuthenticator.cs",
"diff": "@@ -34,7 +34,7 @@ protected override void AttachToOwinApp(IGalleryConfigurationService config, IAp\napp.SetDefaultSignInAsAuthenticationType(AuthenticationTypes.LocalUser);\n}\n- protected internal override AuthenticatorConfiguration CreateConfigObject()\n+ protected override AuthenticatorConfiguration CreateConfigObject()\n{\nreturn new AuthenticatorConfiguration\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<DependentUpon>ListDetails.aspx</DependentUpon>\n</Compile>\n<Compile Include=\"Areas\\Admin\\Helpers.cs\" />\n- <Compile Include=\"Areas\\Admin\\Models\\IssueStatusKeys.cs\" />\n- <Compile Include=\"Areas\\Admin\\Models\\ISupportRequestDbContext.cs\" />\n<Compile Include=\"Areas\\Admin\\Migrations\\201602111647053_SupportRequestDbModel.cs\" />\n<Compile Include=\"Areas\\Admin\\Migrations\\201602111647053_SupportRequestDbModel.Designer.cs\">\n<DependentUpon>201602111647053_SupportRequestDbModel.cs</DependentUpon>\n<Compile Include=\"Areas\\Admin\\Migrations\\SupportRequestMigrationsConfiguration.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\RevalidationAdminService.cs\" />\n<Compile Include=\"Areas\\Admin\\Services\\ValidationAdminService.cs\" />\n- <Compile Include=\"Areas\\Admin\\Models\\SupportRequestDbContext.cs\" />\n- <Compile Include=\"Areas\\Admin\\Services\\SupportRequestService.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\DeleteAccountAsAdminViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\FeatureFlagsFeatureViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\FeatureFlagsFlightViewModel.cs\" />\n<Compile Include=\"Services\\TyposquattingCheckListCacheService.cs\" />\n<Compile Include=\"Services\\CertificateService.cs\" />\n<Compile Include=\"Services\\CertificateValidator.cs\" />\n- <Compile Include=\"Services\\CloudBlobFileStorageService.cs\" />\n<Compile Include=\"Services\\ICertificateService.cs\" />\n<Compile Include=\"Services\\ICertificateValidator.cs\" />\n<Compile Include=\"Services\\ImmediatePackageValidator.cs\" />\n<Compile Include=\"RequestModels\\DeletePackagesRequest.cs\" />\n<Compile Include=\"RequestModels\\EditPackageVersionRequest.cs\" />\n<Compile Include=\"RequestModels\\VerifyPackageRequest.cs\" />\n- <Compile Include=\"Services\\AllowLocalHttpRedirectPolicy.cs\" />\n- <Compile Include=\"Services\\ISourceDestinationRedirectPolicy.cs\" />\n- <Compile Include=\"Services\\NoLessSecureDestinationRedirectPolicy.cs\" />\n<Compile Include=\"Services\\ReflowPackageService.cs\" />\n<Compile Include=\"ViewModels\\ManageOrganizationsItemViewModel.cs\" />\n<Compile Include=\"ViewModels\\ManageOrganizationsViewModel.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Move support rrequests and file storage. |
455,744 | 10.07.2019 11:45:42 | 25,200 | f547d37d35d32dca940609d0168e3b9a577ba2aa | Fix for "Resend confirmation email" button to use the correct email address
* Added test to cover the issue
* Renamed local variable.
Added test.
* Fixed the variable values to match the name. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"new_path": "src/NuGetGallery/Controllers/AccountsController.cs",
"diff": "@@ -111,12 +111,19 @@ public virtual async Task<ActionResult> ConfirmationRequiredPost(string accountN\nreturn new HttpStatusCodeResult(HttpStatusCode.Forbidden, Strings.Unauthorized);\n}\n- var alreadyConfirmed = account.UnconfirmedEmailAddress == null;\n+ var hasUnconfirmedEmailAddress = account.UnconfirmedEmailAddress != null;\nConfirmationViewModel model;\n- if (!alreadyConfirmed)\n+ if (hasUnconfirmedEmailAddress)\n+ {\n+ if (account.EmailAddress == null)\n{\nawait SendNewAccountEmailAsync(account);\n+ }\n+ else\n+ {\n+ await SendEmailChangedConfirmationNoticeAsync(account);\n+ }\nmodel = new ConfirmationViewModel(account)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/OrganizationsControllerFacts.cs",
"diff": "@@ -273,6 +273,46 @@ public async Task WithNonOrganizationAdmin_ReturnsForbidden(Func<Fakes, User> ge\nAssert.NotNull(result);\nAssert.Equal((int)HttpStatusCode.Forbidden, result.StatusCode);\n}\n+\n+ [Fact]\n+ public async Task SendsProperNewAccountMessage()\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var account = GetAccount(controller);\n+\n+ account.EmailAddress = null;\n+ account.UnconfirmedEmailAddress = \"[email protected]\";\n+\n+ // Act\n+ var result = await InvokeConfirmationRequiredPostAsync(controller, account, _getFakesOrganizationAdmin) as HttpStatusCodeResult;\n+\n+ // Assert\n+ GetMock<IMessageService>()\n+ .Verify(ms => ms.SendMessageAsync(It.IsAny<EmailChangeConfirmationMessage>(), It.IsAny<bool>(), It.IsAny<bool>()), Times.Never);\n+ GetMock<IMessageService>()\n+ .Verify(ms => ms.SendMessageAsync(It.IsAny<NewAccountMessage>(), It.IsAny<bool>(), It.IsAny<bool>()), Times.Once);\n+ }\n+\n+ [Fact]\n+ public async Task ResendsProperConfirmationEmail()\n+ {\n+ // Arrange\n+ var controller = GetController();\n+ var account = GetAccount(controller);\n+\n+ account.EmailAddress = \"[email protected]\";\n+ account.UnconfirmedEmailAddress = \"[email protected]\";\n+\n+ // Act\n+ var result = await InvokeConfirmationRequiredPostAsync(controller, account, _getFakesOrganizationAdmin) as HttpStatusCodeResult;\n+\n+ // Assert\n+ GetMock<IMessageService>()\n+ .Verify(ms => ms.SendMessageAsync(It.IsAny<EmailChangeConfirmationMessage>(), It.IsAny<bool>(), It.IsAny<bool>()), Times.Once);\n+ GetMock<IMessageService>()\n+ .Verify(ms => ms.SendMessageAsync(It.IsAny<NewAccountMessage>(), It.IsAny<bool>(), It.IsAny<bool>()), Times.Never);\n+ }\n}\npublic class TheConfirmAction : TheConfirmBaseAction\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix for "Resend confirmation email" button to use the correct email address (#7273)
* Added test to cover the issue
* Renamed local variable.
Added test.
* Fixed the variable values to match the name. |
455,737 | 10.07.2019 16:40:58 | 25,200 | d7991a503f88a99acb40d8a2cbcbf4eee219d1aa | Stub out more unused services. Update to real delete. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Compile Include=\"Configuration\\GalleryConfiguration.cs\" />\n<Compile Include=\"Configuration\\MailTemplateConfiguration.cs\" />\n<Compile Include=\"Configuration\\SourceConfiguration.cs\" />\n+ <Compile Include=\"EmptyIndexingService.cs\" />\n+ <Compile Include=\"Evaluators\\AccountConfirmedEvaluator.cs\" />\n<Compile Include=\"Evaluators\\AlwaysAllowEvaluator.cs\" />\n+ <Compile Include=\"Evaluators\\BaseUserEvaluator.cs\" />\n<Compile Include=\"Exceptions\\EmailContactNotAllowedException.cs\" />\n<Compile Include=\"Exceptions\\UnknownSourceException.cs\" />\n<Compile Include=\"Exceptions\\UserNotFoundException.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Configuration/GalleryConfiguration.cs",
"new_path": "src/AccountDeleter/Configuration/GalleryConfiguration.cs",
"diff": "@@ -10,6 +10,16 @@ namespace NuGetGallery.AccountDeleter\n{\npublic class GalleryConfiguration : IAppConfiguration\n{\n+ public string SiteRoot\n+ {\n+ get\n+ {\n+ return \"\";\n+ }\n+\n+ set => throw new NotImplementedException();\n+ }\n+\npublic LuceneIndexLocation LuceneIndexLocation { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string Environment { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string WarningBanner { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n@@ -47,7 +57,6 @@ public class GalleryConfiguration : IAppConfiguration\npublic string FacebookAppId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string AppInsightsInstrumentationKey { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic double AppInsightsSamplingPercentage { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n- public string SiteRoot { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string ReCaptchaPrivateKey { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string ReCaptchaPublicKey { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string GoogleAnalyticsPropertyId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/AggregateEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/AggregateEvaluator.cs",
"diff": "@@ -12,28 +12,19 @@ namespace NuGetGallery.AccountDeleter\n/// <summary>\n/// Evaluator that runs other evaluators and returns a single result. Runs \"AND\" logic between evaluators.\n/// </summary>\n- public class AggregateEvaluator : IUserEvaluator\n+ public class AggregateEvaluator : BaseUserEvaluator\n{\n- private readonly Guid _id;\nprivate readonly ILogger<AggregateEvaluator> _logger;\nprivate Dictionary<string, IUserEvaluator> _evaluatorList;\npublic AggregateEvaluator(ILogger<AggregateEvaluator> logger)\n+ : base()\n{\n_logger = logger ?? throw new ArgumentNullException(nameof(logger));\n_evaluatorList = new Dictionary<string, IUserEvaluator>();\n- _id = Guid.NewGuid();\n}\n- public string EvaluatorId\n- {\n- get\n- {\n- return _id.ToString();\n- }\n- }\n-\n- public bool CanUserBeDeleted(User user)\n+ public override bool CanUserBeDeleted(User user)\n{\nvar evaluators = _evaluatorList.Values;\n_logger.LogInformation(\"Running {EvaluatorCount} evaluators.\", evaluators.Count);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/AlwaysAllowEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/AlwaysAllowEvaluator.cs",
"diff": "using Microsoft.Extensions.Logging;\nusing NuGet.Services.Entities;\n-using System;\nnamespace NuGetGallery.AccountDeleter\n{\n/// <summary>\n/// Evaluator that always passes\n/// </summary>\n- public class AlwaysAllowEvaluator : IUserEvaluator\n+ public class AlwaysAllowEvaluator : BaseUserEvaluator\n{\n- private readonly Guid _id;\nprivate readonly ILogger<AlwaysAllowEvaluator> _logger;\npublic AlwaysAllowEvaluator(ILogger<AlwaysAllowEvaluator> logger)\n+ : base()\n{\n- _id = Guid.NewGuid();\n_logger = logger;\n}\n- public string EvaluatorId\n- {\n- get\n- {\n- return _id.ToString();\n- }\n- }\n-\n- public bool CanUserBeDeleted(User user)\n+ public override bool CanUserBeDeleted(User user)\n{\n_logger.LogInformation(\"{Evaluator} User can be deleted\", nameof(AlwaysAllowEvaluator));\nreturn true;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/AlwaysRejectEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/AlwaysRejectEvaluator.cs",
"diff": "using Microsoft.Extensions.Logging;\nusing NuGet.Services.Entities;\n-using System;\nnamespace NuGetGallery.AccountDeleter\n{\n/// <summary>\n/// Evaluator that always fails\n/// </summary>\n- public class AlwaysRejectEvaluator : IUserEvaluator\n+ public class AlwaysRejectEvaluator : BaseUserEvaluator\n{\n- private readonly Guid _id;\nprivate readonly ILogger<AlwaysRejectEvaluator> _logger;\npublic AlwaysRejectEvaluator(ILogger<AlwaysRejectEvaluator> logger)\n+ : base()\n{\n- _id = Guid.NewGuid();\n_logger = logger;\n}\n- public string EvaluatorId\n- {\n- get\n- {\n- return _id.ToString();\n- }\n- }\n-\n- public bool CanUserBeDeleted(User user)\n+ public override bool CanUserBeDeleted(User user)\n{\n_logger.LogWarning(\"{Evaluator}:{EvaluatorId} User cannot be deleted because this evaluator always disallows delete.\", nameof(AlwaysRejectEvaluator), EvaluatorId);\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/UserOrganizationEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/UserOrganizationEvaluator.cs",
"diff": "@@ -10,30 +10,19 @@ namespace NuGetGallery.AccountDeleter\n/// <summary>\n/// Evaluates a user's organization memebership (WIP)\n/// </summary>\n- public class UserOrganizationEvaluator : IUserEvaluator\n+ public class UserOrganizationEvaluator : BaseUserEvaluator\n{\n- private readonly Guid _id;\nprivate readonly IPackageService _packageService;\n- private readonly IAccountDeleteTelemetryService _telemtryService;\nprivate readonly ILogger<UserPackageEvaluator> _logger;\n- public UserOrganizationEvaluator(IPackageService packageService, IAccountDeleteTelemetryService telemetryService, ILogger<UserPackageEvaluator> logger)\n+ public UserOrganizationEvaluator(IPackageService packageService, ILogger<UserPackageEvaluator> logger)\n+ : base()\n{\n_packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n- _telemtryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n_logger = logger ?? throw new ArgumentNullException(nameof(logger));\n- _id = Guid.NewGuid();\n}\n- public string EvaluatorId\n- {\n- get\n- {\n- return _id.ToString();\n- }\n- }\n-\n- public bool CanUserBeDeleted(User user)\n+ public override bool CanUserBeDeleted(User user)\n{\nthrow new NotImplementedException();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/UserPackageEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/UserPackageEvaluator.cs",
"diff": "@@ -10,29 +10,19 @@ namespace NuGetGallery.AccountDeleter\n/// <summary>\n/// Evaluates a user's package ownership status\n/// </summary>\n- public class UserPackageEvaluator : IUserEvaluator\n+ public class UserPackageEvaluator : BaseUserEvaluator\n{\n- private readonly Guid _id;\nprivate readonly IPackageService _packageService;\n- private readonly IAccountDeleteTelemetryService _telemtryService;\nprivate readonly ILogger<UserPackageEvaluator> _logger;\n- public UserPackageEvaluator(IPackageService packageService, IAccountDeleteTelemetryService telemetryService, ILogger<UserPackageEvaluator> logger)\n+ public UserPackageEvaluator(IPackageService packageService, ILogger<UserPackageEvaluator> logger)\n+ : base()\n{\n_packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));\n- _telemtryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n_logger = logger ?? throw new ArgumentNullException(nameof(logger));\n- _id = Guid.NewGuid();\n}\n- public string EvaluatorId {\n- get\n- {\n- return _id.ToString();\n- }\n- }\n-\n- public bool CanUserBeDeleted(User user)\n+ public override bool CanUserBeDeleted(User user)\n{\nvar userPackages = _packageService.FindPackagesByOwner(user, includeUnlisted: false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/GalleryAccountManager.cs",
"new_path": "src/AccountDeleter/GalleryAccountManager.cs",
"diff": "@@ -56,6 +56,7 @@ public async Task<bool> DeleteAccount(User user)\nelse\n{\n_logger.LogError(\"Criteria passed but delete failed.\");\n+ _logger.LogError(result.Description);\nreturn false;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing Autofac;\n-using Microsoft.ApplicationInsights;\nusing Microsoft.Extensions.Configuration;\nusing Microsoft.Extensions.DependencyInjection;\n-using Microsoft.Extensions.Logging;\nusing Microsoft.Extensions.Options;\nusing NuGet.Jobs.Validation;\nusing NuGet.Jobs.Configuration;\nusing System.ComponentModel.Design;\nusing NuGet.Services.Entities;\nusing NuGetGallery.Diagnostics;\n-using NuGet.Services.Logging;\n-using System.Web.Hosting;\nusing NuGetGallery.Configuration;\n-using System.Runtime.Remoting.Messaging;\nusing NuGetGallery.Areas.Admin.Models;\nusing NuGet.Jobs;\n+using NuGetGallery.Infrastructure.Authentication;\nnamespace NuGetGallery.AccountDeleter\n{\n@@ -57,9 +53,10 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi\nservices.AddTransient<ISubscriptionProcessorTelemetryService, AccountDeleteTelemetryService>();\nservices.AddScoped<AggregateEvaluator>();\n- services.AddTransient<AlwaysRejectEvaluator>();\n- services.AddTransient<AlwaysAllowEvaluator>();\n- services.AddTransient<UserPackageEvaluator>();\n+ services.AddScoped<AlwaysRejectEvaluator>();\n+ services.AddScoped<AlwaysAllowEvaluator>();\n+ services.AddScoped<UserPackageEvaluator>();\n+ services.AddScoped<AccountConfirmedEvaluator>();\nservices.AddScoped<IUserEvaluator>(sp =>\n{\n@@ -76,11 +73,8 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi\nelse\n{\n// Configure evaluators here.\n- var alwaysReject = sp.GetRequiredService<AlwaysRejectEvaluator>();\n- evaluator.AddEvaluator(alwaysReject); // For phase 1, we never want to actually delete, so we will add this here to guarantee that\n-\n- var userPackageEvaluator = sp.GetRequiredService<UserPackageEvaluator>();\n- evaluator.AddEvaluator(userPackageEvaluator);\n+ var accountConfirmedEvaluator = sp.GetRequiredService<AccountConfirmedEvaluator>();\n+ evaluator.AddEvaluator(accountConfirmedEvaluator);\n}\nreturn evaluator;\n@@ -120,11 +114,19 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\n}\nelse\n{\n- services.AddScoped<IDeleteAccountService, EmptyDeleteAccountService>();\n+ //services.AddScoped<IDeleteAccountService, EmptyDeleteAccountService>();\n+ services.AddScoped<IEntitiesContext>(sp =>\n+ {\n+ var connectionFactory = sp.GetRequiredService<ISqlConnectionFactory<GalleryDbConfiguration>>();\n+ var connection = connectionFactory.CreateAsync().GetAwaiter().GetResult();\n+\n+ return new EntitiesContext(connection, readOnly: false);\n+ });\nservices.AddScoped<IDeleteAccountService, DeleteAccountService>();\nservices.AddScoped<IUserService, AccountDeleteUserService>();\n- services.AddScoped<IDiagnosticsService, LoggerDiagnosticsService>();\n+ services.AddScoped<ITelemetryClient>(sp => { return TelemetryClientWrapper.Instance; });\n+ services.AddScoped<IDiagnosticsService, DiagnosticsService>();\nservices.AddScoped<IPackageService, PackageService>();\nservices.AddScoped<IPackageUpdateService, PackageUpdateService>();\n@@ -132,6 +134,29 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\nservices.AddScoped<IAuthenticationService, AuthenticationService>();\nservices.AddScoped<ISupportRequestService, ISupportRequestService>();\n+ services.AddScoped<IEditableFeatureFlagStorageService, FeatureFlagFileStorageService>();\n+ services.AddScoped<ICoreFileStorageService, CloudBlobFileStorageService>();\n+\n+ services.AddScoped<IIndexingService, EmptyIndexingService>();\n+ services.AddScoped<ICredentialBuilder, CredentialBuilder>();\n+ services.AddScoped<ICredentialValidator, CredentialValidator>();\n+ services.AddScoped<IDateTimeProvider, DateTimeProvider>();\n+ services.AddScoped<IContentObjectService, ContentObjectService>();\n+ services.AddScoped<IContentService, ContentService>();\n+ services.AddScoped<IFileStorageService, CloudBlobFileStorageService>();\n+ services.AddScoped<ISourceDestinationRedirectPolicy, NoLessSecureDestinationRedirectPolicy>();\n+\n+ services.AddScoped<ISupportRequestService, SupportRequestService>();\n+ services.AddScoped<ISupportRequestDbContext>(sp =>\n+ {\n+ var connectionFactory = sp.GetRequiredService<ISqlConnectionFactory<SupportRequestDbConfiguration>>();\n+ var connection = connectionFactory.CreateAsync().GetAwaiter().GetResult();\n+\n+ return new SupportRequestDbContext(connection);\n+ });\n+\n+ services.AddScoped<ICloudBlobClient>(sp => { return new CloudBlobClientWrapper(\"DefaultEndpointsProtocol=https;AccountName=ryuyustoreuse2;AccountKey=lWMBRXJ4hyPXr01rhdju1xa9nfxRAdNaVK7OudRZiRUhLWQPPcNh/IsXy0jUkSSPrKCMwys/ukPYsOS+AbFzPg==;EndpointSuffix=core.windows.net\", true); });\n+\nservices.AddScoped<ITelemetryService, GalleryTelemetryService>();\nservices.AddScoped<ISecurityPolicyService, SecurityPolicyService>();\nservices.AddScoped<IAuditingService>(sp => { return AuditingService.None; }); //Replace with real when we start doing deletes. For now, we are a readonly operation.\n@@ -200,6 +225,11 @@ protected override void ConfigureAutofacServices(ContainerBuilder containerBuild\n.AsSelf()\n.As<IEntityRepository<Scope>>()\n.InstancePerLifetimeScope();\n+\n+ containerBuilder.RegisterType<EntityRepository<PackageOwnerRequest>>()\n+ .AsSelf()\n+ .As<IEntityRepository<PackageOwnerRequest>>()\n+ .InstancePerLifetimeScope();\n}\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Stub out more unused services. Update to real delete. |
455,737 | 10.07.2019 16:45:23 | 25,200 | d0984c689d814390cc1ea0ba82310633f250ed11 | Remove bad creds | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -155,7 +155,7 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\nreturn new SupportRequestDbContext(connection);\n});\n- services.AddScoped<ICloudBlobClient>(sp => { return new CloudBlobClientWrapper(\"DefaultEndpointsProtocol=https;AccountName=ryuyustoreuse2;AccountKey=lWMBRXJ4hyPXr01rhdju1xa9nfxRAdNaVK7OudRZiRUhLWQPPcNh/IsXy0jUkSSPrKCMwys/ukPYsOS+AbFzPg==;EndpointSuffix=core.windows.net\", true); });\n+ services.AddScoped<ICloudBlobClient>(sp => { return new CloudBlobClientWrapper(\"\", true); });\nservices.AddScoped<ITelemetryService, GalleryTelemetryService>();\nservices.AddScoped<ISecurityPolicyService, SecurityPolicyService>();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove bad creds |
455,737 | 10.07.2019 18:03:45 | 25,200 | b6aec8810ed522e0fb8b05b473289ba5318508b2 | Add storage configuration. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Configuration/AccountDeleteConfiguration.cs",
"new_path": "src/AccountDeleter/Configuration/AccountDeleteConfiguration.cs",
"diff": "@@ -28,6 +28,11 @@ public class AccountDeleteConfiguration\n/// </summary>\npublic Dictionary<string, string> TemplateReplacements { get; set; }\n+ /// <summary>\n+ /// Storage container connection string where gallery content can be found\n+ /// </summary>\n+ public string GalleryStorageConnectionString { get; set; }\n+\npublic void VerifySource(string source)\n{\nforeach (var sourceConfig in SourceConfigurations)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -155,7 +155,12 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\nreturn new SupportRequestDbContext(connection);\n});\n- services.AddScoped<ICloudBlobClient>(sp => { return new CloudBlobClientWrapper(\"\", true); });\n+ services.AddScoped<ICloudBlobClient>(sp => {\n+ var options = sp.GetRequiredService<IOptionsSnapshot<AccountDeleteConfiguration>>();\n+ var optionsSnapshot = options.Value;\n+\n+ return new CloudBlobClientWrapper(optionsSnapshot.GalleryStorageConnectionString, readAccessGeoRedundant: true);\n+ });\nservices.AddScoped<ITelemetryService, GalleryTelemetryService>();\nservices.AddScoped<ISecurityPolicyService, SecurityPolicyService>();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add storage configuration. |
455,776 | 11.07.2019 09:51:00 | 25,200 | 7b71b2477af89e7f27715f82ba25e1cc9168d202 | Add test that asserts success when deprecating a package and choosing an alternate package with the same ID | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ManageDeprecationJsonApiControllerFacts.cs",
"diff": "@@ -716,8 +716,10 @@ public static IEnumerable<object[]> PackageDeprecationStates_Data\npublic enum ReturnsSuccessful_AlternatePackage_State\n{\nNone,\n- Registration,\n- Package\n+ RegistrationSameId,\n+ RegistrationDifferentId,\n+ PackageSameId,\n+ PackageDifferentId\n}\npublic static IEnumerable<object[]> ReturnsSuccessful_Data =\n@@ -826,34 +828,48 @@ public enum ReturnsSuccessful_AlternatePackage_State\n.Returns(new[] { package, package2, unselectedPackage })\n.Verifiable();\n- var alternatePackageId = alternatePackageState != ReturnsSuccessful_AlternatePackage_State.None ? \"altId\" : null;\n- var alternatePackageVersion = alternatePackageState == ReturnsSuccessful_AlternatePackage_State.Package ? \"1.2.3-alt\" : null;\n-\n- var alternatePackageRegistration = new PackageRegistration\n+ string alternatePackageId = null;\n+ string alternatePackageVersion = null;\n+ PackageRegistration alternatePackageRegistration = null;\n+ Package alternatePackage = null;\n+ if (alternatePackageState != ReturnsSuccessful_AlternatePackage_State.None)\n{\n- Id = alternatePackageId\n- };\n-\n- var alternatePackage = new Package\n+ var alternateRegistration =\n+ alternatePackageState == ReturnsSuccessful_AlternatePackage_State.RegistrationSameId\n+ || alternatePackageState == ReturnsSuccessful_AlternatePackage_State.PackageSameId\n+ ? registration\n+ : new PackageRegistration\n{\n- NormalizedVersion = alternatePackageVersion,\n- PackageRegistration = alternatePackageRegistration\n+ Id = \"altId\"\n};\n- if (alternatePackageState == ReturnsSuccessful_AlternatePackage_State.Registration)\n+ alternatePackageId = alternateRegistration.Id;\n+\n+ if (alternatePackageState == ReturnsSuccessful_AlternatePackage_State.RegistrationSameId ||\n+ alternatePackageState == ReturnsSuccessful_AlternatePackage_State.RegistrationDifferentId)\n{\n+ alternatePackageRegistration = alternateRegistration;\npackageService\n.Setup(x => x.FindPackageRegistrationById(alternatePackageId))\n- .Returns(alternatePackageRegistration)\n+ .Returns(alternateRegistration)\n.Verifiable();\n}\n- else if (alternatePackageState == ReturnsSuccessful_AlternatePackage_State.Package)\n+ else if (alternatePackageState == ReturnsSuccessful_AlternatePackage_State.PackageSameId ||\n+ alternatePackageState == ReturnsSuccessful_AlternatePackage_State.PackageDifferentId)\n{\n+ alternatePackageVersion = \"1.2.3-alt\";\n+ alternatePackage = new Package\n+ {\n+ NormalizedVersion = alternatePackageVersion,\n+ PackageRegistration = alternateRegistration\n+ };\n+\npackageService\n.Setup(x => x.FindPackageByIdAndVersionStrict(alternatePackageId, alternatePackageVersion))\n.Returns(alternatePackage)\n.Verifiable();\n}\n+ }\nvar deprecationService = GetMock<IPackageDeprecationService>();\n@@ -863,8 +879,8 @@ public enum ReturnsSuccessful_AlternatePackage_State\n.Setup(x => x.UpdateDeprecation(\nnew[] { package, package2 },\nexpectedStatus,\n- alternatePackageState == ReturnsSuccessful_AlternatePackage_State.Registration ? alternatePackageRegistration : null,\n- alternatePackageState == ReturnsSuccessful_AlternatePackage_State.Package ? alternatePackage : null,\n+ alternatePackageRegistration,\n+ alternatePackage,\ncustomMessage,\ncurrentUser))\n.Completes()\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add test that asserts success when deprecating a package and choosing an alternate package with the same ID (#7329) |
455,737 | 11.07.2019 16:47:25 | 25,200 | 1389f1e5e0fb7d4f6038cc3fbcc1624cea24c6e5 | Switch to using real Telemetry service | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Compile Include=\"AccountDeleteUserService.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n- <Compile Include=\"Telemetry\\GalleryTelemetryService.cs\" />\n<Compile Include=\"Telemetry\\IAccountDeleteTelemetryService.cs\" />\n<Compile Include=\"Telemetry\\AccountDeleteTelemetryService.cs\" />\n<Compile Include=\"Evaluators\\UserPackageEvaluator.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -114,7 +114,6 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\n}\nelse\n{\n- //services.AddScoped<IDeleteAccountService, EmptyDeleteAccountService>();\nservices.AddScoped<IEntitiesContext>(sp =>\n{\nvar connectionFactory = sp.GetRequiredService<ISqlConnectionFactory<GalleryDbConfiguration>>();\n@@ -162,9 +161,9 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\nreturn new CloudBlobClientWrapper(optionsSnapshot.GalleryStorageConnectionString, readAccessGeoRedundant: true);\n});\n- services.AddScoped<ITelemetryService, GalleryTelemetryService>();\n+ services.AddScoped<ITelemetryService, TelemetryService>();\nservices.AddScoped<ISecurityPolicyService, SecurityPolicyService>();\n- services.AddScoped<IAuditingService>(sp => { return AuditingService.None; }); //Replace with real when we start doing deletes. For now, we are a readonly operation.\n+ services.AddScoped<IAuditingService>(sp => { return AuditingService.None; });\nservices.AddScoped<IAppConfiguration, GalleryConfiguration>();\nservices.AddScoped<IPackageOwnershipManagementService, PackageOwnershipManagementService>();\nservices.AddScoped<IPackageOwnerRequestService, PackageOwnerRequestService>();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Switch to using real Telemetry service |
455,737 | 12.07.2019 13:30:30 | 25,200 | f9ee3a3a0e297dedbc3e56a687ec919085f868b9 | Comments. Update protected -> private. Remove unused constants. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/EmptyIndexingService.cs",
"new_path": "src/AccountDeleter/EmptyIndexingService.cs",
"diff": "namespace NuGetGallery.AccountDeleter\n{\n+ /// <summary>\n+ /// This class must exist becuase <see cref=\"PackageUpdateService\"/> requires an <see cref=\"IIndexingService\"/>\n+ /// However, since our indexing depends directly on DB, we need to catch these calls and do nothing.\n+ /// We have only no-oped the calls that we expect to need. Any unexpected call should throw here, and the need for a real indexing service should be re-evaluated if this occurs.\n+ /// </summary>\npublic class EmptyIndexingService : IIndexingService\n{\npublic EmptyIndexingService()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/BaseUserEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/BaseUserEvaluator.cs",
"diff": "@@ -5,7 +5,7 @@ namespace NuGetGallery.AccountDeleter\n{\npublic abstract class BaseUserEvaluator : IUserEvaluator\n{\n- protected readonly Guid _id;\n+ private readonly Guid _id;\npublic BaseUserEvaluator()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/GalleryConstants.cs",
"new_path": "src/NuGetGallery/GalleryConstants.cs",
"diff": "@@ -25,13 +25,6 @@ public static class GalleryConstants\npublic const int GravatarImageSize = GravatarElementSize * 2;\npublic const int GravatarImageSizeLarge = 332;\n- /// <summary>\n- /// Parameters for calculating account lockout period after\n- /// wrong password entry.\n- /// </summary>\n- public const double AccountLockoutMultiplierInMinutes = 10;\n- public const double AllowedLoginAttempts = 10;\n-\npublic const int MaxEmailSubjectLength = 255;\ninternal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion(\"4.1.0.0\");\npublic const string PackageFileDownloadUriTemplate = \"packages/{0}/{1}/download\";\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Comments. Update protected -> private. Remove unused constants. |
455,736 | 15.07.2019 12:13:56 | 25,200 | 2e6bbf691299d2173e5418a40b02d171936846c1 | Don't index search results pages
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "ViewBag.Title = String.IsNullOrWhiteSpace(Model.SearchTerm) ? \"Packages\" : \"Packages matching \" + Model.SearchTerm;\nViewBag.SortText = String.IsNullOrWhiteSpace(Model.SearchTerm) ? \"recent installs\" : \"relevance\";\nViewBag.Tab = \"Packages\";\n+ ViewBag.BlockSearchEngineIndexing = !String.IsNullOrWhiteSpace(Model.SearchTerm) || Model.PageIndex != 0;\n}\n<section role=\"main\" class=\"container main-container page-list-packages\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Don't index search results pages (#7344)
Address https://github.com/NuGet/NuGetGallery/issues/7187 |
455,736 | 16.07.2019 08:28:05 | 25,200 | 01ee76793c06a39accf0217281184b23ea68544b | Load AsyncFileUpload from NuGetGallery.Services | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add name=\"ErrorFilter\" type=\"Elmah.ErrorFilterModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\"/>\n<add name=\"ErrorLog\" type=\"Elmah.ErrorLogModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\"/>\n<add name=\"ErrorMail\" type=\"Elmah.ErrorMailModule, Elmah, Version=1.2.14706.0, Culture=neutral, PublicKeyToken=57eac04b2e0f138e, processorArchitecture=MSIL\"/>\n- <add name=\"AsyncFileUpload\" type=\"NuGetGallery.AsyncFileUpload.AsyncFileUploadModule, NuGetGallery\"/>\n+ <add name=\"AsyncFileUpload\" type=\"NuGetGallery.AsyncFileUpload.AsyncFileUploadModule, NuGetGallery.Services\"/>\n<add name=\"ApplicationInsightsWebTracking\" type=\"Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web\"/>\n</httpModules>\n<httpHandlers>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Load AsyncFileUpload from NuGetGallery.Services |
455,781 | 16.07.2019 12:46:44 | 25,200 | 4df835498d38238820b252540a0e25fae17c228d | Package Title eliminated from UI | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "}\n</h1>\n- @if (!Model.Deleted && !StringComparer.OrdinalIgnoreCase.Equals(Model.Id, Model.Title))\n- {\n- <div class=\"ms-fontSize-xl\">\n- @Html.BreakWord(Model.Title)\n- </div>\n- }\n</div>\n@if (!Model.Deleted && !String.IsNullOrWhiteSpace(Model.Description))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "}\n</div>\n- @if (!StringComparer.OrdinalIgnoreCase.Equals(Model.Id, Model.Title))\n- {\n- <div class=\"package-title package-legacy-title\">\n- @Html.BreakWord(Model.Title)\n- </div>\n- }\n-\n<ul class=\"package-list\">\n<li>\n<span class=\"icon-text\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Package Title eliminated from UI |
455,737 | 16.07.2019 16:16:42 | 25,200 | 11deffe5e33aec955f2c1c65691ee69354284408 | Remove jquery nuget package refs. Remove some of our uses of .error and removeattr | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Areas\\Admin\\Views\\Features\\_EditFlight.cshtml\" />\n<Content Include=\"App_Data\\Files\\Content\\AB-Test-Configuration.json\" />\n<None Include=\"Properties\\PublishProfiles\\nuget-staging-frontend.pubxml\" />\n- <Content Include=\"Scripts\\gallery\\**\\*\" />\n+ <Content Include=\"Scripts\\gallery\\async-file-upload.js\" />\n+ <Content Include=\"Scripts\\gallery\\autocomplete.js\" />\n+ <Content Include=\"Scripts\\gallery\\bootstrap.js\" />\n+ <Content Include=\"Scripts\\gallery\\certificates.js\" />\n+ <Content Include=\"Scripts\\gallery\\clamp.js\" />\n+ <Content Include=\"Scripts\\gallery\\common-multi-select-dropdown.js\" />\n+ <Content Include=\"Scripts\\gallery\\common.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery-1.12.4.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery-3.4.1.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery-migrate-3.0.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery-ui-1.10.3.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery.migrate-3.0.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery.validate-1.16.0.js\" />\n+ <Content Include=\"Scripts\\gallery\\jquery.validate.unobtrusive-3.2.6.js\" />\n+ <Content Include=\"Scripts\\gallery\\knockout-3.4.2.js\" />\n+ <Content Include=\"Scripts\\gallery\\knockout-projections.js\" />\n+ <Content Include=\"Scripts\\gallery\\md5.js\" />\n+ <Content Include=\"Scripts\\gallery\\moment-2.18.1.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-about.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-account.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-add-organization.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-api-keys.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-delete-package.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-display-package.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-edit-readme.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-home.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-manage-deprecation.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-manage-organization.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-manage-owners.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-manage-packages.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-signin.js\" />\n+ <Content Include=\"Scripts\\gallery\\page-support-requests.js\" />\n+ <Content Include=\"Scripts\\gallery\\stats-dimensions.js\" />\n+ <Content Include=\"Scripts\\gallery\\stats-perpackagestatsgraphs.js\" />\n<Content Include=\"Web.config\">\n<SubType>Designer</SubType>\n</Content>\n<PackageReference Include=\"EntityFramework\">\n<Version>6.1.3</Version>\n</PackageReference>\n- <PackageReference Include=\"jQuery\">\n- <Version>1.11.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"jQuery.UI.Combined\">\n- <Version>1.10.3</Version>\n- </PackageReference>\n- <PackageReference Include=\"jQuery.Validation\">\n- <Version>1.11.1</Version>\n- </PackageReference>\n<PackageReference Include=\"Knockout.Mapping\">\n<Version>2.4.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.IdentityModel.Clients.ActiveDirectory\">\n<Version>3.19.4</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.jQuery.Unobtrusive.Ajax\">\n- <Version>2.0.30116</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.jQuery.Unobtrusive.Validation\">\n- <Version>2.0.30116</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Net.Http\">\n<Version>2.2.29</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-edit-readme.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-edit-readme.js",
"diff": "@@ -339,7 +339,7 @@ var BindReadMeDataManager = (function () {\n$(\"#readme-errors\").addClass(\"hidden\");\n$(\"#readme-error-content\").text(\"\");\n}\n- $(\"#preview-readme-button\").removeAttr(\"disabled\");\n+ $(\"#preview-readme-button\").prop(\"disabled\", false);\n}\n};\n}());\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-home.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-home.js",
"diff": "@@ -37,7 +37,7 @@ $(function () {\nupdateStat(stats.packageVersions, data['TotalPackages']);\nupdateStat(stats.uniquePackages, data['UniquePackages']);\n})\n- .error(function () {\n+ .fail(function () {\n// Fail silently.\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-owners.js",
"diff": "}\n}\n})\n- .error(failHandler);\n+ .fail(failHandler);\n},\nremoveOwner: function (item) {\n}\n}\n})\n- .error(failHandler);\n+ .fail(failHandler);\n}\n};\nviewModel.owners($.map(data, function (item) { return new Owner(item); }));\n}\n})\n- .error(failHandler);\n+ .fail(failHandler);\nfunction Owner(data) {\nthis.name = ko.observable(data.Name);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove jquery nuget package refs. Remove some of our uses of .error and removeattr |
455,737 | 16.07.2019 16:40:40 | 25,200 | 0346fc8d3fdf0b93a88d8720d55f5df46b955a79 | Remove all error -> fail for ajax | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-signin.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-signin.js",
"diff": "@@ -49,7 +49,7 @@ $(function () {\n}\n}\n})\n- .error(failHandler);\n+ .fail(failHandler);\n},\nsendEmailNotification: function () {\n@@ -84,7 +84,7 @@ $(function () {\n}\n}\n})\n- .error(failHandler);\n+ .fail(failHandler);\n},\nresetViewModel: function () {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-support-requests.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-support-requests.js",
"diff": "@@ -38,7 +38,7 @@ var EditViewModel = (function () {\ndata: window.nuget.addAjaxAntiForgeryToken(model),\nsuccess: success\n})\n- .error(error);\n+ .fail(error);\n};\n};\n}());\n@@ -201,7 +201,7 @@ var SupportRequestsViewModel = (function () {\n$self.historyDialog.dialog('open');\n}\n})\n- .error(function (jqXhr, textStatus, errorThrown) {\n+ .fail(function (jqXhr, textStatus, errorThrown) {\nalert(\"Error: \" + errorThrown);\n});\n@@ -268,7 +268,7 @@ var SupportRequestsViewModel = (function () {\n$self.styleButtons();\n}\n})\n- .error(function (jqXhr, textStatus, errorThrown) {\n+ .fail(function (jqXhr, textStatus, errorThrown) {\nalert(\"Error: \" + errorThrown);\n});\n};\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove all error -> fail for ajax |
455,736 | 16.07.2019 17:54:58 | 25,200 | 45cc2c464986d20accc0869e70fb5a6198a41f3e | Allow the circuit breaker to open on search 403
This can occur when the web app is stopped.
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientPolicies.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/SearchClientPolicies.cs",
"diff": "@@ -37,6 +37,7 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientCircuitBreakerPolicy\n// https://github.com/App-vNext/Polly.Extensions.Http/blob/808665304882fb921b1c38cbbd38fcc102229f84/src/Polly.Extensions.Http.Shared/HttpPolicyExtensions.cs\nreturn HttpPolicyExtensions\n.HandleTransientHttpError()\n+ .OrResult(r => r.StatusCode == HttpStatusCode.Forbidden)\n.CircuitBreakerAsync(breakAfterCount,\nbreakDuration,\nonBreak: (delegateResult, circuitBreakerStatus, breakDelay, context) =>\n@@ -68,8 +69,8 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientCircuitBreakerPolicy\n/// <returns>The policy.</returns>\npublic static IAsyncPolicy<HttpResponseMessage> SearchClientWaitAndRetryPolicy(int retryCount, int waitInMilliseconds, ILogger logger, string searchName, ITelemetryService telemetryService)\n{\n- return HttpPolicyExtensions.\n- HandleTransientHttpError()\n+ return HttpPolicyExtensions\n+ .HandleTransientHttpError()\n.Or<BrokenCircuitException>(\n(ex) =>\n{\n@@ -98,8 +99,9 @@ public static IAsyncPolicy<HttpResponseMessage> SearchClientWaitAndRetryPolicy(i\n/// <returns></returns>\npublic static IAsyncPolicy<HttpResponseMessage> SearchClientFallBackCircuitBreakerPolicy(ILogger logger, string searchName, ITelemetryService telemetryService)\n{\n- return HttpPolicyExtensions.\n- HandleTransientHttpError()\n+ return HttpPolicyExtensions\n+ .HandleTransientHttpError()\n+ .OrResult(r => r.StatusCode == HttpStatusCode.Forbidden)\n.Or<Exception>()\n.FallbackAsync(\nfallbackAction: async (context, cancellationToken) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/SearchPolicyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/SearchPolicyFacts.cs",
"diff": "using System.Linq;\nusing System.Net;\nusing System.Net.Http;\n+using System.Threading;\nusing System.Threading.Tasks;\nusing Microsoft.Extensions.DependencyInjection;\nusing Microsoft.Extensions.Logging;\n@@ -29,15 +30,18 @@ public class SearchPolicyFacts\nprivate static LoggerFor_TestSearchHttpClient _loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay;\nprivate static LoggerFor_TestSearchHttpClient _loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay;\nprivate static LoggerFor_TestSearchHttpClient _loggerFor_ValidTestSearchHttpClient;\n+ private static LoggerFor_TestSearchHttpClient _loggerFor_InvalidTestSearchHttpClientRetryCountExpires;\n+ private static LoggerFor_TestSearchHttpClient _loggerFor_SearchHttpClientReturning403;\nprivate static string _nameFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay = \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\";\nprivate static string _nameFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay = \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\";\nprivate static string _nameFor_ValidTestSearchHttpClient = \"ValidTestSearchHttpClient\";\n- private static readonly string _longInvalidAddress = \"https://api-v2v3search-long.nuget.org\";\n- private static readonly string _shortInvalidAddress = \"https://api-v2v3search-short.nuget.org\";\n- private static readonly string _validAddress = \"https://api-v2v3search-0.nuget.org\";\n- private static readonly string _shortInvalidAddress_2 = \"https://api-v2v3search-short-2.nuget.org\";\nprivate static string _nameFor_InvalidTestSearchHttpClientRetryCountExpires = \"InvalidTestSearchHttpClientRetryCountExpires\";\n- private static LoggerFor_TestSearchHttpClient _loggerFor_InvalidTestSearchHttpClientRetryCountExpires;\n+ private static string _nameFor_SearchHttpClientReturning403 = \"SearchHttpClientReturning403\";\n+ private static readonly string _longInvalidAddress = \"https://example-long-invalid\";\n+ private static readonly string _shortInvalidAddress = \"https://example-short-invalid\";\n+ private static readonly string _validAddress = \"https://example-valid\";\n+ private static readonly string _shortInvalidAddress_2 = \"https://example-short-invalid-2\";\n+ private static readonly string _403Address = \"https://example-403\";\npublic SearchPolicyFacts()\n{\n@@ -106,6 +110,51 @@ public async Task TestCircuitBreakerForContinuouslyFailingRequests()\nAssert.Equal(HttpStatusCode.ServiceUnavailable, r2.StatusCode);\n}\n+ [Fact]\n+ public async Task TestCircuitBreakerForEndpointReturning403()\n+ {\n+ var invalidHttpClient = _services.BuildServiceProvider().GetServices<TestSearchHttpClient>().Where(s => s.BaseAddress == new Uri(_403Address)).ElementAt(0);\n+ var uri = new Uri($\"{invalidHttpClient.BaseAddress}query?q=packageid:Newtonsoft.Json version:12.0.1\");\n+ var validUri = new Uri($\"{_validAddress}/query?q=packageid:Newtonsoft.Json version:12.0.1\");\n+\n+ var r = await invalidHttpClient.GetAsync(uri);\n+\n+ var retryInfo = _loggerFor_SearchHttpClientReturning403.Informations.Where(s => s.StartsWith(\"Policy retry - it will retry after\")).Count();\n+ var onCircuitBreakerfallBackInfo = _loggerFor_SearchHttpClientReturning403.Informations.Where(s => s.StartsWith(\"On circuit breaker fallback.\")).Count();\n+ var circuitBreakerWarning = _loggerFor_SearchHttpClientReturning403.Warnings.Where(s => s.StartsWith(\"SearchCircuitBreaker logging: Breaking the circuit for\")).Count();\n+\n+ Assert.Equal(0, retryInfo);\n+ Assert.Equal(1, onCircuitBreakerfallBackInfo);\n+ Assert.Equal(0, circuitBreakerWarning);\n+ Assert.Equal(HttpStatusCode.ServiceUnavailable, r.StatusCode);\n+\n+ // Request again. The circuit breaker should be open and not allowing requests to pass through\n+ var r2 = await invalidHttpClient.GetAsync(uri);\n+\n+ retryInfo = _loggerFor_SearchHttpClientReturning403.Informations.Where(s => s.StartsWith(\"Policy retry - it will retry after\")).Count();\n+ onCircuitBreakerfallBackInfo = _loggerFor_SearchHttpClientReturning403.Informations.Where(s => s.StartsWith(\"On circuit breaker fallback.\")).Count();\n+ circuitBreakerWarning = _loggerFor_SearchHttpClientReturning403.Warnings.Where(s => s.StartsWith(\"SearchCircuitBreaker logging: Breaking the circuit for\")).Count();\n+\n+ // No other info added\n+ Assert.Equal(0, retryInfo);\n+ Assert.Equal(2, onCircuitBreakerfallBackInfo);\n+ Assert.Equal(1, circuitBreakerWarning);\n+ Assert.Equal(HttpStatusCode.ServiceUnavailable, r2.StatusCode);\n+\n+ // Request again with correct uri. The circuit breaker should be open and not allowing requests to pass through\n+ var r3 = await invalidHttpClient.GetAsync(validUri);\n+\n+ retryInfo = _loggerFor_SearchHttpClientReturning403.Informations.Where(s => s.StartsWith(\"Policy retry - it will retry after\")).Count();\n+ onCircuitBreakerfallBackInfo = _loggerFor_SearchHttpClientReturning403.Informations.Where(s => s.StartsWith(\"On circuit breaker fallback.\")).Count();\n+ circuitBreakerWarning = _loggerFor_SearchHttpClientReturning403.Warnings.Where(s => s.StartsWith(\"SearchCircuitBreaker logging: Breaking the circuit for\")).Count();\n+\n+ // No other info added\n+ Assert.Equal(0, retryInfo);\n+ Assert.Equal(3, onCircuitBreakerfallBackInfo);\n+ Assert.Equal(1, circuitBreakerWarning);\n+ Assert.Equal(HttpStatusCode.ServiceUnavailable, r2.StatusCode);\n+ }\n+\n[Fact]\npublic async Task TestCircuitBreakerForRecoveringRequests()\n{\n@@ -192,10 +241,17 @@ public async Task TestWaitAndRetryForInvalidRequests()\nAssert.Equal(HttpStatusCode.ServiceUnavailable, r.StatusCode);\n}\n- private static ILogger<ResilientSearchHttpClient> GetLogger()\n+ private static TestHttpHandler MakeTestHttpHandler()\n{\n- var mockConfiguration = new Mock<ILogger<ResilientSearchHttpClient>>();\n- return mockConfiguration.Object;\n+ var handler = new TestHttpHandler();\n+\n+ handler.Handlers[_longInvalidAddress] = r => new HttpResponseMessage(HttpStatusCode.ServiceUnavailable);\n+ handler.Handlers[_shortInvalidAddress] = r => new HttpResponseMessage(HttpStatusCode.ServiceUnavailable);\n+ handler.Handlers[_shortInvalidAddress_2] = r => new HttpResponseMessage(HttpStatusCode.ServiceUnavailable);\n+ handler.Handlers[_validAddress] = r => new HttpResponseMessage(HttpStatusCode.OK);\n+ handler.Handlers[_403Address] = r => new HttpResponseMessage(HttpStatusCode.Forbidden);\n+\n+ return handler;\n}\nprivate static ServiceCollection ConfigureServices()\n@@ -204,10 +260,12 @@ private static ServiceCollection ConfigureServices()\nITelemetryService telemetryServiceResolver = mockITelemetryService.Object;\nServiceCollection services = new ServiceCollection();\n+\n_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay = new LoggerFor_TestSearchHttpClient();\n_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay = new LoggerFor_TestSearchHttpClient();\n_loggerFor_ValidTestSearchHttpClient = new LoggerFor_TestSearchHttpClient();\n_loggerFor_InvalidTestSearchHttpClientRetryCountExpires = new LoggerFor_TestSearchHttpClient();\n+ _loggerFor_SearchHttpClientReturning403 = new LoggerFor_TestSearchHttpClient();\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay, c => c.BaseAddress = new Uri(_longInvalidAddress))\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay, \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver))\n@@ -216,7 +274,8 @@ private static ServiceCollection ConfigureServices()\n_circuitBreakerFailAfter,\nTimeSpan.FromSeconds(_circuitBreakerLongDelaySeconds),\n_loggerFor_InvalidTestSearchHttpClientWithLongCircuitBreakDelay,\n- \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver));\n+ \"InvalidTestSearchHttpClientWithLongCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddHttpMessageHandler(() => MakeTestHttpHandler());\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay, c => c.BaseAddress = new Uri(_shortInvalidAddress))\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n@@ -225,7 +284,8 @@ private static ServiceCollection ConfigureServices()\n_circuitBreakerFailAfter,\nTimeSpan.FromSeconds(_circuitBreakerShortDelaySeconds),\n_loggerFor_InvalidTestSearchHttpClientWithShortCircuitBreakDelay,\n- \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver));\n+ \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddHttpMessageHandler(() => MakeTestHttpHandler());\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_ValidTestSearchHttpClient, c => c.BaseAddress = new Uri(_validAddress))\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_ValidTestSearchHttpClient, \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n@@ -234,7 +294,8 @@ private static ServiceCollection ConfigureServices()\n_circuitBreakerFailAfter,\nTimeSpan.FromSeconds(_circuitBreakerShortDelaySeconds),\n_loggerFor_ValidTestSearchHttpClient,\n- \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver));\n+ \"InvalidTestSearchHttpClientWithShortCircuitBreakDelay\", telemetryServiceResolver))\n+ .AddHttpMessageHandler(() => MakeTestHttpHandler());\nservices.AddHttpClient<TestSearchHttpClient>(_nameFor_InvalidTestSearchHttpClientRetryCountExpires, c => c.BaseAddress = new Uri(_shortInvalidAddress_2))\n.AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_InvalidTestSearchHttpClientRetryCountExpires, \"InvalidTestSearchHttpClientRetryCountExpires\", telemetryServiceResolver))\n@@ -243,11 +304,39 @@ private static ServiceCollection ConfigureServices()\n_circuitBreakerFailAfter_2,\nTimeSpan.FromSeconds(_circuitBreakerShortDelaySeconds),\n_loggerFor_InvalidTestSearchHttpClientRetryCountExpires,\n- \"InvalidTestSearchHttpClientRetryCountExpires\", telemetryServiceResolver));\n+ \"InvalidTestSearchHttpClientRetryCountExpires\", telemetryServiceResolver))\n+ .AddHttpMessageHandler(() => MakeTestHttpHandler());\n+\n+ services.AddHttpClient<TestSearchHttpClient>(_nameFor_SearchHttpClientReturning403, c => c.BaseAddress = new Uri(_403Address))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientFallBackCircuitBreakerPolicy(_loggerFor_SearchHttpClientReturning403, _nameFor_SearchHttpClientReturning403, telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientWaitAndRetryPolicy(_retryCount, _waitBetweenRetriesInMilliseconds, _loggerFor_SearchHttpClientReturning403, _nameFor_SearchHttpClientReturning403, telemetryServiceResolver))\n+ .AddPolicyHandler(SearchClientPolicies.SearchClientCircuitBreakerPolicy(\n+ _circuitBreakerFailAfter,\n+ TimeSpan.FromSeconds(_circuitBreakerLongDelaySeconds),\n+ _loggerFor_SearchHttpClientReturning403,\n+ _nameFor_SearchHttpClientReturning403, telemetryServiceResolver))\n+ .AddHttpMessageHandler(() => MakeTestHttpHandler());\nreturn services;\n}\n+ private class TestHttpHandler : DelegatingHandler\n+ {\n+ public Dictionary<string, Func<HttpRequestMessage, HttpResponseMessage>> Handlers { get; } =\n+ new Dictionary<string, Func<HttpRequestMessage, HttpResponseMessage>>();\n+\n+ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)\n+ {\n+ var schemeAndServer = request.RequestUri.GetComponents(UriComponents.SchemeAndServer, UriFormat.Unescaped);\n+ if (Handlers.TryGetValue(schemeAndServer, out var handler))\n+ {\n+ return Task.FromResult(handler(request));\n+ }\n+\n+ throw new NotImplementedException($\"Scheme and server '{schemeAndServer}' does not have a handler.\");\n+ }\n+ }\n+\nprivate class TestSearchHttpClient : IHttpClientWrapper\n{\nHttpClient _client;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Allow the circuit breaker to open on search 403 (#7353)
This can occur when the web app is stopped.
Progress on https://github.com/NuGet/NuGetGallery/issues/7119 |
455,781 | 22.07.2019 15:21:22 | 25,200 | d34bb758abd0d362c20683c84aac01f0b27d9205 | Title removed from PackageViewModel, package-legacy-title clss removed from css | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1493,9 +1493,6 @@ img.reserved-indicator-icon {\n.page-search-sxs .col-package-icon {\npadding-right: 0;\n}\n-.page-search-sxs .package .package-legacy-title {\n- display: none;\n-}\n.page-search-sxs .panel-body p:last-child {\nmargin-bottom: 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-search-sxs.less",
"new_path": "src/Bootstrap/less/theme/page-search-sxs.less",
"diff": "padding-right: 0;\n}\n- .package .package-legacy-title {\n- display: none;\n- }\n-\n.panel-body p:last-child {\nmargin-bottom: 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "@@ -10,7 +10,6 @@ namespace NuGetGallery\npublic class PackageViewModel : IPackageVersionModel\n{\nprotected readonly Package _package;\n- private string _pendingTitle;\nprivate readonly PackageStatus _packageStatus;\ninternal readonly NuGetVersion NuGetVersion;\n@@ -73,13 +72,6 @@ public string Id\npublic string Version { get; set; }\npublic string FullVersion { get; }\npublic bool IsSemVer2 { get; }\n-\n- public string Title\n- {\n- get { return _pendingTitle ?? (String.IsNullOrEmpty(_package.Title) ? _package.PackageRegistration.Id : _package.Title); }\n- set { _pendingTitle = value; }\n- }\n-\npublic bool IsCurrent(IPackageVersionModel current)\n{\nreturn current.Version == Version && current.Id == Id;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -715,7 +715,6 @@ private async Task CheckValidPackage(User currentUser, User owner)\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\nAssert.Equal(\"Foo\", model.Id);\nAssert.Equal(\"1.1.1\", model.Version);\n- Assert.Equal(title, model.Title);\ndeprecationService.Verify();\n}\n@@ -793,7 +792,6 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()\nAssert.Equal(id, model.Id);\n// The page should select the first package that is IsLatestSemVer2\nAssert.Equal(latestPackage.NormalizedVersion, model.Version);\n- Assert.Equal(latestPackage.Title, model.Title);\nAssert.True(model.LatestVersionSemVer2);\ndeprecationService.Verify();\n@@ -849,7 +847,6 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList\nAssert.Equal(id, model.Id);\nAssert.Equal(notLatestPackage.NormalizedVersion, model.Version);\n- Assert.Equal(notLatestPackage.Title, model.Title);\nAssert.False(model.LatestVersionSemVer2);\ndeprecationService.Verify();\n@@ -903,7 +900,6 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD\nvar model = ResultAssert.IsView<DisplayPackageViewModel>(result);\nAssert.Equal(\"Foo\", model.Id);\nAssert.Equal(\"1.1.1\", model.Version);\n- Assert.Equal(\"A test package!\", model.Title);\nAssert.Null(model.ReadMeHtml);\ndeprecationService.Verify();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Title removed from PackageViewModel, package-legacy-title clss removed from css |
455,736 | 23.07.2019 10:09:51 | 25,200 | 485645c4cda07c4fc5afd238f3892a6b89c02f4f | Make NuGetGallery unit tests work offline and add missing test DLLs
Address | [
{
"change_type": "MODIFY",
"old_path": "test.ps1",
"new_path": "test.ps1",
"diff": "@@ -24,9 +24,12 @@ Function Run-Tests {\n$xUnitExe = (Join-Path $PSScriptRoot \"packages\\xunit.runner.console\\tools\\xunit.console.exe\")\n- $TestAssemblies = \"tests\\NuGetGallery.Core.Facts\\bin\\$Configuration\\NuGetGallery.Core.Facts.dll\", `\n- \"tests\\NuGetGallery.Facts\\bin\\$Configuration\\NuGetGallery.Facts.dll\", `\n- \"tests\\NuGet.Services.Entities.Tests\\bin\\$Configuration\\NuGet.Services.Entities.Tests.dll\"\n+ $TestAssemblies = `\n+ \"tests\\AccountDeleter.Facts\\bin\\$Configuration\\AccountDeleter.Facts.dll\", `\n+ \"tests\\NuGet.Services.DatabaseMigration.Facts\\bin\\$Configuration\\NuGet.Services.DatabaseMigration.Facts.dll\", `\n+ \"tests\\NuGet.Services.Entities.Tests\\bin\\$Configuration\\NuGet.Services.Entities.Tests.dll\", `\n+ \"tests\\NuGetGallery.Core.Facts\\bin\\$Configuration\\NuGetGallery.Core.Facts.dll\", `\n+ \"tests\\NuGetGallery.Facts\\bin\\$Configuration\\NuGetGallery.Facts.dll\"\n$TestCount = 0\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using System.Net;\nusing System.Net.Http;\n+using System.Threading;\nusing System.Threading.Tasks;\n+using System.Web;\nusing Microsoft.Extensions.Logging;\nusing Moq;\n+using Newtonsoft.Json;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Infrastructure;\nusing NuGetGallery.Infrastructure.Search;\n@@ -17,6 +21,8 @@ namespace NuGetGallery\n{\npublic class AutocompleteServicePackageIdsQueryFacts\n{\n+ private TestHandler _testHandler;\n+\nprivate IAppConfiguration GetConfiguration()\n{\nvar mockConfiguration = new Mock<IAppConfiguration>();\n@@ -31,27 +37,25 @@ private ILogger<ResilientSearchHttpClient> GetLogger()\nprivate IResilientSearchClient GetResilientSearchClient()\n{\n+ _testHandler = new TestHandler();\nvar mockTelemetryService = new Mock<ITelemetryService>();\nList<IHttpClientWrapper> clients = new List<IHttpClientWrapper>();\n- clients.Add(new HttpClientWrapper(new HttpClient()\n+ clients.Add(new HttpClientWrapper(new HttpClient(_testHandler)\n{\n- BaseAddress = new Uri(\"https://api-v2v3search-0.nuget.org\")\n+ BaseAddress = new Uri(\"https://example\")\n}));\nreturn new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);\n}\n- private IFeatureFlagService GetFeatureFlagService()\n- {\n- var mockTelemetryService = new Mock<IFeatureFlagService>();\n- return mockTelemetryService.Object;\n- }\n-\n[Fact]\npublic async Task ExecuteReturns30ResultsForEmptyQuery()\n{\nvar query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\nvar result = await query.Execute(\"\", false);\n+\nAssert.True(result.Count() == 30);\n+ var request = Assert.Single(_testHandler.Requests);\n+ Assert.Equal(\"https://example/autocomplete?take=30&q=&prerelease=False\", request.RequestUri.AbsoluteUri);\n}\n[Fact]\n@@ -60,6 +64,8 @@ public async Task ExecuteReturns30ResultsForNullQuery()\nvar query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\nvar result = await query.Execute(null, false);\nAssert.True(result.Count() == 30);\n+ var request = Assert.Single(_testHandler.Requests);\n+ Assert.Equal(\"https://example/autocomplete?take=30&q=&prerelease=False\", request.RequestUri.AbsoluteUri);\n}\n[Fact]\n@@ -68,6 +74,8 @@ public async Task ExecuteReturnsResultsForSpecificQuery()\nvar query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());\nvar result = await query.Execute(\"jquery\", false);\nAssert.Contains(\"jquery\", result, StringComparer.OrdinalIgnoreCase);\n+ var request = Assert.Single(_testHandler.Requests);\n+ Assert.Equal(\"https://example/autocomplete?take=30&q=jquery&prerelease=False\", request.RequestUri.AbsoluteUri);\n}\n[Theory]\n@@ -86,5 +94,38 @@ public void PackageIdQueryBuildsCorrectQueryString(bool includePrerelease, strin\n// Assert\nAssert.Equal(expectedQueryString, actualQueryString);\n}\n+\n+ private class TestHandler : HttpMessageHandler\n+ {\n+ public List<HttpRequestMessage> Requests { get; } = new List<HttpRequestMessage>();\n+\n+ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)\n+ {\n+ Requests.Add(request);\n+\n+ var queryString = HttpUtility.ParseQueryString(request.RequestUri.Query);\n+\n+ var q = queryString[\"q\"] ?? string.Empty;\n+\n+ if (!int.TryParse(queryString[\"take\"], out var take))\n+ {\n+ take = 20;\n+ }\n+\n+ var data = Enumerable\n+ .Range(0, take)\n+ .Select(x => $\"{q}{(x == 0 ? string.Empty : $\"-{x}\")}\")\n+ .ToList();\n+\n+ return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK)\n+ {\n+ RequestMessage = request,\n+ Content = new StringContent(\n+ JsonConvert.SerializeObject(new { totalHits = take, data }),\n+ System.Text.Encoding.UTF8,\n+ \"application/json\"),\n+ });\n+ }\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs",
"diff": "using NuGetGallery.Infrastructure.Search;\nusing Moq;\nusing Xunit;\n+using System.Web;\n+using System.Threading;\n+using System.Net;\n+using Newtonsoft.Json;\nnamespace NuGetGallery\n{\npublic class AutocompleteServicePackageVersionsQueryFacts\n{\n+ private TestHandler _testHandler;\n+\nprivate IAppConfiguration GetConfiguration()\n{\nvar mockConfiguration = new Mock<IAppConfiguration>();\n@@ -31,11 +37,13 @@ private ILogger<ResilientSearchHttpClient> GetLogger()\nprivate IResilientSearchClient GetResilientSearchClient()\n{\n+ _testHandler = new TestHandler();\n+\nvar mockTelemetryService = new Mock<ITelemetryService>();\nList<IHttpClientWrapper> clients = new List<IHttpClientWrapper>();\n- clients.Add(new HttpClientWrapper(new HttpClient()\n+ clients.Add(new HttpClientWrapper(new HttpClient(_testHandler)\n{\n- BaseAddress = new Uri(\"https://api-v2v3search-0.nuget.org\")\n+ BaseAddress = new Uri(\"https://example\")\n}));\nreturn new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);\n}\n@@ -45,6 +53,7 @@ public async Task ExecuteThrowsForEmptyId()\n{\nvar query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());\nawait Assert.ThrowsAsync<ArgumentNullException>(async () => await query.Execute(string.Empty, false));\n+ Assert.Empty(_testHandler.Requests);\n}\n[Fact]\n@@ -53,6 +62,8 @@ public async Task ExecuteReturnsResultsForSpecificQuery()\nvar query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());\nvar result = await query.Execute(\"newtonsoft.json\", false);\nAssert.True(result.Any());\n+ var request = Assert.Single(_testHandler.Requests);\n+ Assert.Equal(\"https://example/autocomplete?id=newtonsoft.json&prerelease=False\", request.RequestUri.AbsoluteUri);\n}\n[Theory]\n@@ -71,5 +82,34 @@ public void PackageVersionsQueryBuildsCorrectQueryString(bool includePrerelease,\n// Assert\nAssert.Equal(expectedQueryString, actualQueryString);\n}\n+\n+ private class TestHandler : HttpMessageHandler\n+ {\n+ public List<HttpRequestMessage> Requests { get; } = new List<HttpRequestMessage>();\n+\n+ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)\n+ {\n+ Requests.Add(request);\n+\n+ var queryString = HttpUtility.ParseQueryString(request.RequestUri.Query);\n+\n+ var id = queryString[\"id\"] ?? string.Empty;\n+ var take = 10;\n+\n+ var data = Enumerable\n+ .Range(0, 10)\n+ .Select(x => $\"1.0.{x}\")\n+ .ToList();\n+\n+ return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK)\n+ {\n+ RequestMessage = request,\n+ Content = new StringContent(\n+ JsonConvert.SerializeObject(new { totalHits = take, data }),\n+ System.Text.Encoding.UTF8,\n+ \"application/json\"),\n+ });\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"OData\\Serializers\\V2FeedPackageAnnotationStrategyFacts.cs\" />\n<Compile Include=\"PasswordValidationRegexTests.cs\" />\n<Compile Include=\"SearchClient\\CorrelatingHttpClientHandlerFacts.cs\" />\n- <Compile Include=\"SearchClient\\RequestInspectingHandler.cs\" />\n<Compile Include=\"SearchClient\\WebApiCorrelationHandlerFacts.cs\" />\n<Compile Include=\"Security\\RequirePackageVerifyScopePolicyFacts.cs\" />\n<Compile Include=\"Security\\SecurityPolicyServiceFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/SearchClient/CorrelatingHttpClientHandlerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/SearchClient/CorrelatingHttpClientHandlerFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Generic;\nusing System.Linq;\n+using System.Net;\nusing System.Net.Http;\nusing System.Runtime.Remoting.Messaging;\n+using System.Threading;\nusing System.Threading.Tasks;\nusing NuGetGallery.Infrastructure.Search.Correlation;\nusing Xunit;\nnamespace NuGetGallery.SearchClient\n{\n- public class CorrelatingHttpClientHandlerFacts\n+ public class CorrelatingHttpClientHandlerFacts : IDisposable\n{\n[Fact]\npublic async Task AddsCorrelationIdToRequestWhenAvailable()\n{\n// Arrange\nvar correlatingHttpClientHandler = new CorrelatingHttpClientHandler();\n- correlatingHttpClientHandler.InnerHandler = new HttpClientHandler();\n-\n- var inspectingHandler = new RequestInspectingHandler();\n- inspectingHandler.InnerHandler = correlatingHttpClientHandler;\n+ var testHandler = new TestHandler();\n+ correlatingHttpClientHandler.InnerHandler = testHandler;\nvar correlationId = Guid.NewGuid();\nCallContext.LogicalSetData(WebApiCorrelationHandler.CallContextKey, correlationId);\n// Act\n- using (var client = new HttpClient(inspectingHandler))\n+ using (var client = new HttpClient(correlatingHttpClientHandler))\n{\n- await client.GetAsync(\"https://www.nuget.org\");\n+ await client.GetAsync(\"https://example\");\n}\n// Assert\n- var request = inspectingHandler.Requests.FirstOrDefault();\n+ var request = testHandler.Requests.FirstOrDefault();\nAssert.NotNull(request);\nAssert.True(request.Headers.Contains(WebApiCorrelationHandler.CorrelationIdHttpHeaderName));\nAssert.Equal(correlationId.ToString(), request.Headers.GetValues(WebApiCorrelationHandler.CorrelationIdHttpHeaderName).FirstOrDefault());\n@@ -44,21 +45,35 @@ public async Task DoesNotAddCorrelationIdToRequestWhenNotAvailable()\n{\n// Arrange\nvar correlatingHttpClientHandler = new CorrelatingHttpClientHandler();\n- correlatingHttpClientHandler.InnerHandler = new HttpClientHandler();\n-\n- var inspectingHandler = new RequestInspectingHandler();\n- inspectingHandler.InnerHandler = correlatingHttpClientHandler;\n+ var testHandler = new TestHandler();\n+ correlatingHttpClientHandler.InnerHandler = testHandler;\n// Act\n- using (var client = new HttpClient(inspectingHandler))\n+ using (var client = new HttpClient(correlatingHttpClientHandler))\n{\n- await client.GetAsync(\"https://www.nuget.org\");\n+ await client.GetAsync(\"https://example\");\n}\n// Assert\n- var request = inspectingHandler.Requests.FirstOrDefault();\n+ var request = testHandler.Requests.FirstOrDefault();\nAssert.NotNull(request);\nAssert.False(request.Headers.Contains(WebApiCorrelationHandler.CorrelationIdHttpHeaderName));\n}\n+\n+ public void Dispose()\n+ {\n+ CallContext.FreeNamedDataSlot(WebApiCorrelationHandler.CorrelationIdHttpHeaderName);\n+ }\n+\n+ public class TestHandler : HttpMessageHandler\n+ {\n+ public List<HttpRequestMessage> Requests { get; } = new List<HttpRequestMessage>();\n+\n+ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)\n+ {\n+ Requests.Add(request);\n+ return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK));\n+ }\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "tests/NuGetGallery.Facts/SearchClient/RequestInspectingHandler.cs",
"new_path": null,
"diff": "-// Copyright (c) .NET Foundation. All rights reserved.\n-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System.Collections.Generic;\n-using System.Net.Http;\n-using System.Threading;\n-using System.Threading.Tasks;\n-\n-namespace NuGetGallery.SearchClient\n-{\n- public class RequestInspectingHandler\n- : DelegatingHandler\n- {\n- public List<HttpRequestMessage> Requests { get; private set; }\n-\n- public RequestInspectingHandler()\n- {\n- Requests = new List<HttpRequestMessage>();\n- InnerHandler = new HttpClientHandler();\n- }\n-\n- protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)\n- {\n- Requests.Add(request);\n-\n- return base.SendAsync(request, cancellationToken);\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUpdateServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUpdateServiceFacts.cs",
"diff": "using NuGetGallery.Auditing;\nusing NuGetGallery.Framework;\nusing System;\n-using System.Collections;\nusing System.Collections.Generic;\nusing System.Linq;\nusing System.Threading.Tasks;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/TelemetryServiceFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Collections;\nusing System.Collections.Generic;\nusing System.Diagnostics;\nusing System.Linq;\n-using CommonMark.Syntax;\n-using Microsoft.Ajax.Utilities;\nusing Moq;\nusing NuGet.Services.Entities;\nusing NuGet.Versioning;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make NuGetGallery unit tests work offline and add missing test DLLs (#7367)
Address https://github.com/NuGet/NuGetGallery/issues/7322 |
455,776 | 26.07.2019 15:43:43 | 25,200 | a5d5d2b100589f38aff5ccbcdd8dcf82861ccf5f | fix argument null exception | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "@@ -163,6 +163,7 @@ public async Task<JsonResult> AddPackageOwner(AddPackageOwnerViewModel addOwnerD\nrejectionUrl,\nencodedMessage,\nstring.Empty);\n+\nawait _messageService.SendMessageAsync(packageOwnershipRequestMessage);\nforeach (var owner in model.Package.Owners)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnershipRequestMessage.cs",
"new_path": "src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnershipRequestMessage.cs",
"diff": "@@ -32,7 +32,7 @@ public class PackageOwnershipRequestMessage : MarkdownEmailBuilder\nPackageUrl = packageUrl ?? throw new ArgumentNullException(nameof(packageUrl));\nRawConfirmationUrl = confirmationUrl ?? throw new ArgumentNullException(nameof(confirmationUrl));\nRawRejectionUrl = rejectionUrl ?? throw new ArgumentNullException(nameof(rejectionUrl));\n- HtmlEncodedMessage = htmlEncodedMessage ?? throw new ArgumentNullException(nameof(htmlEncodedMessage));\n+ HtmlEncodedMessage = htmlEncodedMessage;\nPolicyMessage = policyMessage ?? throw new ArgumentNullException(nameof(policyMessage));\n_isToUserOrganization = ToUser is Organization;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | fix argument null exception |
455,776 | 29.07.2019 15:35:03 | 25,200 | 8d74f525f244d77ccff49b3a7c6e29e761170e06 | Add page for managing site admins | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleteUserService.cs",
"new_path": "src/AccountDeleter/AccountDeleteUserService.cs",
"diff": "@@ -147,5 +147,15 @@ public Task<Membership> UpdateMemberAsync(Organization organization, string memb\n{\nthrow new NotImplementedException();\n}\n+\n+ public IReadOnlyList<User> GetSiteAdmins()\n+ {\n+ throw new NotImplementedException();\n+ }\n+\n+ public Task SetIsAdministrator(User user, bool isAdmin)\n+ {\n+ throw new NotImplementedException();\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/EmptyUserService.cs",
"new_path": "src/AccountDeleter/EmptyUserService.cs",
"diff": "@@ -134,5 +134,15 @@ public Task<Membership> UpdateMemberAsync(Organization organization, string memb\n{\nthrow new NotImplementedException();\n}\n+\n+ public IReadOnlyList<User> GetSiteAdmins()\n+ {\n+ throw new NotImplementedException();\n+ }\n+\n+ public Task SetIsAdministrator(User user, bool isAdmin)\n+ {\n+ throw new NotImplementedException();\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"new_path": "src/NuGet.Services.Entities/NuGet.Services.Entities.csproj",
"diff": "<Compile Include=\"EntityException.cs\" />\n<Compile Include=\"Extensions\\PackageExtensions.cs\" />\n<Compile Include=\"Extensions\\PackageRegistrationExtensions.cs\" />\n+ <Compile Include=\"Extensions\\RoleExtensions.cs\" />\n<Compile Include=\"IEntity.cs\" />\n<Compile Include=\"IPackageEntity.cs\" />\n<Compile Include=\"Membership.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Entities/User.cs",
"new_path": "src/NuGet.Services.Entities/User.cs",
"diff": "@@ -177,7 +177,7 @@ public void UpdateUnconfirmedEmailAddress(string newEmailAddress, Func<string> g\npublic bool IsInRole(string roleName)\n{\n- return Roles.Any(r => String.Equals(r.Name, roleName, StringComparison.OrdinalIgnoreCase));\n+ return Roles.Any(r => r.Is(roleName));\n}\npublic bool Equals(User other)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/UserManagement/IUserService.cs",
"new_path": "src/NuGetGallery.Services/UserManagement/IUserService.cs",
"diff": "@@ -56,5 +56,9 @@ public interface IUserService\nTask<bool> CancelTransformUserToOrganizationRequest(User accountToTransform, string token);\nTask<Organization> AddOrganizationAsync(string username, string emailAddress, User adminUser);\n+\n+ IReadOnlyList<User> GetSiteAdmins();\n+\n+ Task SetIsAdministrator(User user, bool isAdmin);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/UserManagement/UserService.cs",
"new_path": "src/NuGetGallery.Services/UserManagement/UserService.cs",
"diff": "@@ -25,6 +25,8 @@ public class UserService : IUserService\npublic IEntityRepository<User> UserRepository { get; protected set; }\n+ public IEntityRepository<Role> RoleRepository { get; protected set; }\n+\npublic IEntityRepository<Credential> CredentialRepository { get; protected set; }\npublic IEntityRepository<Organization> OrganizationRepository { get; protected set; }\n@@ -48,6 +50,7 @@ public class UserService : IUserService\npublic UserService(\nIAppConfiguration config,\nIEntityRepository<User> userRepository,\n+ IEntityRepository<Role> roleRepository,\nIEntityRepository<Credential> credentialRepository,\nIEntityRepository<Organization> organizationRepository,\nIAuditingService auditing,\n@@ -62,6 +65,7 @@ public class UserService : IUserService\n{\nConfig = config;\nUserRepository = userRepository;\n+ RoleRepository = roleRepository;\nCredentialRepository = credentialRepository;\nOrganizationRepository = organizationRepository;\nAuditing = auditing;\n@@ -662,5 +666,47 @@ public async Task<bool> CancelTransformUserToOrganizationRequest(User accountToT\nreturn true;\n}\n+\n+ public IReadOnlyList<User> GetSiteAdmins()\n+ {\n+ return GetAdminRole()\n+ .Users\n+ .Where(u => !u.IsDeleted)\n+ .ToList();\n+ }\n+\n+ public Task SetIsAdministrator(User user, bool isAdmin)\n+ {\n+ if (user == null)\n+ {\n+ throw new ArgumentNullException(nameof(user));\n+ }\n+\n+ var adminRole = GetAdminRole();\n+ if (adminRole == null)\n+ {\n+ throw new InvalidOperationException(\"No admin role exists!\");\n+ }\n+\n+ if (isAdmin)\n+ {\n+ adminRole.Users.Add(user);\n+ user.Roles.Add(adminRole);\n+ }\n+ else\n+ {\n+ adminRole.Users.Remove(user);\n+ user.Roles.Remove(adminRole);\n+ }\n+\n+ return RoleRepository.CommitChangesAsync();\n+ }\n+\n+ private Role GetAdminRole()\n+ {\n+ return RoleRepository.GetAll()\n+ .ToList()\n+ .Single(r => r.Is(Constants.AdminRoleName));\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "using Microsoft.Extensions.Http;\nusing NuGetGallery.Infrastructure.Lucene;\nusing System.Threading;\n+using Role = NuGet.Services.Entities.Role;\nnamespace NuGetGallery\n{\n@@ -178,6 +179,11 @@ protected override void Load(ContainerBuilder builder)\n.As<IEntityRepository<User>>()\n.InstancePerLifetimeScope();\n+ builder.RegisterType<EntityRepository<Role>>()\n+ .AsSelf()\n+ .As<IEntityRepository<Role>>()\n+ .InstancePerLifetimeScope();\n+\nbuilder.RegisterType<EntityRepository<ReservedNamespace>>()\n.AsSelf()\n.As<IEntityRepository<ReservedNamespace>>()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"diff": "Manage which features are enabled\n</p>\n</li>\n+ <li>\n+ <h2>\n+ <a href=\"@Url.Action(actionName: \"Index\", controllerName: \"SiteAdmins\")\">\n+ <i class=\"ms-Icon ms-Icon--Admin\"></i>\n+ <span>Site Admins</span>\n+ </a>\n+ </h2>\n+ <p>\n+ Manage site admins\n+ </p>\n+ </li>\n</ul>\n</section>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Areas\\Admin\\Controllers\\ReservedNamespaceController.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\RevalidationController.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\SecurityPolicyController.cs\" />\n+ <Compile Include=\"Areas\\Admin\\Controllers\\SiteAdminsController.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\SupportRequestController.cs\" />\n<Compile Include=\"Areas\\Admin\\Controllers\\ValidationController.cs\" />\n<Compile Include=\"Areas\\Admin\\DynamicData\\FieldTemplates\\Url_Edit.ascx.cs\">\n<Compile Include=\"Areas\\Admin\\ViewModels\\LockPackageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ModifyFeatureFlagsFeatureViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ModifyFeatureFlagsFlightViewModel.cs\" />\n+ <Compile Include=\"Areas\\Admin\\ViewModels\\SiteAdminsViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ValidatedPackageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\RevalidationPageViewModel.cs\" />\n<Compile Include=\"Areas\\Admin\\ViewModels\\ValidationPageViewModel.cs\" />\n<Content Include=\"Areas\\Admin\\Views\\Features\\_AddFlight.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\Features\\_EditFlight.cshtml\" />\n<Content Include=\"App_Data\\Files\\Content\\AB-Test-Configuration.json\" />\n+ <Content Include=\"Areas\\Admin\\Views\\SiteAdmins\\Index.cshtml\" />\n<None Include=\"Properties\\PublishProfiles\\nuget-staging-frontend.pubxml\" />\n<Content Include=\"Scripts\\gallery\\async-file-upload.js\" />\n<Content Include=\"Scripts\\gallery\\autocomplete.js\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/UserServiceFacts.cs",
"diff": "@@ -2123,6 +2123,105 @@ public async Task IfTokenMatches_RemovesRequest()\nservice.MockUserRepository.Verify(x => x.CommitChangesAsync(), Times.Once);\n}\n}\n+\n+ public class TheGetSiteAdminsMethod\n+ {\n+ [Fact]\n+ public void ReturnsExpectedUsers()\n+ {\n+ var adminRole = new Role { Key = 0, Name = Constants.AdminRoleName };\n+\n+ var notAdminUser = new User { Username = \"notAdminUser\", Key = 1, EmailAddress = \"[email protected]\" };\n+ var notAdminDeletedUser = new User { Username = \"notAdminDeletedUser\", Key = 1, EmailAddress = \"[email protected]\" };\n+\n+ var adminUser = new User { Username = \"adminUser\", Key = 1, EmailAddress = \"[email protected]\" };\n+ adminRole.Users.Add(adminUser);\n+ adminUser.Roles.Add(adminRole);\n+ var adminDeletedUser = new User { Username = \"adminDeletedUser\", Key = 1, EmailAddress = \"[email protected]\" };\n+ adminRole.Users.Add(adminDeletedUser);\n+ adminDeletedUser.Roles.Add(adminRole);\n+\n+ var service = new TestableUserServiceWithDBFaking\n+ {\n+ Users = new[] { notAdminUser, notAdminDeletedUser, adminUser, adminDeletedUser },\n+ Roles = new[] { adminRole }\n+ };\n+\n+ var result = service.GetSiteAdmins();\n+ Assert.Equal(1, result.Count);\n+ Assert.Equal(adminUser, result.Single());\n+ }\n+ }\n+\n+ public class TheSetIsAdministratorMethod\n+ {\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public Task ThrowsArgumentNullExceptionIfUserNull(bool isAdmin)\n+ {\n+ var service = new TestableUserService();\n+ return Assert.ThrowsAsync<ArgumentNullException>(() => service.SetIsAdministrator(null, isAdmin));\n+ }\n+\n+ [Theory]\n+ [InlineData(false)]\n+ [InlineData(true)]\n+ public Task ThrowsInvalidOperationExceptionIfRoleNull(bool isAdmin)\n+ {\n+ var user = new User();\n+ var service = new TestableUserService();\n+ return Assert.ThrowsAsync<InvalidOperationException>(() => service.SetIsAdministrator(user, isAdmin));\n+ }\n+\n+ [Fact]\n+ public async Task AddsAdminCorrectly()\n+ {\n+ // Arrange\n+ var adminRole = new Role { Key = 0, Name = Constants.AdminRoleName };\n+ var user = new User { Username = \"user\", Key = 1, EmailAddress = \"[email protected]\" };\n+\n+ var service = new TestableUserServiceWithDBFaking\n+ {\n+ Users = new[] { user },\n+ Roles = new[] { adminRole }\n+ };\n+\n+ // Act\n+ await service.SetIsAdministrator(user, true);\n+\n+ // Assert\n+ service.FakeEntitiesContext.VerifyCommitChanges();\n+\n+ Assert.Contains(user, adminRole.Users);\n+ Assert.Contains(adminRole, user.Roles);\n+ }\n+\n+ [Fact]\n+ public async Task RemovesAdminCorrectly()\n+ {\n+ // Arrange\n+ var adminRole = new Role { Key = 0, Name = Constants.AdminRoleName };\n+ var user = new User { Username = \"user\", Key = 1, EmailAddress = \"[email protected]\" };\n+ adminRole.Users.Add(user);\n+ user.Roles.Add(adminRole);\n+\n+ var service = new TestableUserServiceWithDBFaking\n+ {\n+ Users = new[] { user },\n+ Roles = new[] { adminRole }\n+ };\n+\n+ // Act\n+ await service.SetIsAdministrator(user, false);\n+\n+ // Assert\n+ service.FakeEntitiesContext.VerifyCommitChanges();\n+\n+ Assert.DoesNotContain(user, adminRole.Users);\n+ Assert.DoesNotContain(adminRole, user.Roles);\n+ }\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs",
"diff": "@@ -19,6 +19,7 @@ public class TestableUserService : UserService\npublic Mock<IAppConfiguration> MockConfig { get; protected set; }\npublic Mock<ISecurityPolicyService> MockSecurityPolicyService { get; protected set; }\npublic Mock<IEntityRepository<User>> MockUserRepository { get; protected set; }\n+ public Mock<IEntityRepository<Role>> MockRoleRepository { get; protected set; }\npublic Mock<IEntityRepository<Credential>> MockCredentialRepository { get; protected set; }\npublic Mock<IEntityRepository<Organization>> MockOrganizationRepository { get; protected set; }\npublic Mock<IEntitiesContext> MockEntitiesContext { get; protected set; }\n@@ -33,6 +34,7 @@ public TestableUserService()\nConfig = (MockConfig = new Mock<IAppConfiguration>()).Object;\nSecurityPolicyService = (MockSecurityPolicyService = new Mock<ISecurityPolicyService>()).Object;\nUserRepository = (MockUserRepository = new Mock<IEntityRepository<User>>()).Object;\n+ RoleRepository = (MockRoleRepository = new Mock<IEntityRepository<Role>>()).Object;\nCredentialRepository = (MockCredentialRepository = new Mock<IEntityRepository<Credential>>()).Object;\nOrganizationRepository = (MockOrganizationRepository = new Mock<IEntityRepository<Organization>>()).Object;\nEntitiesContext = (MockEntitiesContext = new Mock<IEntitiesContext>()).Object;\n@@ -64,11 +66,20 @@ public IEnumerable<User> Users\n}\n}\n+ public IEnumerable<Role> Roles\n+ {\n+ set\n+ {\n+ foreach (Role r in value) FakeEntitiesContext.Set<Role>().Add(r);\n+ }\n+ }\n+\npublic TestableUserServiceWithDBFaking(FakeEntitiesContext context = null)\n{\nFakeEntitiesContext = context ?? new FakeEntitiesContext();\nConfig = (MockConfig = new Mock<IAppConfiguration>()).Object;\nUserRepository = new EntityRepository<User>(FakeEntitiesContext);\n+ RoleRepository = new EntityRepository<Role>(FakeEntitiesContext);\nAuditing = new TestAuditingService();\nTelemetryService = new TelemetryService();\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add page for managing site admins (#7387) |
455,776 | 01.08.2019 10:25:14 | 25,200 | 606bcad480db5fbf14e7355a82ebd6683409adfc | Fix minor accessibility issues found in recent scan | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -691,6 +691,10 @@ img.reserved-indicator-icon {\ncolor: #a94442;\nfont-weight: bold;\n}\n+.page-add-organization .owner-image {\n+ margin-top: 6px;\n+ margin-bottom: 6px;\n+}\n.page-api-keys .example-commands {\nbackground-color: #002440;\nfont-family: Consolas, Menlo, Monaco, \"Courier New\", monospace;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap.css",
"new_path": "src/Bootstrap/dist/css/bootstrap.css",
"diff": "@@ -1881,14 +1881,14 @@ output {\nbox-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6);\n}\n.form-control::-moz-placeholder {\n- color: #999;\n+ color: #737373;\nopacity: 1;\n}\n.form-control:-ms-input-placeholder {\n- color: #999;\n+ color: #737373;\n}\n.form-control::-webkit-input-placeholder {\n- color: #999;\n+ color: #737373;\n}\n.form-control::-ms-expand {\nbackground-color: transparent;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"common-user-package-list.less\";\n@import \"page-about.less\";\n@import \"page-account-settings.less\";\n+@import \"page-add-organization.less\";\n@import \"page-api-keys.less\";\n@import \"page-blog.less\";\n@import \"page-delete-account.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-add-organization.less",
"diff": "+.page-add-organization {\n+ .owner-image {\n+ margin-top: 6px;\n+ margin-bottom: 6px;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/variables.less",
"new_path": "src/Bootstrap/less/variables.less",
"diff": "@input-border-focus: #66afe9;\n//** Placeholder text color\n-@input-color-placeholder: #999;\n+@input-color-placeholder: #737373;\n//** Default `.form-control` height\n@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"diff": "var errorMessage = TempData[\"AddOrganizationErrorMessage\"];\n}\n-<section role=\"main\" class=\"container main-container\">\n+<section role=\"main\" class=\"container main-container page-add-organization\">\n<div class=\"row\">\n<div class=\"@ViewHelpers.GetColumnClasses(ViewBag)\">\[email protected](Url, CurrentUser, true, @<text>Add</text>)\n}\n<div>\n<aside class=\"col-sm-3 col-sm-push-9\">\n- @Html.Label(\"Logo\")\n- <a href=\"#\" id=\"transform-tooltip\" data-toggle=\"tooltip\" title=\"We use the email address for your organization and gravatar.com to get the logo.\">\n- <i class=\"ms-Icon ms-Icon--Info\" aria-hidden=\"true\" style=\"vertical-align: -2px\"></i>\n- </a>\n+ <b>Logo</b>\n<img src=\"@Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\")\" class=\"owner-image img-responsive\" height=\"332\" id=\"gravatar-image\" width=\"332\" alt=\"gravatar\" title=\"Organization logo\">\n+ <p class=\"ms-font-s\">\n+ We use the email address for your organization and gravatar.com to get the logo.\n+ </p>\n</aside>\n<div class=\"col-sm-6 col-sm-pull-3\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "</a>\n</h2>\n<div class=\"version-history panel-collapse collapse in\" aria-expanded=\"true\" id=\"version-history\">\n- <table class=\"table borderless\">\n+ <table aria-label=\"Version History of @Model.Id\" class=\"table borderless\">\n<thead>\n<tr>\n<th>Version</th>\n{\n<th>Status</th>\n}\n- <th colspan=\"2\"></th>\n+ <th aria-label=\"Signature Information\"></th>\n+ <th aria-label=\"Deprecation Information\"></th>\n</tr>\n</thead>\n<tbody class=\"no-border\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageOwners.cshtml",
"diff": "<div class=\"col-md-3 text-right remove-owner\">\n<a class=\"icon-link\"\nhref=\"#\"\n- title=\"Remove as owner of @Model.Id\"\n- data-bind=\"click: $root.removeOwner\">\n+ data-bind=\"click: $root.removeOwner, attr: { 'aria-label': 'Remove ' + name() + ' as owner of @Model.Id' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n<span>Remove</span>\n</a>\n<!-- ko ifnot: $parent.IsAllowedToRemove($data) -->\n<div class=\"col-md-3 text-right remove-owner-disabled\">\n<a class=\"icon-link\"\n- title=\"Cannot remove the only owner or reserved namespace restrictions apply.\">\n+ data-bind=\"attr: { 'aria-label': 'You cannot remove ' + name() + ' as owner of @Model.Id because they are the only owner or they own the only reserved namespace' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n<span>Remove</span>\n</a>\n</div>\n<div class=\"form-group\">\n- <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Add\" title=\"Add the user as an owner to @Model.Id\" data-bind=\"click: addOwner\" />\n+ <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Add\" aria-label=\"Add the user as an owner to @Model.Id\" data-bind=\"click: addOwner\" />\n</div>\n</div>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Home.cshtml",
"diff": "<div class=\"container text-center what-is-nuget\">\n<div class=\"row\">\n- <h1>What is NuGet?</h1>\n+ <h2>What is NuGet?</h2>\n<p>\nNuGet is the package manager for .NET. The NuGet client tools provide the ability to produce and consume packages.\nThe NuGet Gallery is the central package repository used by all package authors and consumers.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml",
"diff": "</div>\n<div class=\"col-sm-4\">\n<span class=\"footer-heading\">\n- <a href=\"https://docs.microsoft.com/en-us/nuget/policies/nuget-faq\">\n+ <a aria-label=\"Frequently Asked Questions\" href=\"https://docs.microsoft.com/en-us/nuget/policies/nuget-faq\">\n<abbr title=\"Frequently Asked Questions\">FAQ</abbr>\n</a>\n</span>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml",
"diff": "</div>\n<div class=\"col-sm-6\">\n<label for=\"input-select-file\" id=\"CertificateFileLabel\" class=\"input-group-btn\">\n- <span id=\"register-new\" class=\"btn btn-primary form-control\" tabindex=\"0\" aria-label=\"Browse for certificate\" role=\"button\">\n+ <span id=\"register-new\" class=\"btn btn-primary form-control\" tabindex=\"0\" aria-label=\"Register a new certificate\" role=\"button\">\nRegister new<input type=\"file\" name=\"uploadFile\" accept=\".cer\" aria-labelledby=\"CertificateFileLabel\" id=\"input-select-file\" style=\"display:none;\" />\n</span>\n</label>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix minor accessibility issues found in recent scan (#7393) |
455,736 | 02.08.2019 09:26:10 | 25,200 | aca7bdc3f273386eaa680c915678b4ff352cb6b5 | Move to latest build tools
Related to | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -10,7 +10,7 @@ param (\n[string]$PackageSuffix,\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = '2d8feecabe3aeaed7f5b4d50b9be78c94faf39ec'\n+ [string]$BuildBranch = 'cb2b9e41b18cb77ee644a51951d8c8f24cde9adf'\n)\nSet-StrictMode -Version 1.0\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Move to latest build tools (#7404)
Related to https://github.com/NuGet/Engineering/issues/2619 |
455,776 | 07.08.2019 15:01:28 | 25,200 | d1770868b18ca22a76c6b3dcadd57b51e182092a | "Include prerelease" checkbox should be a link | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "</h1>\n</div>\n<div class=\"cell-controls\">\n- <form action=\"@Url.PackageList()\" method=\"get\">\n- @Html.Hidden(\"q\", Model.SearchTerm, new { id = \"search-term\" })\n- <label>\n- <input type=\"checkbox\" id=\"include-prerelease\" @(Model.IncludePrerelease ? \"checked\" : string.Empty) />\n- Include prerelease\n- </label>\n- </form>\n+ <a href=\"[email protected]@(Model.IncludePrerelease ? \"&prerel=false\" : \"\")\">@(Model.IncludePrerelease ? \"Hide\" : \"Show\") prerelease</a>\n</div>\n</div>\n}\n$(function () {\n- $(\"#include-prerelease\").on('change', function () {\n- var parameters = {};\n- var q = $('#search-term').val();\n- if (q) {\n- parameters.q = q;\n- }\n- if (!$(\"#include-prerelease\").is(':checked')) {\n- parameters.prerel = 'false'\n- }\n- var queryString = $.param(parameters);\n- var url = [\n- location.protocol,\n- '//',\n- location.host,\n- location.pathname,\n- queryString ? '?' : '',\n- queryString\n- ].join('');\n- window.location.href = url;\n- });\n-\nvar emitAiClickEvent = function () {\nif (!window.nuget.isAiAvailable()) {\nreturn;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | "Include prerelease" checkbox should be a link (#7395) |
455,737 | 07.08.2019 14:12:44 | 25,200 | f8d6ef06d89405c73b5d2bea7f713da28b6980c0 | Enable different source name for admin/user messages to ad. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/AccountManagement/AsynchronousDeleteAccountService.cs",
"new_path": "src/NuGetGallery.Services/AccountManagement/AsynchronousDeleteAccountService.cs",
"diff": "@@ -18,7 +18,8 @@ namespace NuGetGallery\n/// </summary>\npublic class AsynchronousDeleteAccountService : IDeleteAccountService\n{\n- private const string GalleryAccountDeleteMessageSourceName = \"Gallery\";\n+ private const string GalleryAccountDeleteMessageSourceName = \"GalleryUser\";\n+ private const string GalleryAdminAccountDeleteMessageSourceName = \"GalleryAdmin\";\nprivate ITopicClient _topicClient;\nprivate IBrokeredMessageSerializer<AccountDeleteMessage> _serializer;\n@@ -43,7 +44,13 @@ public async Task<DeleteAccountStatus> DeleteAccountAsync(User userToBeDeleted,\nAccountName = userToBeDeleted.Username\n};\n- var messageData = new AccountDeleteMessage(userToBeDeleted.Username, GalleryAccountDeleteMessageSourceName);\n+ var sourceName = GalleryAccountDeleteMessageSourceName;\n+ if (userToExecuteTheDelete.IsAdministrator)\n+ {\n+ sourceName = GalleryAdminAccountDeleteMessageSourceName;\n+ }\n+\n+ var messageData = new AccountDeleteMessage(userToBeDeleted.Username, source: sourceName);\nvar message = _serializer.Serialize(messageData);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enable different source name for admin/user messages to ad. |
455,737 | 07.08.2019 16:00:21 | 25,200 | 23f6e336bb09d6567802dc2fb068667a55420929 | Switch to evaluator factory to support configurartion. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Compile Include=\"Evaluators\\AlwaysAllowEvaluator.cs\" />\n<Compile Include=\"Evaluators\\BaseUserEvaluator.cs\" />\n<Compile Include=\"Evaluators\\NuGetDeleteEvaluator.cs\" />\n+ <Compile Include=\"Evaluators\\IUserEvaluatorFactory.cs\" />\n+ <Compile Include=\"Evaluators\\UserEvaluatorFactory.cs\" />\n<Compile Include=\"Exceptions\\EmailContactNotAllowedException.cs\" />\n<Compile Include=\"Exceptions\\UnknownSourceException.cs\" />\n<Compile Include=\"Exceptions\\UserNotFoundException.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/GalleryAccountManager.cs",
"new_path": "src/AccountDeleter/GalleryAccountManager.cs",
"diff": "@@ -13,25 +13,25 @@ public class GalleryAccountManager : IAccountManager\n{\nprivate readonly IOptionsSnapshot<AccountDeleteConfiguration> _accountDeleteConfigurationAccessor;\nprivate readonly IDeleteAccountService _deleteAccountService;\n- private readonly IUserEvaluator _userEvaluator;\n+ private readonly IUserEvaluatorFactory _userEvaluatorFactory;\nprivate readonly IAccountDeleteTelemetryService _telemetryService;\nprivate readonly ILogger<GalleryAccountManager> _logger;\npublic GalleryAccountManager(\nIOptionsSnapshot<AccountDeleteConfiguration> accountDeleteConfigurationAccessor,\nIDeleteAccountService deleteAccountService,\n- IUserEvaluator userEvaluator,\n+ IUserEvaluatorFactory userEvaluatorFactory,\nIAccountDeleteTelemetryService telemetryService,\nILogger<GalleryAccountManager> logger)\n{\n_accountDeleteConfigurationAccessor = accountDeleteConfigurationAccessor ?? throw new ArgumentNullException(nameof(accountDeleteConfigurationAccessor));\n_deleteAccountService = deleteAccountService ?? throw new ArgumentNullException(nameof(deleteAccountService));\n- _userEvaluator = userEvaluator ?? throw new ArgumentNullException(nameof(userEvaluator));\n+ _userEvaluatorFactory = userEvaluatorFactory ?? throw new ArgumentNullException(nameof(userEvaluatorFactory));\n_telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));\n_logger = logger ?? throw new ArgumentNullException(nameof(logger));\n}\n- public async Task<bool> DeleteAccount(User user)\n+ public async Task<bool> DeleteAccount(User user, string source)\n{\n_logger.LogInformation(\"Attempting delete...\");\nif (user == null)\n@@ -40,7 +40,9 @@ public async Task<bool> DeleteAccount(User user)\nthrow new UserNotFoundException();\n}\n- if (!_userEvaluator.CanUserBeDeleted(user))\n+ var evaluator = _userEvaluatorFactory.GetEvaluatorForSource(source);\n+\n+ if (!evaluator.CanUserBeDeleted(user))\n{\n_logger.LogInformation(\"User was not able to be automatically deleted. Criteria check failed.\");\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/IAccountManager.cs",
"new_path": "src/AccountDeleter/IAccountManager.cs",
"diff": "@@ -13,6 +13,6 @@ public interface IAccountManager\n/// </summary>\n/// <param name=\"user\">User entity to act on</param>\n/// <returns>True if the account delete completes, false if account delete did not proceed for some reason.</returns>\n- Task<bool> DeleteAccount(User user);\n+ Task<bool> DeleteAccount(User user, string source);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Switch to evaluator factory to support configurartion. |
455,736 | 07.08.2019 13:55:38 | 25,200 | 0c2bb894dd1404127b28754877923c82fa0d52c0 | Add support for custom default request options in CloudBlobClientWrapper
It is recommended to set the timeout values on blob request options:
Related to | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Services/CloudBlobClientWrapper.cs",
"new_path": "src/NuGetGallery.Core/Services/CloudBlobClientWrapper.cs",
"diff": "@@ -12,6 +12,7 @@ namespace NuGetGallery\npublic class CloudBlobClientWrapper : ICloudBlobClient\n{\nprivate readonly string _storageConnectionString;\n+ private readonly BlobRequestOptions _defaultRequestOptions;\nprivate readonly bool _readAccessGeoRedundant;\nprivate CloudBlobClient _blobClient;\n@@ -21,6 +22,12 @@ public CloudBlobClientWrapper(string storageConnectionString, bool readAccessGeo\n_readAccessGeoRedundant = readAccessGeoRedundant;\n}\n+ public CloudBlobClientWrapper(string storageConnectionString, BlobRequestOptions defaultRequestOptions)\n+ {\n+ _storageConnectionString = storageConnectionString;\n+ _defaultRequestOptions = defaultRequestOptions;\n+ }\n+\npublic ISimpleCloudBlob GetBlobFromUri(Uri uri)\n{\n// For Azure blobs, the query string is assumed to be the SAS token.\n@@ -52,7 +59,12 @@ public ICloudBlobContainer GetContainerReference(string containerAddress)\n{\n_blobClient.DefaultRequestOptions.LocationMode = LocationMode.PrimaryThenSecondary;\n}\n+ else if (_defaultRequestOptions != null)\n+ {\n+ _blobClient.DefaultRequestOptions = _defaultRequestOptions;\n+ }\n}\n+\nreturn new CloudBlobContainerWrapper(_blobClient.GetContainerReference(containerAddress));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Services/CloudBlobCoreFileStorageServiceIntegrationTests.cs",
"diff": "@@ -62,6 +62,33 @@ public CloudBlobCoreFileStorageServiceIntegrationTests(BlobStorageFixture fixtur\n_targetB = new CloudBlobCoreFileStorageService(_clientB, Mock.Of<IDiagnosticsService>(), folderInformationProvider);\n}\n+ [BlobStorageFact]\n+ public async Task AllowsDefaultRequestOptionsToBeSet()\n+ {\n+ // Arrange\n+ var folderName = CoreConstants.Folders.ValidationFolderName;\n+ var fileName = _prefixA;\n+ await _targetA.SaveFileAsync(\n+ folderName,\n+ fileName,\n+ new MemoryStream(new byte[1024 * 1024]),\n+ overwrite: false);\n+ var client = new CloudBlobClientWrapper(\n+ _fixture.ConnectionStringA,\n+ new BlobRequestOptions\n+ {\n+ MaximumExecutionTime = TimeSpan.FromMilliseconds(1),\n+ });\n+ var container = client.GetContainerReference(folderName);\n+ var file = container.GetBlobReference(fileName);\n+ var destination = new MemoryStream();\n+\n+ // Act & Assert\n+ // This should throw due to timeout.\n+ var ex = await Assert.ThrowsAsync<StorageException>(() => file.DownloadToStreamAsync(destination));\n+ Assert.Contains(\"timeout\", ex.Message);\n+ }\n+\n[BlobStorageFact]\npublic async Task OpenWriteAsyncReturnsWritableStream()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add support for custom default request options in CloudBlobClientWrapper (#7422)
It is recommended to set the timeout values on blob request options:
https://github.com/Azure/azure-storage-net/issues/470#issuecomment-306245417
Related to https://github.com/NuGet/Engineering/issues/2633 |
455,737 | 07.08.2019 17:34:54 | 25,200 | 46ce2b24fb3ae03c3b28e1fce7c558f1c52196cf | Enable evaluator configuration by source. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleteMessageHandler.cs",
"new_path": "src/AccountDeleter/AccountDeleteMessageHandler.cs",
"diff": "@@ -54,7 +54,7 @@ public async Task<bool> HandleAsync(AccountDeleteMessage command)\ntry\n{\n_logger.LogInformation(\"Processing Request from Source {Source}\", source);\n- _accountDeleteConfigurationAccessor.Value.VerifySource(source);\n+ _accountDeleteConfigurationAccessor.Value.GetSourceConfiguration(source);\nvar username = command.Username;\nvar user = _userService.FindByUsername(username);\n@@ -69,7 +69,7 @@ public async Task<bool> HandleAsync(AccountDeleteMessage command)\n}\nvar recipientEmail = user.EmailAddress;\n- var deleteSuccess = await _accountManager.DeleteAccount(user);\n+ var deleteSuccess = await _accountManager.DeleteAccount(user, source);\n_telemetryService.TrackDeleteResult(source, deleteSuccess);\nvar baseEmailBuilder = _emailBuilderFactory.GetEmailBuilder(source, deleteSuccess);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Compile Include=\"Configuration\\SourceConfiguration.cs\" />\n<Compile Include=\"EmptyIndexingService.cs\" />\n<Compile Include=\"Evaluators\\AccountConfirmedEvaluator.cs\" />\n+ <Compile Include=\"Evaluators\\AggregateEvaluator.cs\" />\n<Compile Include=\"Evaluators\\AlwaysAllowEvaluator.cs\" />\n<Compile Include=\"Evaluators\\BaseUserEvaluator.cs\" />\n+ <Compile Include=\"Evaluators\\EvaluatorKeys.cs\" />\n<Compile Include=\"Evaluators\\NuGetDeleteEvaluator.cs\" />\n<Compile Include=\"Evaluators\\IUserEvaluatorFactory.cs\" />\n<Compile Include=\"Evaluators\\UserEvaluatorFactory.cs\" />\n<Compile Include=\"Exceptions\\EmailContactNotAllowedException.cs\" />\n+ <Compile Include=\"Exceptions\\UnknownEvaluatorException.cs\" />\n<Compile Include=\"Exceptions\\UnknownSourceException.cs\" />\n<Compile Include=\"Exceptions\\UserNotFoundException.cs\" />\n<Compile Include=\"Messaging\\AccountDeleteEmailBuilder.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/AlwaysAllowEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/AlwaysAllowEvaluator.cs",
"diff": "@@ -21,7 +21,7 @@ public AlwaysAllowEvaluator(ILogger<AlwaysAllowEvaluator> logger)\npublic override bool CanUserBeDeleted(User user)\n{\n- _logger.LogInformation(\"{Evaluator} User can be deleted\", nameof(AlwaysAllowEvaluator));\n+ _logger.LogInformation(\"{Evaluator} User can be deleted. This evaluator always allows deletion.\", nameof(AlwaysAllowEvaluator));\nreturn true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "using System.ComponentModel.Design;\nusing System.IO;\nusing System.Linq;\n+using System.ServiceModel.Configuration;\nusing Autofac;\n+using Autofac.Core;\nusing Microsoft.Extensions.Configuration;\nusing Microsoft.Extensions.DependencyInjection;\nusing Microsoft.Extensions.Options;\n@@ -60,17 +62,18 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi\nservices.AddScoped<AccountConfirmedEvaluator>();\nservices.AddScoped<NuGetDeleteEvaluator>();\n- services.AddScoped<IUserEvaluator>(sp =>\n+ services.AddScoped<IUserEvaluatorFactory>(sp =>\n{\n- if (IsDebugMode)\n- {\n- return sp.GetRequiredService<AlwaysRejectEvaluator>();\n- }\n- else\n- {\n- // Configure evaluators here.\n- return sp.GetRequiredService<NuGetDeleteEvaluator>();\n- }\n+ var configuration = sp.GetRequiredService<IOptionsSnapshot<AccountDeleteConfiguration>>();\n+\n+ var factory = new UserEvaluatorFactory(configuration);\n+\n+ factory.AddEvaluatorByKey(EvaluatorKeys.AccountConfirmed, sp.GetRequiredService<AccountConfirmedEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKeys.AlwaysAllow, sp.GetRequiredService<AlwaysAllowEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKeys.AlwaysReject, sp.GetRequiredService<AlwaysRejectEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKeys.NuGetDelete, sp.GetRequiredService<NuGetDeleteEvaluator>());\n+\n+ return factory;\n});\nif (IsDebugMode)\n@@ -253,8 +256,13 @@ private void RegisterAuditingServices(IServiceCollection services)\n}\ncatch (InvalidOperationException)\n{\n+ auditingServices.Add(GetAuditingServiceForLocalFileSystem());\n// no default auditing service was registered, no-op\n}\n+ catch (DependencyResolutionException)\n+ {\n+ auditingServices.Add(GetAuditingServiceForLocalFileSystem());\n+ }\nreturn CombineAuditingServices(auditingServices);\n});\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enable evaluator configuration by source. |
455,737 | 08.08.2019 11:18:01 | 25,200 | a654de8e3ab2be91b0e1b831771cc4e00dcbee69 | Remove default auditing. Update catch. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -254,15 +254,12 @@ private void RegisterAuditingServices(IServiceCollection services)\n{\nauditingServices.Add(sp.GetRequiredService<AuditingService>());\n}\n- catch (InvalidOperationException)\n+ catch (Exception ex)\n+ when (ex is InvalidOperationException\n+ || ex is DependencyResolutionException)\n{\n- auditingServices.Add(GetAuditingServiceForLocalFileSystem());\n// no default auditing service was registered, no-op\n}\n- catch (DependencyResolutionException)\n- {\n- auditingServices.Add(GetAuditingServiceForLocalFileSystem());\n- }\nreturn CombineAuditingServices(auditingServices);\n});\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove default auditing. Update catch. |
455,776 | 08.08.2019 11:21:50 | 25,200 | 7454f24b44dc963ea109866174b72e521ea87e16 | Some more accessibility issues found in last scan | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@@ -632,22 +632,28 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n@BreadcrumbWithProfile(url, currentUser, showDivider, newSegments);\n}\n-@helper RecatpchaScripts(string reCaptchaPublicKey, string submitId)\n+@helper RecaptchaScripts(string reCaptchaPublicKey, string submitId)\n{\nif (!string.IsNullOrEmpty(reCaptchaPublicKey))\n{\n<script src='https://www.google.com/recaptcha/api.js' async defer></script>\n<script type=\"text/javascript\">\nvar $submit = $('@(\"#\" + submitId)');\n- $submit.addClass(\"g-recaptcha\");\n- $submit.attr({\n- 'data-sitekey': \"@reCaptchaPublicKey\",\n- 'data-size': \"invisible\",\n- 'data-callback': \"onSubmit\",\n- 'data-tabindex': \"-1\"\n+ $submit.before(\n+ '<div id=\"recaptcha\" class=\"g-recaptcha\" '\n+ + 'data-sitekey=\"@reCaptchaPublicKey\" data-size=\"invisible\" '\n+ + 'data-callback=\"onSubmit\" data-tabindex=\"-1\"></div>');\n+\n+ var $form = $submit.parents('form')\n+ $submit.click(function (e) {\n+ if ($form.valid()) {\n+ e.preventDefault();\n+ grecaptcha.execute();\n+ }\n});\n+\nfunction onSubmit(token) {\n- $submit.parents('form').submit();\n+ $form.submit();\n}\n</script>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -152,7 +152,7 @@ public static IQueryable<T> SortBy<T>(this IQueryable<T> source, string sortExpr\npublic static HtmlString ShowCheckboxFor<TModel>(this HtmlHelper<TModel> html, Expression<Func<TModel, bool>> expression)\n{\n- var htmlAttributes = GetHtmlAttributes(html, expression, isFormControl: false);\n+ var htmlAttributes = GetHtmlAttributes(html, expression, isFormControl: false, isCheckbox: true);\nreturn html.CheckBoxFor(expression, htmlAttributes);\n}\n@@ -189,7 +189,8 @@ public static HtmlString ShowCheckboxFor<TModel>(this HtmlHelper<TModel> html, E\nprivate static Dictionary<string, object> GetHtmlAttributes<TModel, TProperty>(\nHtmlHelper<TModel> html,\nExpression<Func<TModel, TProperty>> expression,\n- bool isFormControl = true)\n+ bool isFormControl = true,\n+ bool isCheckbox = false)\n{\nvar metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData);\nvar propertyName = metadata.PropertyName.ToLower();\n@@ -202,7 +203,9 @@ public static HtmlString ShowCheckboxFor<TModel>(this HtmlHelper<TModel> html, E\nhtmlAttributes[\"class\"] = \"form-control\";\n}\n- if (metadata.IsRequired)\n+ // If the property is required, mark it as required unless it's a checkbox.\n+ // Hearing that a checkbox is required is very confusing to screen readers.\n+ if (!isCheckbox && metadata.IsRequired)\n{\nhtmlAttributes[\"aria-required\"] = \"true\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ContactOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ContactOwners.cshtml",
"diff": "</section>\n@section BottomScripts {\n- @ViewHelpers.RecatpchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n+ @ViewHelpers.RecaptchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "</section>\n@section BottomScripts {\n- @ViewHelpers.RecatpchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n+ @ViewHelpers.RecaptchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n<script>\nfunction reasonSelected() {\nvar $form = $('#Reason').parents('form');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportMyPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportMyPackage.cshtml",
"diff": "</section>\n@section BottomScripts {\n- @ViewHelpers.RecatpchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n+ @ViewHelpers.RecaptchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n<script type=\"text/javascript\">\n$(function () {\nvar $reason = $('#Reason');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/_ManageOwners.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/_ManageOwners.cshtml",
"diff": "</div>\n<!-- ko if: $parent.IsAllowedToRemove($data) -->\n<div class=\"col-md-3 text-right remove-owner\">\n- <a class=\"icon-link\"\n+ <a role=\"button\" class=\"icon-link\"\nhref=\"#\"\ndata-bind=\"click: $root.removeOwner, attr: { 'aria-label': 'Remove ' + name() + ' as owner of @Model.Id' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n<!-- /ko -->\n<!-- ko ifnot: $parent.IsAllowedToRemove($data) -->\n<div class=\"col-md-3 text-right remove-owner-disabled\">\n- <a class=\"icon-link\"\n+ <a role=\"button\" aria-disabled=\"true\" class=\"icon-link\"\ndata-bind=\"attr: { 'aria-label': 'You cannot remove ' + name() + ' as owner of @Model.Id because they are the only owner or they own the only reserved namespace' }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n<span>Remove</span>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Pages/Contact.cshtml",
"new_path": "src/NuGetGallery/Views/Pages/Contact.cshtml",
"diff": "$(\"#emailUs\").append(link);\n});\n</script>\n- @ViewHelpers.RecatpchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n+ @ViewHelpers.RecaptchaScripts(Config.Current.ReCaptchaPublicKey, \"Submit\")\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Some more accessibility issues found in last scan (#7408) |
455,737 | 08.08.2019 12:36:04 | 25,200 | b0e4d37a416f26c63b55837abf1f5e37ebf3ce21 | PR feedback. Updated some test. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Configuration/SourceConfiguration.cs",
"new_path": "src/AccountDeleter/Configuration/SourceConfiguration.cs",
"diff": "@@ -31,8 +31,8 @@ public class SourceConfiguration\npublic MailTemplateConfiguration DeletedMailTemplate { get; set; }\n/// <summary>\n- /// List of evaluators to use for this source. See <see cref=\"EvaluatorKeys\"/> for valid values.\n+ /// List of evaluators to use for this source. See <see cref=\"EvaluatorKey\"/> for valid values.\n/// </summary>\n- public List<string> Evaluators { get; set; }\n+ public List<EvaluatorKey> Evaluators { get; set; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/AggregateEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/AggregateEvaluator.cs",
"diff": "@@ -12,29 +12,22 @@ namespace NuGetGallery.AccountDeleter\n/// </summary>\npublic class AggregateEvaluator : BaseUserEvaluator\n{\n- private Dictionary<string, IUserEvaluator> _evaluatorList;\n+ private HashSet<IUserEvaluator> _evaluatorList;\npublic AggregateEvaluator()\n: base()\n{\n- _evaluatorList = new Dictionary<string, IUserEvaluator>();\n+ _evaluatorList = new HashSet<IUserEvaluator>(new UserEvaluatorComparer());\n}\npublic override bool CanUserBeDeleted(User user)\n{\n- var evaluators = _evaluatorList.Values;\n- return evaluators.All(e => e.CanUserBeDeleted(user));\n+ return _evaluatorList.All(e => e.CanUserBeDeleted(user));\n}\npublic bool AddEvaluator(IUserEvaluator userEvaluator)\n{\n- if (_evaluatorList.ContainsKey(userEvaluator.EvaluatorId))\n- {\n- return false;\n- }\n-\n- _evaluatorList.Add(userEvaluator.EvaluatorId, userEvaluator);\n- return true;\n+ return _evaluatorList.Add(userEvaluator);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/IUserEvaluatorFactory.cs",
"new_path": "src/AccountDeleter/Evaluators/IUserEvaluatorFactory.cs",
"diff": "@@ -7,6 +7,6 @@ public interface IUserEvaluatorFactory\n{\nIUserEvaluator GetEvaluatorForSource(string source);\n- bool AddEvaluatorByKey(string key, IUserEvaluator evaluator);\n+ bool AddEvaluatorByKey(EvaluatorKey key, IUserEvaluator evaluator);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/UserEvaluatorFactory.cs",
"new_path": "src/AccountDeleter/Evaluators/UserEvaluatorFactory.cs",
"diff": "@@ -10,24 +10,20 @@ namespace NuGetGallery.AccountDeleter\npublic class UserEvaluatorFactory : IUserEvaluatorFactory\n{\nprivate IOptionsSnapshot<AccountDeleteConfiguration> _options;\n- private Dictionary<string, IUserEvaluator> _evaluatorMap;\n+ private Dictionary<EvaluatorKey, IUserEvaluator> _evaluatorMap;\npublic UserEvaluatorFactory(IOptionsSnapshot<AccountDeleteConfiguration> options)\n{\n_options = options ?? throw new ArgumentNullException(nameof(options));\n- _evaluatorMap = new Dictionary<string, IUserEvaluator>();\n+ _evaluatorMap = new Dictionary<EvaluatorKey, IUserEvaluator>();\n}\npublic IUserEvaluator GetEvaluatorForSource(string source)\n{\nvar configuration = _options.Value;\n-\nvar sourceConfig = configuration.GetSourceConfiguration(source);\nvar configEvaluators = sourceConfig.Evaluators;\n-\n- if (configEvaluators.Count > 1)\n- {\nvar result = new AggregateEvaluator();\nforeach(var evaluatorKey in configEvaluators)\n{\n@@ -42,20 +38,8 @@ public IUserEvaluator GetEvaluatorForSource(string source)\nreturn result;\n}\n- else\n- {\n- var evaluatorKey = configEvaluators[0];\n- IUserEvaluator userEvaluator;\n- if (!_evaluatorMap.TryGetValue(evaluatorKey, out userEvaluator))\n- {\n- throw new UnknownEvaluatorException(evaluatorKey, source);\n- }\n-\n- return userEvaluator;\n- }\n- }\n- public bool AddEvaluatorByKey(string key, IUserEvaluator evaluator)\n+ public bool AddEvaluatorByKey(EvaluatorKey key, IUserEvaluator evaluator)\n{\nif (_evaluatorMap.ContainsKey(key))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Exceptions/UnknownEvaluatorException.cs",
"new_path": "src/AccountDeleter/Exceptions/UnknownEvaluatorException.cs",
"diff": "@@ -12,7 +12,7 @@ public class UnknownEvaluatorException : Exception\n{\nprivate const string _messageTemplate = \"{0} requested unknown evaluator {1}\";\n- public UnknownEvaluatorException(string requestedEvaluator, string source)\n+ public UnknownEvaluatorException(EvaluatorKey requestedEvaluator, string source)\n: base(String.Format(_messageTemplate, source, requestedEvaluator))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -68,10 +68,10 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi\nvar factory = new UserEvaluatorFactory(configuration);\n- factory.AddEvaluatorByKey(EvaluatorKeys.AccountConfirmed, sp.GetRequiredService<AccountConfirmedEvaluator>());\n- factory.AddEvaluatorByKey(EvaluatorKeys.AlwaysAllow, sp.GetRequiredService<AlwaysAllowEvaluator>());\n- factory.AddEvaluatorByKey(EvaluatorKeys.AlwaysReject, sp.GetRequiredService<AlwaysRejectEvaluator>());\n- factory.AddEvaluatorByKey(EvaluatorKeys.NuGetDelete, sp.GetRequiredService<NuGetDeleteEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKey.AccountConfirmed, sp.GetRequiredService<AccountConfirmedEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKey.AlwaysAllow, sp.GetRequiredService<AlwaysAllowEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKey.AlwaysReject, sp.GetRequiredService<AlwaysRejectEvaluator>());\n+ factory.AddEvaluatorByKey(EvaluatorKey.NuGetDelete, sp.GetRequiredService<NuGetDeleteEvaluator>());\nreturn factory;\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/AccountManagement/AsynchronousDeleteAccountService.cs",
"new_path": "src/NuGetGallery.Services/AccountManagement/AsynchronousDeleteAccountService.cs",
"diff": "@@ -18,7 +18,7 @@ namespace NuGetGallery\n/// </summary>\npublic class AsynchronousDeleteAccountService : IDeleteAccountService\n{\n- private const string GalleryAccountDeleteMessageSourceName = \"GalleryUser\";\n+ private const string GalleryUserAccountDeleteMessageSourceName = \"GalleryUser\";\nprivate const string GalleryAdminAccountDeleteMessageSourceName = \"GalleryAdmin\";\nprivate ITopicClient _topicClient;\n@@ -44,7 +44,7 @@ public async Task<DeleteAccountStatus> DeleteAccountAsync(User userToBeDeleted,\nAccountName = userToBeDeleted.Username\n};\n- var sourceName = GalleryAccountDeleteMessageSourceName;\n+ var sourceName = GalleryUserAccountDeleteMessageSourceName;\nif (userToExecuteTheDelete.IsAdministrator)\n{\nsourceName = GalleryAdminAccountDeleteMessageSourceName;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/AsynchronousDeleteAccountServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/AsynchronousDeleteAccountServiceFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Generic;\nusing System.Threading.Tasks;\nusing Microsoft.Extensions.Logging;\nusing Moq;\n@@ -44,7 +45,42 @@ public async Task DeleteUserEnqueues()\nAssert.NotNull(message);\nvar messageData = messageSerializer.Deserialize(message);\nAssert.Equal(username, messageData.Username);\n- Assert.Equal(\"Gallery\", messageData.Source);\n+ Assert.Equal(\"GalleryUser\", messageData.Source);\n+ }\n+\n+ [Fact]\n+ public async Task DeleteUserAdminEnqueuesAdminSource()\n+ {\n+ var username = \"test\";\n+ // Arrange\n+ var testUser = new User()\n+ {\n+ Username = username\n+ };\n+\n+ var testAdmin = new User()\n+ {\n+ Roles = new List<Role>() { new Role() { Name = \"Admins\" } }\n+ };\n+\n+ var testService = new TestAsynchronousDeleteAccountService(shouldFail: false);\n+ testService.SetupSimple();\n+ var deleteAccountService = testService.GetTestService();\n+ var messageSerializer = new AccountDeleteMessageSerializer();\n+\n+ // Act\n+ var result = await deleteAccountService.DeleteAccountAsync(testUser, testAdmin, AccountDeletionOrphanPackagePolicy.UnlistOrphans);\n+\n+ // Assert\n+ Assert.Equal(1, testService.TopicClient.SendAsyncCallCount);\n+ Assert.True(result.Success);\n+ Assert.Equal(string.Format(ServicesStrings.AsyncAccountDelete_Success, username), result.Description);\n+\n+ var message = testService.TopicClient.LastSentMessage;\n+ Assert.NotNull(message);\n+ var messageData = messageSerializer.Deserialize(message);\n+ Assert.Equal(username, messageData.Username);\n+ Assert.Equal(\"GalleryAdmin\", messageData.Source);\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | PR feedback. Updated some test. |
455,776 | 08.08.2019 13:14:40 | 25,200 | 83a394c67d2c76f83614ea9fd4c5ca02b5fc0e88 | Unwrap error messages generated by jQuery Validation | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "// Source: https://stackoverflow.com/questions/18754020/bootstrap-3-with-jquery-validation-plugin\n// Set the JQuery validation plugin's defaults to use classes recognized by Bootstrap.\n+ var validatorErrorClass = 'help-block';\n$.validator.setDefaults({\nhighlight: function (element) {\n$(element).closest('.form-group').addClass('has-error');\n$(element).closest('.form-group').removeClass('has-error');\n},\nerrorElement: 'span',\n- errorClass: 'help-block',\n+ errorClass: validatorErrorClass,\nerrorPlacement: function (error, element) {\nif (element.parent('.input-group').length) {\nerror.insertAfter(element.parent());\nshowErrors: function (errorMap, errorList) {\nthis.defaultShowErrors();\n- // By default, showErrors adds an aria-describedby attribute to every field that it validates, even if it finds no issues.\n- // This is a problem, because the aria-describedby attribute will then link to an empty element.\n- // This code removes the aria-describedby if the describing element is missing or empty.\nvar i;\nfor (i = 0; this.errorList[i]; i++) {\n- removeInvalidAriaDescribedBy(this.errorList[i].element);\n+ fixAccessibilityIssuesWithAriaDescribedBy(this.errorList[i].element, validatorErrorClass);\n}\nfor (i = 0; this.successList[i]; i++) {\n- removeInvalidAriaDescribedBy(this.successList[i]);\n+ fixAccessibilityIssuesWithAriaDescribedBy(this.successList[i], validatorErrorClass);\n}\n}\n});\n}\n- function removeInvalidAriaDescribedBy(element) {\n+ function fixAccessibilityIssuesWithAriaDescribedBy(element, validatorErrorClass) {\nvar describedBy = element.getAttribute(\"aria-describedby\");\nif (!describedBy) {\nreturn;\n}\n- var ids = describedBy.split(\" \")\n+ var uniqueIds = [];\n+ var ids = describedBy\n+ .split(\" \")\n.filter(function (describedById) {\nif (!describedById) {\nreturn false;\n}\n+ // The default showErrors adds an aria-describedby attribute to every field that it validates, even if it finds no issues.\n+ // This is a problem, because the aria-describedby attribute will then link to an empty element.\n+ // If the element linked to by the aria-describedby attribute is empty, remove the aria-describedby.\nvar describedByElement = $(\"#\" + describedById);\nreturn describedByElement && describedByElement.text();\n+ })\n+ .map(function (describedById) {\n+ // The default showErrors puts the error inside a container.\n+ // This causes Narrator to read the error as being part of a group, even though it is the only error.\n+ // JQuery Validator only ever shows a single error for each form input so it is always possible for us to simply unwrap the error.\n+ var describedByElement = $(\"#\" + describedById);\n+ var parent = describedByElement.parent();\n+ if (parent.hasClass(validatorErrorClass)) {\n+ parent.text(describedByElement.text());\n+ describedByElement.remove();\n+ return parent.attr('id');\n+ } else {\n+ return describedById;\n+ }\n+ })\n+ .filter(function (describedById) {\n+ // Remove any duplicate IDs.\n+ var isUnique = $.inArray(describedById, uniqueIds) === -1;\n+ if (isUnique) {\n+ uniqueIds.push(describedById);\n+ }\n+\n+ return isUnique;\n});\nif (ids.length) {\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Unwrap error messages generated by jQuery Validation (#7418) |
455,737 | 08.08.2019 13:52:52 | 25,200 | bca236a1a0371080321f03240613d6c00eec5e34 | Inline var declaration. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/UserEvaluatorFactory.cs",
"new_path": "src/AccountDeleter/Evaluators/UserEvaluatorFactory.cs",
"diff": "@@ -27,8 +27,7 @@ public IUserEvaluator GetEvaluatorForSource(string source)\nvar result = new AggregateEvaluator();\nforeach(var evaluatorKey in configEvaluators)\n{\n- IUserEvaluator userEvaluator;\n- if(!_evaluatorMap.TryGetValue(evaluatorKey, out userEvaluator))\n+ if(!_evaluatorMap.TryGetValue(evaluatorKey, out IUserEvaluator userEvaluator))\n{\nthrow new UnknownEvaluatorException(evaluatorKey, source);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Inline var declaration. |
455,737 | 08.08.2019 14:32:40 | 25,200 | f2243bd6461c381ecdb7d8b98e2cea8a5e499c90 | Add missing project changes. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Compile Include=\"Evaluators\\AggregateEvaluator.cs\" />\n<Compile Include=\"Evaluators\\AlwaysAllowEvaluator.cs\" />\n<Compile Include=\"Evaluators\\BaseUserEvaluator.cs\" />\n- <Compile Include=\"Evaluators\\EvaluatorKeys.cs\" />\n+ <Compile Include=\"Evaluators\\EvaluatorKey.cs\" />\n<Compile Include=\"Evaluators\\NuGetDeleteEvaluator.cs\" />\n<Compile Include=\"Evaluators\\IUserEvaluatorFactory.cs\" />\n+ <Compile Include=\"Evaluators\\UserEvaluatorComparer.cs\" />\n<Compile Include=\"Evaluators\\UserEvaluatorFactory.cs\" />\n<Compile Include=\"Exceptions\\EmailContactNotAllowedException.cs\" />\n<Compile Include=\"Exceptions\\UnknownEvaluatorException.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add missing project changes. |
455,776 | 08.08.2019 15:38:52 | 25,200 | ced5ee58fe4ebf15edec12151cbf7c0b21e50192 | Breadcrumbs should be represented as lists to screenreaders | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@@ -585,10 +585,10 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n@helper Breadcrumb(bool showDivider, params Func<MvcHtmlString, HelperResult>[] segments)\n{\n- <h1 class=\"ms-font-xl breadcrumb-title\">\n+ <h1 role=\"list\" class=\"ms-font-xl breadcrumb-title\">\n@for (int i = 0; i < segments.Length; i++)\n{\n- <span class=\"ms-noWrap\">@segments[i](MvcHtmlString.Empty)</span>\n+ <span role=\"listitem\" class=\"ms-noWrap\">@segments[i](MvcHtmlString.Empty)</span>\nif (i < segments.Length - 1)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Breadcrumbs should be represented as lists to screenreaders (#7428) |
455,737 | 08.08.2019 15:45:59 | 25,200 | 3b4797cdfa77ff2814cc9e3f7f48dc7efbe2ddb5 | Minimize unecessary initialization in DI. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/IUserEvaluatorFactory.cs",
"new_path": "src/AccountDeleter/Evaluators/IUserEvaluatorFactory.cs",
"diff": "@@ -5,8 +5,12 @@ namespace NuGetGallery.AccountDeleter\n{\npublic interface IUserEvaluatorFactory\n{\n+ /// <summary>\n+ /// Returns an <see cref=\"IUserEvaluator\"/> instance that corresponds to the requested name\n+ /// </summary>\n+ /// <param name=\"source\"></param>\n+ /// <returns></returns>\n+ /// <exception cref=\"UnknownEvaluatorException\"></exception>\nIUserEvaluator GetEvaluatorForSource(string source);\n-\n- bool AddEvaluatorByKey(EvaluatorKey key, IUserEvaluator evaluator);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/UserEvaluatorFactory.cs",
"new_path": "src/AccountDeleter/Evaluators/UserEvaluatorFactory.cs",
"diff": "using Microsoft.Extensions.Options;\nusing System;\nusing System.Collections.Generic;\n+using System.Web.UI;\nnamespace NuGetGallery.AccountDeleter\n{\npublic class UserEvaluatorFactory : IUserEvaluatorFactory\n{\nprivate IOptionsSnapshot<AccountDeleteConfiguration> _options;\n- private Dictionary<EvaluatorKey, IUserEvaluator> _evaluatorMap;\n+ private Func<EvaluatorKey, IUserEvaluator> _func;\n- public UserEvaluatorFactory(IOptionsSnapshot<AccountDeleteConfiguration> options)\n+ public UserEvaluatorFactory(IOptionsSnapshot<AccountDeleteConfiguration> options, Func<EvaluatorKey, IUserEvaluator> func)\n{\n_options = options ?? throw new ArgumentNullException(nameof(options));\n- _evaluatorMap = new Dictionary<EvaluatorKey, IUserEvaluator>();\n+ _func = func ?? throw new ArgumentNullException(nameof(func));\n}\npublic IUserEvaluator GetEvaluatorForSource(string source)\n@@ -27,26 +28,10 @@ public IUserEvaluator GetEvaluatorForSource(string source)\nvar result = new AggregateEvaluator();\nforeach(var evaluatorKey in configEvaluators)\n{\n- if(!_evaluatorMap.TryGetValue(evaluatorKey, out IUserEvaluator userEvaluator))\n- {\n- throw new UnknownEvaluatorException(evaluatorKey, source);\n- }\n-\n- result.AddEvaluator(userEvaluator);\n+ result.AddEvaluator(_func(evaluatorKey));\n}\nreturn result;\n}\n-\n- public bool AddEvaluatorByKey(EvaluatorKey key, IUserEvaluator evaluator)\n- {\n- if (_evaluatorMap.ContainsKey(key))\n- {\n- return false;\n- }\n-\n- _evaluatorMap.Add(key, evaluator);\n- return true;\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -62,18 +62,25 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi\nservices.AddScoped<AccountConfirmedEvaluator>();\nservices.AddScoped<NuGetDeleteEvaluator>();\n- services.AddScoped<IUserEvaluatorFactory>(sp =>\n+ services.AddScoped<IUserEvaluatorFactory, UserEvaluatorFactory>();\n+ services.AddScoped<Func<EvaluatorKey, IUserEvaluator>>(sp =>\n{\n- var configuration = sp.GetRequiredService<IOptionsSnapshot<AccountDeleteConfiguration>>();\n-\n- var factory = new UserEvaluatorFactory(configuration);\n-\n- factory.AddEvaluatorByKey(EvaluatorKey.AccountConfirmed, sp.GetRequiredService<AccountConfirmedEvaluator>());\n- factory.AddEvaluatorByKey(EvaluatorKey.AlwaysAllow, sp.GetRequiredService<AlwaysAllowEvaluator>());\n- factory.AddEvaluatorByKey(EvaluatorKey.AlwaysReject, sp.GetRequiredService<AlwaysRejectEvaluator>());\n- factory.AddEvaluatorByKey(EvaluatorKey.NuGetDelete, sp.GetRequiredService<NuGetDeleteEvaluator>());\n-\n- return factory;\n+ return evaluatorKey =>\n+ {\n+ switch (evaluatorKey)\n+ {\n+ case EvaluatorKey.AccountConfirmed:\n+ return sp.GetRequiredService<AccountConfirmedEvaluator>();\n+ case EvaluatorKey.AlwaysAllow:\n+ return sp.GetRequiredService<AlwaysAllowEvaluator>();\n+ case EvaluatorKey.AlwaysReject:\n+ return sp.GetRequiredService<AlwaysRejectEvaluator>();\n+ case EvaluatorKey.NuGetDelete:\n+ return sp.GetRequiredService<NuGetDeleteEvaluator>();\n+ default:\n+ throw new UnknownEvaluatorException();\n+ }\n+ };\n});\nif (IsDebugMode)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Minimize unecessary initialization in DI. |
455,737 | 08.08.2019 16:59:16 | 25,200 | 9f095cf60d5246bfeee8d37ed480429f78386905 | Simplify aggregateevaluator construction. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Evaluators/AggregateEvaluator.cs",
"new_path": "src/AccountDeleter/Evaluators/AggregateEvaluator.cs",
"diff": "@@ -12,13 +12,7 @@ namespace NuGetGallery.AccountDeleter\n/// </summary>\npublic class AggregateEvaluator : BaseUserEvaluator\n{\n- private HashSet<IUserEvaluator> _evaluatorList;\n-\n- public AggregateEvaluator()\n- : base()\n- {\n- _evaluatorList = new HashSet<IUserEvaluator>(new UserEvaluatorComparer());\n- }\n+ private HashSet<IUserEvaluator> _evaluatorList = new HashSet<IUserEvaluator>(new UserEvaluatorComparer());\npublic override bool CanUserBeDeleted(User user)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Simplify aggregateevaluator construction. |
455,776 | 09.08.2019 09:56:19 | 25,200 | 767439221ea48542b6328448b350545293c48f42 | [Hotfix] PackagesAppearInFeedInOrderTest should wait for unlisted packages to be unlisted in feed before checking timestamps | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ClientSdkHelper.cs",
"diff": "@@ -70,11 +70,16 @@ public bool CheckIfPackageExistsInSource(string packageId, string sourceUrl)\n/// <summary>\n/// Checks if the given package version is present in V2 and V3. This method bypasses the hijack.\n/// </summary>\n- private async Task<bool> CheckIfPackageVersionExistsInV2Async(string packageId, string version)\n+ private async Task<bool> CheckIfPackageVersionExistsInV2Async(string packageId, string version, bool? isListed)\n{\nvar sourceUrl = UrlHelper.V2FeedRootUrl;\nvar normalizedVersion = NuGetVersion.Parse(version).ToNormalizedString();\nvar filter = $\"Id eq '{packageId}' and NormalizedVersion eq '{normalizedVersion}' and 1 eq 1\";\n+ if (isListed.HasValue)\n+ {\n+ filter += $\" and Published {(isListed.Value ? \"ne\" : \"eq\")} datetime'1900-01-01T00:00:00'\";\n+ }\n+\nvar url = UrlHelper.V2FeedRootUrl + $\"/Packages/$count?$filter={Uri.EscapeDataString(filter)}\";\nusing (var httpClient = new System.Net.Http.HttpClient())\n{\n@@ -530,11 +535,12 @@ public async Task VerifyPackageExistsInV2AndV3Async(string packageId, string ver\n$\"Package {packageId} with version {version} is not found on the site {UrlHelper.V2FeedRootUrl}.\");\n}\n- public async Task VerifyPackageExistsInV2Async(string packageId, string version)\n+ public async Task VerifyPackageExistsInV2Async(string packageId, string version, bool? listed = null)\n{\n- var packageExistsInSource = await CheckIfPackageVersionExistsInV2Async(packageId, version);\n- Assert.True(packageExistsInSource,\n- $\"Package {packageId} with version {version} is not found on the site {UrlHelper.V2FeedRootUrl}.\");\n+ var packageExistsInSource = await CheckIfPackageVersionExistsInV2Async(packageId, version, listed);\n+ Assert.True(\n+ packageExistsInSource,\n+ $\"Package {packageId} with version {version}{(listed.HasValue ? (listed.Value ? \" listed\" : \" unlisted\") : \"\")} is not found on the site {UrlHelper.V2FeedRootUrl}.\");\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -73,8 +73,7 @@ public async Task PackagesAppearInFeedInOrderTest()\nuploadedPackageIds.Add(packageId);\n}\n- await Task.WhenAll(uploadedPackageIds.Select(id => _clientSdkHelper.VerifyPackageExistsInV2Async(id, version)));\n-\n+ await Task.WhenAll(uploadedPackageIds.Select(id => _clientSdkHelper.VerifyPackageExistsInV2Async(id, version, listed: true)));\nawait CheckPackageTimestampsInOrder(uploadedPackageIds, \"Created\", uploadStartTimestamp);\n// Unlist the packages in order.\n@@ -86,6 +85,7 @@ public async Task PackagesAppearInFeedInOrderTest()\nunlistedPackageIds.Add(uploadedPackageId);\n}\n+ await Task.WhenAll(unlistedPackageIds.Select(id => _clientSdkHelper.VerifyPackageExistsInV2Async(id, version, listed: false)));\nawait CheckPackageTimestampsInOrder(unlistedPackageIds, \"LastEdited\", unlistStartTimestamp);\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [Hotfix] PackagesAppearInFeedInOrderTest should wait for unlisted packages to be unlisted in feed before checking timestamps (#7429) |
455,776 | 09.08.2019 13:45:31 | 25,200 | 0a09cead39c68fbc6b12a14ff6ae9bd8b199c589 | Transform form shouldn't ask for confirmation if form is invalid | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/TransformToOrganization.cshtml",
"new_path": "src/NuGetGallery/Views/Users/TransformToOrganization.cshtml",
"diff": "$(function ()\n{\nvar confirmation = \"@Html.Raw(transformConfirmation)\";\n- $(\"#transform\").submit(function (event) {\n+ var $transformForm = $(\"#transform\");\n+ $transformForm.submit(function (event) {\n+ if (!$transformForm.valid()) {\n+ return false;\n+ }\n+\nreturn window.nuget.confirmEvent(\nwindow.nuget.formatString(confirmation, $(\"#AdminUsername\").val()),\nevent);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Transform form shouldn't ask for confirmation if form is invalid (#7433) |
455,737 | 09.08.2019 15:17:22 | 25,200 | ed0b6a685bb9d3bad823720c87c018677aaa51f0 | Pass through version on a timestamp check. | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -77,7 +77,7 @@ public async Task PackagesAppearInFeedInOrderTest()\n}\nawait Task.WhenAll(uploadedPackageIds.Select(id => _clientSdkHelper.VerifyPackageExistsInV2Async(id, version, listed: true)));\n- await CheckPackageTimestampsInOrder(uploadedPackageIds, \"Created\", uploadStartTimestamp);\n+ await CheckPackageTimestampsInOrder(uploadedPackageIds, \"Created\", uploadStartTimestamp, version);\n// Unlist the packages in order.\nvar unlistedPackageIds = new List<string>();\n@@ -89,7 +89,7 @@ public async Task PackagesAppearInFeedInOrderTest()\n}\nawait Task.WhenAll(unlistedPackageIds.Select(id => _clientSdkHelper.VerifyPackageExistsInV2Async(id, version, listed: false)));\n- await CheckPackageTimestampsInOrder(unlistedPackageIds, \"LastEdited\", unlistStartTimestamp);\n+ await CheckPackageTimestampsInOrder(unlistedPackageIds, \"LastEdited\", unlistStartTimestamp, version);\n}\nprivate static string GetPackagesAppearInFeedInOrderUrl(DateTime time, string timestamp)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Pass through version on a timestamp check. |
455,736 | 10.08.2019 13:43:46 | 25,200 | 7f439b3a9b22f0e2e596a51eabad55fbdd9f9ee1 | Split read vs. read/write feature flag storage services
Update to latest server common to pull in
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.ServiceBus\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Common.Job\">\n<Version>4.1.0-dev-2759568</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Job.cs",
"new_path": "src/AccountDeleter/Job.cs",
"diff": "@@ -136,7 +136,7 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat\nservices.AddScoped<IAuthenticationService, AuthenticationService>();\nservices.AddScoped<ISupportRequestService, ISupportRequestService>();\n- services.AddScoped<IEditableFeatureFlagStorageService, FeatureFlagFileStorageService>();\n+ services.AddScoped<IEditableFeatureFlagStorageService, EditableFeatureFlagFileStorageService>();\nservices.AddScoped<ICoreFileStorageService, CloudBlobFileStorageService>();\nservices.AddScoped<ICloudBlobContainerInformationProvider, GalleryCloudBlobContainerInformationProvider>();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Version>4.1.0-master-2758883</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"new_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Features/FeatureFlagFileStorageService.cs",
"new_path": "src/NuGetGallery.Core/Features/FeatureFlagFileStorageService.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.IO;\n-using System.Linq;\nusing System.Threading.Tasks;\n-using Microsoft.Extensions.Logging;\n-using Microsoft.WindowsAzure.Storage;\nusing Newtonsoft.Json;\nusing Newtonsoft.Json.Converters;\n-using NuGet.Services.Entities;\nusing NuGet.Services.FeatureFlags;\n-using NuGetGallery.Auditing;\nnamespace NuGetGallery.Features\n{\n- public class FeatureFlagFileStorageService : IEditableFeatureFlagStorageService\n+ public class FeatureFlagFileStorageService : IFeatureFlagStorageService\n{\n- private const int MaxRemoveUserAttempts = 3;\n+ protected static readonly JsonSerializer Serializer;\n- private static readonly JsonSerializer Serializer;\n-\n- private readonly ICoreFileStorageService _storage;\n- private readonly IAuditingService _auditing;\n- private readonly ILogger<FeatureFlagFileStorageService> _logger;\n+ protected readonly ICoreFileStorageService _storage;\nstatic FeatureFlagFileStorageService()\n{\n@@ -40,13 +31,9 @@ static FeatureFlagFileStorageService()\n}\npublic FeatureFlagFileStorageService(\n- ICoreFileStorageService storage,\n- IAuditingService auditing,\n- ILogger<FeatureFlagFileStorageService> logger)\n+ ICoreFileStorageService storage)\n{\n_storage = storage ?? throw new ArgumentNullException(nameof(storage));\n- _auditing = auditing ?? throw new ArgumentNullException(nameof(auditing));\n- _logger = logger ?? throw new ArgumentNullException(nameof(logger));\n}\npublic async Task<FeatureFlags> GetAsync()\n@@ -57,16 +44,7 @@ public async Task<FeatureFlags> GetAsync()\n}\n}\n- public async Task<FeatureFlagReference> GetReferenceAsync()\n- {\n- var reference = await _storage.GetFileReferenceAsync(CoreConstants.Folders.ContentFolderName, CoreConstants.FeatureFlagsFileName);\n-\n- return new FeatureFlagReference(\n- ReadFeatureFlagsFromStream(reference.OpenRead()),\n- reference.ContentId);\n- }\n-\n- private FeatureFlags ReadFeatureFlagsFromStream(Stream stream)\n+ protected FeatureFlags ReadFeatureFlagsFromStream(Stream stream)\n{\nusing (var streamReader = new StreamReader(stream))\nusing (var reader = new JsonTextReader(streamReader))\n@@ -74,97 +52,5 @@ private FeatureFlags ReadFeatureFlagsFromStream(Stream stream)\nreturn Serializer.Deserialize<FeatureFlags>(reader);\n}\n}\n-\n- public async Task RemoveUserAsync(User user)\n- {\n- for (var attempt = 0; attempt < MaxRemoveUserAttempts; attempt++)\n- {\n- var reference = await _storage.GetFileReferenceAsync(CoreConstants.Folders.ContentFolderName, CoreConstants.FeatureFlagsFileName);\n-\n- FeatureFlags flags;\n- using (var stream = reference.OpenRead())\n- using (var streamReader = new StreamReader(stream))\n- using (var reader = new JsonTextReader(streamReader))\n- {\n- flags = Serializer.Deserialize<FeatureFlags>(reader);\n- }\n-\n- // Don't update the flags if the user isn't listed in any of the flights.\n- if (!flags.Flights.Any(f => f.Value.Accounts.Contains(user.Username, StringComparer.OrdinalIgnoreCase)))\n- {\n- return;\n- }\n-\n- // The user is listed in the flights. Build a new feature flag object that\n- // no longer contains the user.\n- var result = new FeatureFlags(\n- flags.Features,\n- flags.Flights\n- .ToDictionary(\n- f => f.Key,\n- f => RemoveUser(f.Value, user)));\n-\n- var saveResult = await TrySaveAsync(result, reference.ContentId);\n- if (saveResult == FeatureFlagSaveResult.Ok)\n- {\n- return;\n- }\n-\n- _logger.LogWarning(\n- 0,\n- \"Failed to remove user from feature flags, attempt {Attempt} of {MaxAttempts}...\",\n- attempt + 1,\n- MaxRemoveUserAttempts);\n- }\n-\n- throw new InvalidOperationException($\"Unable to remove user from feature flags after {MaxRemoveUserAttempts} attempts\");\n- }\n-\n- public async Task<FeatureFlagSaveResult> TrySaveAsync(FeatureFlags flags, string contentId)\n- {\n- var result = await TrySaveInternalAsync(flags, contentId);\n- await _auditing.SaveAuditRecordAsync(\n- new FeatureFlagsAuditRecord(\n- AuditedFeatureFlagsAction.Update,\n- flags,\n- contentId,\n- result));\n-\n- return result;\n- }\n-\n- private async Task<FeatureFlagSaveResult> TrySaveInternalAsync(FeatureFlags flags, string contentId)\n- {\n- var accessCondition = AccessConditionWrapper.GenerateIfMatchCondition(contentId);\n-\n- try\n- {\n- using (var stream = new MemoryStream())\n- using (var writer = new StreamWriter(stream))\n- using (var jsonWriter = new JsonTextWriter(writer))\n- {\n- Serializer.Serialize(jsonWriter, flags);\n- jsonWriter.Flush();\n- stream.Position = 0;\n-\n- await _storage.SaveFileAsync(CoreConstants.Folders.ContentFolderName, CoreConstants.FeatureFlagsFileName, stream, accessCondition);\n-\n- return FeatureFlagSaveResult.Ok;\n- }\n- }\n- catch (StorageException e) when (e.IsPreconditionFailedException())\n- {\n- return FeatureFlagSaveResult.Conflict;\n- }\n- }\n-\n- private Flight RemoveUser(Flight flight, User user)\n- {\n- return new Flight(\n- flight.All,\n- flight.SiteAdmins,\n- flight.Accounts.Where(a => !a.Equals(user.Username, StringComparison.OrdinalIgnoreCase)).ToList(),\n- flight.Domains);\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Features/FeatureFlagSaveResult.cs",
"new_path": "src/NuGetGallery.Core/Features/FeatureFlagSaveResult.cs",
"diff": "namespace NuGetGallery.Features\n{\n/// <summary>\n- /// The result of calling <see cref=\"FeatureFlagFileStorageService.TrySaveAsync(string, string)\"/>.\n+ /// The result of calling <see cref=\"EditableFeatureFlagFileStorageService.TrySaveAsync(string, string)\"/>.\n/// </summary>\npublic enum FeatureFlagSaveResult\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Extensions\\StorageExceptionExtensions.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCore.cs\" />\n<Compile Include=\"Extensions\\ValidationIssueExtensions.cs\" />\n- <Compile Include=\"Features\\FeatureFlagFileStorageService.cs\" />\n+ <Compile Include=\"Features\\EditableFeatureFlagFileStorageService.cs\" />\n<Compile Include=\"Features\\FeatureFlagClientExtensions.cs\" />\n+ <Compile Include=\"Features\\FeatureFlagFileStorageService.cs\" />\n<Compile Include=\"Features\\FeatureFlagReference.cs\" />\n<Compile Include=\"Features\\FeatureFlagSaveResult.cs\" />\n<Compile Include=\"Features\\IEditableFeatureFlagStorageService.cs\" />\n</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.WebBackgrounder\">\n<Version>0.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -525,7 +525,7 @@ private static void RegisterFeatureFlagsService(ContainerBuilder builder, Config\n.SingleInstance();\nbuilder\n- .Register(context => context.Resolve<FeatureFlagFileStorageService>())\n+ .Register(context => context.Resolve<EditableFeatureFlagFileStorageService>())\n.As<IEditableFeatureFlagStorageService>()\n.SingleInstance();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/StorageDependent.cs",
"new_path": "src/NuGetGallery/App_Start/StorageDependent.cs",
"diff": "@@ -93,7 +93,7 @@ public static IEnumerable<StorageDependent> GetAll(IAppConfiguration configurati\nCreate<UploadFileService, IUploadFileService>(configuration.AzureStorage_Uploads_ConnectionString, isSingleInstance: false),\nCreate<CoreLicenseFileService, ICoreLicenseFileService>(configuration.AzureStorage_FlatContainer_ConnectionString, isSingleInstance: false),\nCreate<RevalidationStateService, IRevalidationStateService>(configuration.AzureStorage_Revalidation_ConnectionString, isSingleInstance: false),\n- Create<FeatureFlagFileStorageService, IFeatureFlagStorageService>(configuration.AzureStorage_Content_ConnectionString, isSingleInstance: true)\n+ Create<EditableFeatureFlagFileStorageService, IFeatureFlagStorageService>(configuration.AzureStorage_Content_ConnectionString, isSingleInstance: true)\n};\nvar connectionStringToBindingKey = dependents\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.53.0</Version>\n+ <Version>2.54.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
},
{
"change_type": "RENAME",
"old_path": "tests/NuGetGallery.Core.Facts/Features/FeatureFlagFileStorageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Features/EditableFeatureFlagFileStorageServiceFacts.cs",
"diff": "namespace NuGetGallery.Features\n{\n- public class FeatureFlagFileStorageServiceFacts\n+ public class EditableFeatureFlagFileStorageServiceFacts\n{\npublic static FeatureFlags Example = new FeatureFlags(\nnew Dictionary<string, FeatureStatus>\n@@ -619,16 +619,16 @@ public class FactsBase\n{\nprotected readonly Mock<ICoreFileStorageService> _storage;\nprotected readonly Mock<IAuditingService> _auditing;\n- protected readonly FeatureFlagFileStorageService _target;\n+ protected readonly EditableFeatureFlagFileStorageService _target;\nprotected readonly StorageException _preconditionException;\npublic FactsBase()\n{\n- var logger = Mock.Of<ILogger<FeatureFlagFileStorageService>>();\n+ var logger = Mock.Of<ILogger<EditableFeatureFlagFileStorageService>>();\n_storage = new Mock<ICoreFileStorageService>();\n_auditing = new Mock<IAuditingService>();\n- _target = new FeatureFlagFileStorageService(\n+ _target = new EditableFeatureFlagFileStorageService(\n_storage.Object, _auditing.Object, logger);\n_preconditionException = new StorageException(\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<Compile Include=\"Certificates\\CertificateFileFacts.cs\" />\n<Compile Include=\"Cookies\\CookieComplianceServiceBaseFacts.cs\" />\n<Compile Include=\"Features\\FeatureFlagClientExtensionsFacts.cs\" />\n- <Compile Include=\"Features\\FeatureFlagFileStorageServiceFacts.cs\" />\n+ <Compile Include=\"Features\\EditableFeatureFlagFileStorageServiceFacts.cs\" />\n<Compile Include=\"GitHub\\GitHubUsageConfigurationFacts.cs\" />\n<Compile Include=\"Infrastructure\\ElmahExceptionFacts.cs\" />\n<Compile Include=\"Extensions\\UserExtensionsCoreFacts.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/App_Start/StorageDependentFacts.cs",
"new_path": "tests/NuGetGallery.Facts/App_Start/StorageDependentFacts.cs",
"diff": "@@ -75,7 +75,7 @@ public void StorageDependentsHaveExpectedTypes()\nAssert.Contains(typeof(UploadFileService), implementationToInterface.Keys);\nAssert.Contains(typeof(CoreLicenseFileService), implementationToInterface.Keys);\nAssert.Contains(typeof(RevalidationStateService), implementationToInterface.Keys);\n- Assert.Contains(typeof(FeatureFlagFileStorageService), implementationToInterface.Keys);\n+ Assert.Contains(typeof(EditableFeatureFlagFileStorageService), implementationToInterface.Keys);\nAssert.Equal(8, implementationToInterface.Count);\nAssert.Equal(typeof(ICertificateService), implementationToInterface[typeof(CertificateService)]);\nAssert.Equal(typeof(IContentService), implementationToInterface[typeof(ContentService)]);\n@@ -84,7 +84,7 @@ public void StorageDependentsHaveExpectedTypes()\nAssert.Equal(typeof(IUploadFileService), implementationToInterface[typeof(UploadFileService)]);\nAssert.Equal(typeof(ICoreLicenseFileService), implementationToInterface[typeof(CoreLicenseFileService)]);\nAssert.Equal(typeof(IRevalidationStateService), implementationToInterface[typeof(RevalidationStateService)]);\n- Assert.Equal(typeof(IFeatureFlagStorageService), implementationToInterface[typeof(FeatureFlagFileStorageService)]);\n+ Assert.Equal(typeof(IFeatureFlagStorageService), implementationToInterface[typeof(EditableFeatureFlagFileStorageService)]);\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Split read vs. read/write feature flag storage services (#7440)
Update to latest server common to pull in https://github.com/NuGet/ServerCommon/pull/306
Progress on https://github.com/NuGet/NuGetGallery/issues/7439 |
455,736 | 10.08.2019 14:02:29 | 25,200 | 90ec4440c34c643cfcf6e82296fe4e40c3bca14e | Make the admin index page a little better looking | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -695,6 +695,10 @@ img.reserved-indicator-icon {\nmargin-top: 6px;\nmargin-bottom: 6px;\n}\n+.page-admin-index h2 {\n+ margin-bottom: 8px;\n+ margin-top: 32px;\n+}\n.page-api-keys .example-commands {\nbackground-color: #002440;\nfont-family: Consolas, Menlo, Monaco, \"Courier New\", monospace;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-about.less\";\n@import \"page-account-settings.less\";\n@import \"page-add-organization.less\";\n+@import \"page-admin-index.less\";\n@import \"page-api-keys.less\";\n@import \"page-blog.less\";\n@import \"page-delete-account.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-admin-index.less",
"diff": "+.page-admin-index {\n+ h2 {\n+ margin-bottom: 8px;\n+ margin-top: 32px;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"diff": "ViewBag.Tab = \"Admin\";\n}\n-<section role=\"main\" class=\"container main-container\">\n+<section role=\"main\" class=\"container main-container page-admin-index\">\n<h1>Site Administration</h1>\n- <ul>\n+ <ul class=\"list-unstyled\">\n@if (Model.ShowDatabaseAdmin)\n{\n<li>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make the admin index page a little better looking (#7438) |
455,776 | 14.08.2019 14:46:14 | 25,200 | e227bd98d4fb58de11f39657259f4faeff652bd0 | Add aria-label to Add Organization page logo | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"new_path": "src/NuGetGallery/Views/Organizations/Add.cshtml",
"diff": "<div>\n<aside class=\"col-sm-3 col-sm-push-9\">\n<b>Logo</b>\n- <img src=\"@Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\")\" class=\"owner-image img-responsive\" height=\"332\" id=\"gravatar-image\" width=\"332\" alt=\"gravatar\" title=\"Organization logo\">\n+ <img src=\"@Url.Absolute(\"~/Content/gallery/img/default-package-icon-256x256.png\")\"\n+ class=\"owner-image img-responsive\"\n+ height=\"332\"\n+ id=\"gravatar-image\"\n+ width=\"332\"\n+ alt=\"gravatar\"\n+ title=\"Organization logo\"\n+ aria-label=\"Organization logo\">\n<p class=\"ms-font-s\">\nWe use the email address for your organization and gravatar.com to get the logo.\n</p>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add aria-label to Add Organization page logo (#7454) |
455,776 | 14.08.2019 14:47:09 | 25,200 | 12a61eb9279c0d65bfb25e81a2af5af626960aa4 | GitHub Usage expander should be tabbable | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@if(Model.IsGitHubUsageEnabled && !Model.IsDotnetToolPackageType)\n{\n<h2>\n- <a role=\"button\" data-toggle=\"collapse\" data-target=\"#github-usage\"\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#github-usage\"\naria-expanded=\"false\" aria-controls=\"github-usage\" id=\"show-github-usage\">\n<i class=\"ms-Icon ms-Icon--ChevronRight\" aria-hidden=\"true\"></i>\n<span>GitHub Usage</span>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | GitHub Usage expander should be tabbable (#7453) |
455,736 | 15.08.2019 09:28:36 | 25,200 | 2bc05cba77adb240845544f1d1f85f41c6a07388 | Allow default searches to go to preview search
Emit search events on default search
Cache preview default search
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -994,13 +994,14 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\nSearchResults results;\n- var isPreviewSearchEnabled = !string.IsNullOrEmpty(q) && _abTestService.IsPreviewSearchEnabled(GetCurrentUser());\n+ var isPreviewSearchEnabled = _abTestService.IsPreviewSearchEnabled(GetCurrentUser());\nvar searchService = isPreviewSearchEnabled ? _previewSearchService : _searchService;\n// fetch most common query from cache to relieve load on the search service\n- if (string.IsNullOrEmpty(q) && page == 1 && includePrerelease && !isPreviewSearchEnabled)\n+ if (string.IsNullOrEmpty(q) && page == 1 && includePrerelease)\n{\n- var cachedResults = HttpContext.Cache.Get(\"DefaultSearchResults\");\n+ var cacheKey = isPreviewSearchEnabled ? \"DefaultPreviewSearchResults\" : \"DefaultSearchResults\";\n+ var cachedResults = HttpContext.Cache.Get(cacheKey);\nif (cachedResults == null)\n{\nvar searchFilter = SearchAdaptor.GetSearchFilter(\n@@ -1015,7 +1016,7 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\n// note: this is a per instance cache\nHttpContext.Cache.Add(\n- \"DefaultSearchResults\",\n+ cacheKey,\nresults,\nnull,\nDateTime.UtcNow.AddMinutes(10),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/ListPackages.cshtml",
"diff": "}\n@foreach (var package in Model.Items)\n{\n- // Only set an item index when there is a search query, for now.\n- var thisItemIndex = string.IsNullOrWhiteSpace(Model.SearchTerm) ? null : (int?) itemIndex;\n- @Html.Partial(\"_ListPackage\", package, new ViewDataDictionary { { \"itemIndex\", thisItemIndex }, { \"eventName\", eventName } })\n+ @Html.Partial(\"_ListPackage\", package, new ViewDataDictionary { { \"itemIndex\", itemIndex }, { \"eventName\", eventName } })\nitemIndex++;\n}\n</div>\n// Used to track how many selections were made on this page. Multiple selections can happen if the user opens\n// a search selection in a new tab, instead of navigating away from this page.\nvar sincePageLoadCount = 0;\n- @if (!string.IsNullOrWhiteSpace(Model.SearchTerm) && (Model.PageIndex == 0 || Model.Items.Count() > 0))\n- {\n+ @{\n+ var searchId = Guid.NewGuid().ToString();\nvar category = Model.IsPreviewSearch ? \"preview-search-page\" : \"search-page\";\nvar action = Model.IncludePrerelease ? \"search-prerel\" : \"search-stable\";\n+\n// Emit an event representing the search page and the page index. This make it easier for the search selection\n// event to be correlated in Google Analytics.\n<text>\nwindow.nuget.sendAnalyticsEvent('@category', '@action', @Html.Raw(Json.Encode(Model.SearchTerm)), @Model.PageIndex);\nwindow.nuget.sendAiMetric('BrowserSearchPage', @Model.PageIndex, {\n+ SearchId: '@searchId',\nSearchTerm: @Html.Raw(Json.Encode(Model.SearchTerm)),\nIncludePrerelease: '@Model.IncludePrerelease',\nPageIndex: @Model.PageIndex,\nvar data = $this.data();\nif ($this.attr('href') && data.track) {\nwindow.nuget.sendAiMetric('BrowserSearchSelection', data.trackValue, {\n+ SearchId: '@searchId',\nSearchTerm: @Html.Raw(Json.Encode(Model.SearchTerm)),\nIncludePrerelease: '@Model.IncludePrerelease',\nPageIndex: @Model.PageIndex,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -3974,7 +3974,7 @@ public async Task UsesPreviewSearchServiceWhenABTestServiceSaysSo()\n[InlineData(null)]\n[InlineData(\"\")]\n[InlineData(\" \")]\n- public async Task DoesNotUsePreviewSearchServiceForEmptyQuery(string q)\n+ public async Task UsesPreviewSearchServiceForEmptyQuery(string q)\n{\nvar abTestService = new Mock<IABTestService>();\nabTestService\n@@ -3985,10 +3985,10 @@ public async Task DoesNotUsePreviewSearchServiceForEmptyQuery(string q)\nhttpContext.Setup(c => c.Cache).Returns(_cache);\nvar searchService = new Mock<ISearchService>();\n- searchService\n+ var previewSearchService = new Mock<ISearchService>();\n+ previewSearchService\n.Setup(s => s.Search(It.IsAny<SearchFilter>()))\n.ReturnsAsync(() => new SearchResults(0, DateTime.UtcNow));\n- var previewSearchService = new Mock<ISearchService>();\nvar controller = CreateController(\nGetConfigurationService(),\n@@ -4000,11 +4000,50 @@ public async Task DoesNotUsePreviewSearchServiceForEmptyQuery(string q)\nvar result = await controller.ListPackages(new PackageListSearchViewModel { Q = q, Prerel = true });\n- searchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Once);\n- previewSearchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Never);\n+ searchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Never);\n+ previewSearchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Once);\nabTestService.Verify(\nx => x.IsPreviewSearchEnabled(TestUtility.FakeUser),\n- Times.Never);\n+ Times.Once);\n+ }\n+\n+ [Theory]\n+ [InlineData(false, \"DefaultSearchResults\")]\n+ [InlineData(true, \"DefaultPreviewSearchResults\")]\n+ public async Task CachesDefaultSearch(bool preview, string key)\n+ {\n+ var abTestService = new Mock<IABTestService>();\n+ abTestService\n+ .Setup(x => x.IsPreviewSearchEnabled(It.IsAny<User>()))\n+ .Returns(preview);\n+\n+ var httpContext = new Mock<HttpContextBase>();\n+ httpContext.Setup(c => c.Cache).Returns(_cache);\n+\n+ var results = new SearchResults(0, DateTime.UtcNow);\n+ var searchService = new Mock<ISearchService>();\n+ searchService\n+ .Setup(s => s.Search(It.IsAny<SearchFilter>()))\n+ .ReturnsAsync(results);\n+ var previewResults = new SearchResults(0, DateTime.UtcNow);\n+ var previewSearchService = new Mock<ISearchService>();\n+ previewSearchService\n+ .Setup(s => s.Search(It.IsAny<SearchFilter>()))\n+ .ReturnsAsync(previewResults);\n+\n+ var controller = CreateController(\n+ GetConfigurationService(),\n+ httpContext: httpContext,\n+ searchService: searchService,\n+ previewSearchService: previewSearchService,\n+ abTestService: abTestService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.ListPackages(new PackageListSearchViewModel { Q = string.Empty, Prerel = true });\n+\n+ var cachedValue = _cache.Get(key);\n+ Assert.NotNull(cachedValue);\n+ Assert.Same(preview ? previewResults : results, cachedValue);\n}\nprotected override void Dispose(bool disposing)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Allow default searches to go to preview search (#7456)
Emit search events on default search
Cache preview default search
Address https://github.com/NuGet/NuGetGallery/pull/7456 |
455,747 | 16.08.2019 15:23:39 | 25,200 | 346fe93588b419cc9ef09cb985f0cbc93f92833f | Cred check | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery.Services/Authentication/AuthenticationService.cs",
"diff": "@@ -802,7 +802,7 @@ private Credential FindMatchingCredential(Credential credential)\n.Include(u => u.User)\n.Include(u => u.User.Roles)\n.Include(u => u.Scopes)\n- .Where(c => c.Type == credential.Type && c.Value == credential.Value)\n+ .Where(c => c.Type == credential.Type && c.Value == credential.Value && c.TenantId == credential.TenantId)\n.ToList();\nreturn ValidateFoundCredentials(results, credential.Type);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs",
"diff": "@@ -576,10 +576,10 @@ public async Task GivenPasswordCredential_ItThrowsArgumentException()\n}\n[Fact]\n- public async Task GivenMatchingCredential_ItWritesCredentialLastUsed()\n+ public async Task GivenMatchingCredential_ItWritesCredentialLastUsedForMSA()\n{\n// Arrange\n- var cred = _fakes.User.Credentials.Single(c => c.Type.Contains(CredentialTypes.External.Prefix));\n+ var cred = _fakes.User.Credentials.Single(c => c.Type.Contains(CredentialTypes.External.MicrosoftAccount));\nvar referenceTime = DateTime.UtcNow;\n_dateTimeProviderMock.SetupGet(x => x.UtcNow).Returns(referenceTime);\n@@ -588,13 +588,51 @@ public async Task GivenMatchingCredential_ItWritesCredentialLastUsed()\n// Act\n// Create a new credential to verify that it's a value-based lookup!\n- var result = await _authenticationService.Authenticate(TestCredentialHelper.CreateExternalCredential(cred.Value));\n+ var result = await _authenticationService.Authenticate(TestCredentialHelper.CreateExternalMSACredential(cred.Value));\n// Assert\nAssert.NotNull(result);\nAssert.True(cred.LastUsed == referenceTime);\nAssert.True(cred.LastUsed.HasValue);\n}\n+\n+ [Fact]\n+ public async Task GivenMatchingCredential_ItWritesCredentialLastUsedForAAD()\n+ {\n+ // Arrange\n+ var cred = _fakes.User.Credentials.Single(c => c.Type.Contains(CredentialTypes.External.AzureActiveDirectoryAccount));\n+\n+ var referenceTime = DateTime.UtcNow;\n+ _dateTimeProviderMock.SetupGet(x => x.UtcNow).Returns(referenceTime);\n+\n+ Assert.False(cred.LastUsed.HasValue);\n+\n+ // Act\n+ // Create a new credential to verify that it's a value-based lookup!\n+ var result = await _authenticationService.Authenticate(TestCredentialHelper.CreateExternalAADCredential(cred.Value, cred.TenantId));\n+\n+ // Assert\n+ Assert.NotNull(result);\n+ Assert.True(cred.LastUsed == referenceTime);\n+ Assert.True(cred.LastUsed.HasValue);\n+ }\n+\n+ [Fact]\n+ public async Task GivenExistingCredentialValue_ItDoesNotAuthenticateIncorrectTenant()\n+ {\n+ // Arrange\n+ var cred = _fakes.User.Credentials.Single(c => c.Type.Contains(CredentialTypes.External.AzureActiveDirectoryAccount));\n+\n+ var referenceTime = DateTime.UtcNow;\n+ _dateTimeProviderMock.SetupGet(x => x.UtcNow).Returns(referenceTime);\n+\n+ // Act\n+ // Create a new credential to verify that it's a value-based lookup!\n+ var result = await _authenticationService.Authenticate(TestCredentialHelper.CreateExternalAADCredential(cred.Value, \"RandomTenant\"));\n+\n+ // Assert\n+ Assert.Null(result);\n+ }\n}\npublic class TheCreateSessionAsyncMethod : TestContainer\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/TestCredentialHelper.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/TestCredentialHelper.cs",
"diff": "@@ -77,9 +77,14 @@ public static Credential CreateV2VerificationApiKey(Guid apiKey)\nreturn CreateApiKey(CredentialTypes.ApiKey.VerifyV1, GuidToApiKey(apiKey), TimeSpan.FromDays(1));\n}\n- public static Credential CreateExternalCredential(string value, string tenantId = null)\n+ public static Credential CreateExternalMSACredential(string value)\n{\n- return new Credential { Type = CredentialTypes.External.MicrosoftAccount, Value = value, TenantId = tenantId };\n+ return new Credential { Type = CredentialTypes.External.MicrosoftAccount, Value = value, TenantId = \"MSA\" };\n+ }\n+\n+ public static Credential CreateExternalAADCredential(string value, string tenantId)\n+ {\n+ return new Credential { Type = CredentialTypes.External.AzureActiveDirectoryAccount, Value = value, TenantId = tenantId };\n}\ninternal static Credential CreateApiKey(string type, string apiKey, TimeSpan? expiration)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1883,7 +1883,7 @@ public static IEnumerable<object[]> GivenANonScopedApiKeyCredential_ReturnsUnsup\n},\nnew object[]\n{\n- TestCredentialHelper.CreateExternalCredential(\"abc\")\n+ TestCredentialHelper.CreateExternalMSACredential(\"abc\")\n},\nnew object[]\n{\n@@ -2033,7 +2033,7 @@ public static IEnumerable<object[]> GivenANonApiKeyV2Credential_ReturnsUnsupport\n},\nnew object[]\n{\n- TestCredentialHelper.CreateExternalCredential(\"abc\")\n+ TestCredentialHelper.CreateExternalMSACredential(\"abc\")\n},\nnew object[]\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/Fakes.cs",
"diff": "@@ -46,7 +46,8 @@ public Fakes()\nExpirationForApiKeyV1).WithDefaultScopes(),\nTestCredentialHelper.CreateV4ApiKey(null, out string apiKeyV4PlaintextValue).WithDefaultScopes(),\nTestCredentialHelper.CreateV2VerificationApiKey(Guid.Parse(\"b0c51551-823f-4701-8496-43980b4b3913\")),\n- TestCredentialHelper.CreateExternalCredential(\"abc\")\n+ TestCredentialHelper.CreateExternalMSACredential(\"abc\"),\n+ TestCredentialHelper.CreateExternalAADCredential(\"def\", \"tenant1\")\n},\nCreatedUtc = new DateTime(2018, 4, 1)\n};\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Cred check (#7460) |
455,736 | 19.08.2019 10:23:48 | 25,200 | dedea69a0761f34ed39d6b48a7a01ab99bbcfb70 | [Hotfix] Fix bug causing TempData messages to not work
Address
Regressed in | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -897,11 +897,10 @@ private static List<(string name, Uri searchUri)> GetPreviewSearchClientsFromCon\n.InstancePerLifetimeScope();\nbuilder\n- .RegisterType<PackagesController>()\n- .WithParameter(new ResolvedParameter(\n- (pi, ctx) => pi.ParameterType == typeof(ISearchService) && pi.Name == ParameterNames.PackagesController_PreviewSearchService,\n- (pi, ctx) => ctx.ResolveKeyed<ISearchService>(BindingKeys.PreviewSearchClient)))\n- .As<PackagesController>()\n+ .Register(c => new SearchServiceFactory(\n+ c.Resolve<ISearchService>(),\n+ c.ResolveKeyed<ISearchService>(BindingKeys.PreviewSearchClient)))\n+ .As<ISearchServiceFactory>()\n.InstancePerLifetimeScope();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -89,8 +89,7 @@ public partial class PackagesController\nprivate readonly IPackageService _packageService;\nprivate readonly IPackageUpdateService _packageUpdateService;\nprivate readonly IPackageFileService _packageFileService;\n- private readonly ISearchService _searchService;\n- private readonly ISearchService _previewSearchService;\n+ private readonly ISearchServiceFactory _searchServiceFactory;\nprivate readonly IUploadFileService _uploadFileService;\nprivate readonly IUserService _userService;\nprivate readonly IEntitiesContext _entitiesContext;\n@@ -127,8 +126,7 @@ public partial class PackagesController\nIUploadFileService uploadFileService,\nIUserService userService,\nIMessageService messageService,\n- ISearchService searchService,\n- ISearchService previewSearchService,\n+ ISearchServiceFactory searchServiceFactory,\nIPackageFileService packageFileService,\nIEntitiesContext entitiesContext,\nIAppConfiguration config,\n@@ -159,8 +157,7 @@ public partial class PackagesController\n_uploadFileService = uploadFileService;\n_userService = userService;\n_messageService = messageService;\n- _searchService = searchService ?? throw new ArgumentNullException(nameof(searchService));\n- _previewSearchService = previewSearchService ?? throw new ArgumentNullException(nameof(previewSearchService));\n+ _searchServiceFactory = searchServiceFactory ?? throw new ArgumentNullException(nameof(searchServiceFactory));\n_packageFileService = packageFileService;\n_entitiesContext = entitiesContext;\n_config = config;\n@@ -793,8 +790,9 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version\n}\n}\n- var externalSearchService = _searchService as ExternalSearchService;\n- if (_searchService.ContainsAllVersions && externalSearchService != null)\n+ var searchService = _searchServiceFactory.GetService();\n+ var externalSearchService = searchService as ExternalSearchService;\n+ if (searchService.ContainsAllVersions && externalSearchService != null)\n{\nvar isIndexedCacheKey = $\"IsIndexed_{package.PackageRegistration.Id}_{package.Version}\";\nvar isIndexed = HttpContext.Cache.Get(isIndexedCacheKey) as bool?;\n@@ -995,7 +993,7 @@ public virtual async Task<ActionResult> ListPackages(PackageListSearchViewModel\nSearchResults results;\nvar isPreviewSearchEnabled = _abTestService.IsPreviewSearchEnabled(GetCurrentUser());\n- var searchService = isPreviewSearchEnabled ? _previewSearchService : _searchService;\n+ var searchService = isPreviewSearchEnabled ? _searchServiceFactory.GetPreviewService() : _searchServiceFactory.GetService();\n// fetch most common query from cache to relieve load on the search service\nif (string.IsNullOrEmpty(q) && page == 1 && includePrerelease)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Infrastructure\\IABTestService.cs\" />\n<Compile Include=\"Infrastructure\\ILuceneDocumentFactory.cs\" />\n<Compile Include=\"Infrastructure\\ArrayModelBinder.cs\" />\n+ <Compile Include=\"Infrastructure\\ISearchServiceFactory.cs\" />\n<Compile Include=\"Infrastructure\\LuceneDocumentFactory.cs\" />\n<Compile Include=\"Infrastructure\\IHijackSearchServiceFactory.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\Correlation\\CorrelatingHttpClientHandler.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\ServiceResponse.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\SearchSideBySideMessage.cs\" />\n<Compile Include=\"Infrastructure\\HijackSearchServiceFactory.cs\" />\n+ <Compile Include=\"Infrastructure\\SearchServiceFactory.cs\" />\n<Compile Include=\"Migrations\\201903020136235_CvesCanBeEmpty.cs\" />\n<Compile Include=\"Migrations\\201903020136235_CvesCanBeEmpty.Designer.cs\">\n<DependentUpon>201903020136235_CvesCanBeEmpty.cs</DependentUpon>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -92,9 +92,12 @@ public class PackagesControllerFacts\nmessageService = messageService ?? new Mock<IMessageService>();\nsearchService = searchService ?? new Mock<ISearchService>();\n-\npreviewSearchService = previewSearchService ?? new Mock<ISearchService>();\n+ var searchServiceFactory = new Mock<ISearchServiceFactory>();\n+ searchServiceFactory.Setup(x => x.GetService()).Returns(() => searchService.Object);\n+ searchServiceFactory.Setup(x => x.GetPreviewService()).Returns(() => previewSearchService.Object);\n+\nif (packageFileService == null)\n{\npackageFileService = new Mock<IPackageFileService>();\n@@ -216,8 +219,7 @@ public class PackagesControllerFacts\nuploadFileService.Object,\nuserService.Object,\nmessageService.Object,\n- searchService.Object,\n- previewSearchService.Object,\n+ searchServiceFactory.Object,\npackageFileService.Object,\nentitiesContext.Object,\nconfigurationService.Current,\n@@ -332,30 +334,6 @@ private static Mock<IPackageUploadService> GetValidPackageUploadService(string p\nreturn fakePackageUploadService;\n}\n- public class TheConstructor\n- : TestContainer\n- {\n- /// <summary>\n- /// This test is to verify that the preview search service parameter name for the constructor has the\n- /// expected value. This is necessary because the dependency injection configuration uses the parameter\n- /// name to identify which search service should be preview implementation.\n- /// </summary>\n- [Fact]\n- public void HasPreviewSearchServiceParameter()\n- {\n- var type = typeof(PackagesController);\n-\n- var constructors = type.GetConstructors();\n- var constructor = Assert.Single(constructors);\n-\n- var parameters = constructor.GetParameters();\n- var parameter = Assert.Single(\n- parameters,\n- p => p.Name == DefaultDependenciesModule.ParameterNames.PackagesController_PreviewSearchService);\n- Assert.Equal(typeof(ISearchService), parameter.ParameterType);\n- }\n- }\n-\npublic class TheCancelVerifyPackageAction\n: TestContainer\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Infrastructure\\Lucene\\GallerySearchServiceFacts.cs\" />\n<Compile Include=\"Helpers\\StreamHelperFacts.cs\" />\n<Compile Include=\"Infrastructure\\Mail\\Messages\\SearchSideBySideMessageFacts.cs\" />\n+ <Compile Include=\"Infrastructure\\SearchServiceFactoryFacts.cs\" />\n<Compile Include=\"Services\\ConfigurationIconFileProviderFacts.cs\" />\n<Compile Include=\"Services\\AsynchronousDeleteAccountServiceFacts.cs\" />\n<Compile Include=\"Services\\FeatureFlagServiceFacts.cs\" />\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [Hotfix] Fix bug causing TempData messages to not work (#7462)
Address https://github.com/NuGet/NuGetGallery/issues/7461
Regressed in https://github.com/NuGet/NuGetGallery/pull/7313 |
455,772 | 21.08.2019 09:43:57 | 25,200 | 4eeff57dfab8cfb18b50b29b46a1c9609e709946 | Add 2 URLs to HTTP->HTTPS translation list | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Extensions/UriExtensions.cs",
"new_path": "src/NuGetGallery.Services/Extensions/UriExtensions.cs",
"diff": "@@ -62,7 +62,9 @@ private static bool IsMicrosoftUri(this Uri uri)\n{\nreturn uri.IsInDomain(\"microsoft.com\") ||\nuri.IsInDomain(\"asp.net\") ||\n- uri.IsInDomain(\"msdn.com\");\n+ uri.IsInDomain(\"msdn.com\") ||\n+ string.Equals(uri.Authority, \"aka.ms\", StringComparison.OrdinalIgnoreCase) ||\n+ string.Equals(uri.Authority, \"www.mono-project.com\", StringComparison.OrdinalIgnoreCase);\n}\nprivate static bool IsInDomain(this Uri uri, string domain)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs",
"diff": "@@ -115,6 +115,8 @@ public void ItInitializesProjectUrl(string projectUrl, string expected)\n[InlineData(\"http://github.com/url\", \"https://github.com/url\")]\n[InlineData(\"http://githubpages.github.io/my.page/license.html\", \"https://githubpages.github.io/my.page/license.html\")]\n[InlineData(\"http://githubpages.github.com\", \"https://githubpages.github.com/\")]\n+ [InlineData(\"http://www.mono-project.com/Licensing\", \"https://www.mono-project.com/Licensing\")]\n+ [InlineData(\"http://aka.ms/windowsazureapache2\", \"https://aka.ms/windowsazureapache2\")]\npublic void ItInitializesLicenseUrl(string licenseUrl, string expected)\n{\nvar package = new Package\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add 2 URLs to HTTP->HTTPS translation list (#7470) |
455,737 | 22.08.2019 14:14:31 | 25,200 | 35aa5400863fcc48d801e338747bd109234f8294 | Update docs link. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "{\n@DisplayNavigationItem(\"Admin\", Url.Admin())\n}\n- @DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/what-is-nuget\")\n+ @DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/\")\n@DisplayNavigationItem(\"Downloads\", Url.Downloads())\n@DisplayNavigationItem(\"Blog\", \"https://blog.nuget.org/\")\n</ul>\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update docs link. (#7472) |
455,736 | 22.08.2019 20:06:10 | 25,200 | d211d684c003e24a1766922513c38c4fa00616e1 | Remove noisy error log from ContentService
Only log an error if none of the extensions work.
Also removed an unused method and associated test code.
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Storage/IContentService.cs",
"new_path": "src/NuGetGallery.Services/Storage/IContentService.cs",
"diff": "@@ -9,7 +9,6 @@ namespace NuGetGallery\npublic interface IContentService\n{\nTask<IHtmlString> GetContentItemAsync(string name, TimeSpan expiresIn);\n- Task<IHtmlString> GetContentItemAsync(string name, string extension, TimeSpan expiresIn);\nvoid ClearCache();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ContentServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ContentServiceFacts.cs",
"diff": "@@ -157,140 +157,6 @@ public async Task GivenAContentItemAndACachedValueThatHasExpiredAndChanged_ItSho\n}\n}\n- public class TheGetContentItemWithExtensionMethod\n- {\n- const string FileContent = \"This is **a** test of http://nuget.org markdown content.\";\n- const string RenderedFileContent = \"<p>This is <strong>a</strong> test of http://nuget.org markdown content.</p>\";\n- const string CachedContent = \"<p>This is <strong>cached</strong> markdown content.</p>\";\n- const string NewContent = \"This is new content!\";\n- const string RenderedNewContent = \"<p>This is new content!</p>\";\n-\n- [Fact]\n- public void GivenANullOrEmptyName_ItShouldThrow()\n- {\n- ContractAssert.ThrowsArgNullOrEmpty(s => new TestableContentService().GetContentItemAsync(s, \".md\", TimeSpan.Zero).Wait(), \"name\");\n- }\n- [Fact]\n- public void GivenANullOrEmptyExtension_ItShouldThrow()\n- {\n- ContractAssert.ThrowsArgNullOrEmpty(s => new TestableContentService().GetContentItemAsync(\"test\", null, TimeSpan.Zero).Wait(), \"extension\");\n- }\n-\n- [Fact]\n- public async Task GivenAContentItemNameAndAnEmptyCache_ItShouldFetchThatItemFromFileStorage()\n- {\n- // Arrange\n- var file = TestFileReference.Create(FileContent);\n- var contentService = new TestableContentService();\n- contentService.SetFile(\"TestContentItem.md\", null, file);\n-\n- // Act\n- var actual = await contentService.GetContentItemAsync(\"TestContentItem\", \".md\", TimeSpan.Zero);\n-\n- // Assert\n- Assert.Equal(RenderedFileContent, actual.ToString());\n- }\n-\n- [Fact]\n- public async Task GivenAContentItemNameAndAnEmptyCache_ItShouldPutTheContentInTheCache()\n- {\n- // Arrange\n- var testStart = DateTime.UtcNow;\n- var file = TestFileReference.Create(FileContent);\n- var contentService = new TestableContentService();\n- contentService.SetFile(\"TestContentItem.md\", null, file);\n-\n- // Act\n- await contentService.GetContentItemAsync(\"TestContentItem\", \".md\", TimeSpan.FromSeconds(42));\n-\n- // Assert\n- var cached = contentService.GetCached(\"TestContentItem\");\n- Assert.NotNull(cached);\n- Assert.Equal(RenderedFileContent, cached.Content.ToString());\n- Assert.Equal(file.ContentId, cached.ContentId);\n- Assert.True(EqualWithDrift(TimeSpan.FromSeconds(42), (cached.ExpiryUtc - cached.RetrievedUtc), TimeSpan.FromSeconds(2)));\n- Assert.True(cached.RetrievedUtc >= testStart);\n-\n- var diff = cached.ExpiryUtc - cached.RetrievedUtc;\n- Assert.True(diff > TimeSpan.FromSeconds(40) && diff < TimeSpan.FromSeconds(43));\n- }\n-\n- [Fact]\n- public async Task GivenAContentItemNameAndACachedValueThatHasNotExpired_ItShouldFetchThatItemFromCache()\n- {\n- // Arrange\n- var file = TestFileReference.Create(FileContent);\n- var contentService = new TestableContentService();\n- contentService.SetCached(\"TestContentItem\", CachedContent, DateTime.UtcNow.AddDays(365d), DateTime.UtcNow);\n-\n- // Act\n- var actual = await contentService.GetContentItemAsync(\"TestContentItem\", \".md\", TimeSpan.Zero);\n-\n- // Assert\n- Assert.Equal(CachedContent, actual.ToString());\n- contentService.MockFileStorage\n- .Verify(\n- fs => fs.GetFileReferenceAsync(CoreConstants.Folders.ContentFolderName, \"TestContentItem.md\", It.IsAny<string>()),\n- Times.Never());\n- }\n-\n- [Fact]\n- public async Task GivenAContentItemNameAndACachedValueThatHasExpiredButNotChanged_ItShouldUseTheCachedValue()\n- {\n- // Arrange\n- var testStart = DateTime.UtcNow;\n- var file = TestFileReference.Create(CachedContent);\n- var contentService = new TestableContentService();\n- var retrieved = testStart.AddDays(-1d);\n- var cachedContentId =\n- contentService.SetCached(\"TestContentItem\", CachedContent, retrieved.AddSeconds(1), retrieved);\n- contentService.SetFile(\"TestContentItem.md\", cachedContentId, CloudFileReference.NotModified(cachedContentId));\n-\n- // Act\n- var actual = await contentService.GetContentItemAsync(\"TestContentItem\", \".md\", TimeSpan.FromHours(12));\n-\n- // Assert\n- Assert.Equal(CachedContent, actual.ToString());\n- contentService.MockFileStorage\n- .Verify(fs => fs.GetFileReferenceAsync(CoreConstants.Folders.ContentFolderName, \"TestContentItem.md\", cachedContentId));\n- Assert.Equal(0, file.OpenCount); // Make sure we never tried to open the file.\n-\n- var updatedCache = contentService.GetCached(\"TestContentItem\");\n- Assert.NotNull(updatedCache);\n- Assert.Equal(CachedContent, updatedCache.Content.ToString());\n- Assert.Equal(file.ContentId, updatedCache.ContentId);\n- Assert.True(EqualWithDrift(TimeSpan.FromHours(12), (updatedCache.ExpiryUtc - DateTime.UtcNow), TimeSpan.FromSeconds(2)));\n- }\n-\n- [Fact]\n- public async Task GivenAContentItemAndACachedValueThatHasExpiredAndChanged_ItShouldUseTheFileContent()\n- {\n- // Arrange\n- var testStart = DateTime.UtcNow;\n- var file = TestFileReference.Create(NewContent);\n- var contentService = new TestableContentService();\n- var retrieved = testStart.AddDays(-1d);\n- var cachedContentId =\n- contentService.SetCached(\"TestContentItem\", CachedContent, retrieved.AddSeconds(1), retrieved);\n- contentService.SetFile(\"TestContentItem.md\", cachedContentId, file);\n-\n- // Act\n- var actual = await contentService.GetContentItemAsync(\"TestContentItem\", \".md\", TimeSpan.FromHours(12));\n-\n- // Assert\n- Assert.Equal(RenderedNewContent, actual.ToString());\n- contentService.MockFileStorage\n- .Verify(fs => fs.GetFileReferenceAsync(CoreConstants.Folders.ContentFolderName, \"TestContentItem.md\", cachedContentId));\n- Assert.Equal(1, file.OpenCount); // Make sure we never tried to open the file.\n-\n- var updatedCache = contentService.GetCached(\"TestContentItem\");\n- Assert.NotNull(updatedCache);\n- Assert.Equal(RenderedNewContent, updatedCache.Content.ToString());\n- Assert.Equal(file.ContentId, updatedCache.ContentId);\n- Assert.True(EqualWithDrift(TimeSpan.FromHours(12), (updatedCache.ExpiryUtc - updatedCache.RetrievedUtc), TimeSpan.FromSeconds(2)));\n- }\n- }\n-\nprivate static bool EqualWithDrift(TimeSpan expected, TimeSpan actual, TimeSpan drift)\n{\nvar distance = expected - actual;\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Remove noisy error log from ContentService (#7477)
Only log an error if none of the extensions work.
Also removed an unused method and associated test code.
Address https://github.com/NuGet/Engineering/issues/2497 |
455,759 | 28.08.2019 16:47:08 | -7,200 | 06311dd8f999ecd894224df86e5479bcebc72342 | Change commit SHA to point to updated ServerCommon build scripts | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -10,7 +10,7 @@ param (\n[string]$PackageSuffix,\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = 'cb2b9e41b18cb77ee644a51951d8c8f24cde9adf'\n+ [string]$BuildBranch = '1f60ff35a3cebf1a0c5fb631d2534fd5b4a11edc'\n)\nSet-StrictMode -Version 1.0\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Change commit SHA to point to updated ServerCommon build scripts (#7491) |
455,736 | 28.08.2019 15:59:38 | 25,200 | 661ad4643a0225fe5d216dd885dbe113d630408d | Make log off operation only accept POST
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -324,13 +324,14 @@ public virtual async Task<ActionResult> Register(LogOnViewModel model, string re\nreturn RedirectFromRegister(returnUrl);\n}\n- [HttpGet]\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\npublic virtual ActionResult LogOff(string returnUrl)\n{\nOwinContext.Authentication.SignOut();\nif (!string.IsNullOrEmpty(returnUrl)\n- && returnUrl.Contains(\"account\"))\n+ && (returnUrl.Contains(\"account\") || returnUrl.Contains(\"Admin\")))\n{\nreturnUrl = null;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Views\\Packages\\ReportAbuse.cshtml\" />\n<Content Include=\"Views\\Packages\\UploadPackage.cshtml\" />\n<Content Include=\"Views\\Shared\\_ListPackage.cshtml\" />\n- <Content Include=\"Views\\Shared\\UserDisplay.cshtml\" />\n<Content Include=\"Views\\Users\\Packages.cshtml\" />\n<Content Include=\"App_Code\\ViewHelpers.cshtml\" />\n<Content Include=\"Views\\Users\\PasswordChanged.cshtml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "initializeJQueryValidator();\n$(function () {\n+ // Enable the POST links. These are links that perform a POST via a form instead of traditional navigation.\n+ $(\".post-link\").on('click', function () {\n+ $(\"#\" + $(this).data().formId).submit();\n+ return false;\n+ });\n+\n// Use moment.js to format attributes with the \"datetime\" attribute to \"X time ago\".\n$.each($('*[data-datetime]'), function () {\nvar $el = $(this);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -408,30 +408,6 @@ public static string OrganizationConfirmationRequired(this UrlHelper url, string\n});\n}\n- public static string LogOff(this UrlHelper url, bool relativeUrl = true)\n- {\n- return LogOff(url, url.Current(), relativeUrl);\n- }\n-\n- public static string LogOff(this UrlHelper url, string returnUrl, bool relativeUrl = true)\n- {\n- // If we're logging off from the Admin Area, don't set a return url\n- if (string.Equals(url.RequestContext.RouteData.DataTokens[Area].ToStringOrNull(), AdminAreaRegistration.Name, StringComparison.OrdinalIgnoreCase))\n- {\n- returnUrl = string.Empty;\n- }\n-\n- return GetActionLink(\n- url,\n- \"LogOff\",\n- \"Authentication\",\n- relativeUrl,\n- routeValues: new RouteValueDictionary\n- {\n- { \"returnUrl\", returnUrl }\n- });\n- }\n-\npublic static string Register(this UrlHelper url, bool relativeUrl = true)\n{\nreturn GetActionLink(url, \"LogOn\", \"Authentication\", relativeUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "<li role=\"presentation\"><a href=\"@Url.ManageMyPackages()\" role=\"menuitem\">Manage Packages</a></li>\n<li role=\"presentation\"><a href=\"@Url.UploadPackage()\" role=\"menuitem\">Upload Package</a></li>\n<li class=\"divider\"></li>\n- <li role=\"presentation\"><a href=\"@Url.LogOff()\" role=\"menuitem\">Sign Out</a></li>\n+ <li role=\"presentation\">\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"log-off-form\",\n+ linkText: \"Sign Out\",\n+ actionName: \"LogOff\",\n+ controllerName: \"Authentication\",\n+ role: \"menuitem\",\n+ formValues: new Dictionary<string, string>\n+ {\n+ { \"returnUrl\", Url.Current() },\n+ })\n+ </li>\n</ul>\n</li>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -95,12 +95,14 @@ public void WillRedirectToTheReturnUrl()\nResultAssert.IsSafeRedirectTo(result, \"theReturnUrl\");\n}\n- [Fact]\n- public void WillNotRedirectToTheReturnUrlWhenReturnUrlContainsAccount()\n+ [Theory]\n+ [InlineData(\"account/profile\")]\n+ [InlineData(\"Admin/SupportRequest\")]\n+ public void WillNotRedirectToTheReturnUrlWhenReturnUrlContains(string returnUrl)\n{\nvar controller = GetController<AuthenticationController>();\n- var result = controller.LogOff(\"account/profile\");\n+ var result = controller.LogOff(returnUrl);\nResultAssert.IsSafeRedirectTo(result, null);\n}\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make log off operation only accept POST (#7493)
Progress on https://github.com/NuGet/Engineering/issues/2679 |
455,736 | 27.08.2019 12:43:10 | 25,200 | 0791dc89eca69f732a588d4e11c4b5e2b523cfb0 | Add tracing to CSRF test and exclude non-actions
Progress on | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ControllerTests.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ControllerTests.cs",
"diff": "using System.Web.Mvc;\nusing NuGetGallery.Filters;\nusing Xunit;\n+using Xunit.Abstractions;\nnamespace NuGetGallery.Controllers\n{\npublic class ControllerTests\n{\n+ private readonly ITestOutputHelper _output;\n+\n+ public ControllerTests(ITestOutputHelper output)\n+ {\n+ _output = output;\n+ }\n+\nprivate class ControllerActionRuleException : IEquatable<ControllerActionRuleException>\n{\npublic Type Controller { get; private set; }\n@@ -66,8 +74,6 @@ public void AllActionsHaveAntiForgeryTokenIfNotGet()\nnew ControllerActionRuleException(typeof(ApiController), nameof(ApiController.DeletePackage)),\nnew ControllerActionRuleException(typeof(ApiController), nameof(ApiController.PublishPackage)),\nnew ControllerActionRuleException(typeof(ApiController), nameof(ApiController.DeprecatePackage)),\n- new ControllerActionRuleException(typeof(AuthenticationController), nameof(AuthenticationController.AuthenticateAndLinkExternal)),\n- new ControllerActionRuleException(typeof(AuthenticationController), nameof(AuthenticationController.ChallengeAuthentication))\n};\n// Act\n@@ -78,15 +84,35 @@ public void AllActionsHaveAntiForgeryTokenIfNotGet()\n.Where(m =>\n{\nvar attributes = m.GetCustomAttributes()\n- .Where(a => typeof(ActionMethodSelectorAttribute).IsAssignableFrom(a.GetType()));\n+ .Where(a => typeof(ActionMethodSelectorAttribute)\n+ .IsAssignableFrom(a.GetType()));\n+\n+ // Non-actions cannot be requested via HTTP.\n+ if (attributes.Any(a => a.GetType() == typeof(NonActionAttribute)))\n+ {\n+ _output.WriteLine($\"{DisplayMethodName(m)} - non-action\");\n+ return false;\n+ }\n- return !(attributes\n+ var isGetOrHead = attributes\n.All(a =>\na.GetType() == typeof(HttpGetAttribute) ||\na.GetType() == typeof(HttpHeadAttribute) ||\n(a.GetType() == typeof(AcceptVerbsAttribute) &&\n(a as AcceptVerbsAttribute).Verbs.All(v =>\n- verbExceptions.Any(ve => v.Equals(ve.ToString(), StringComparison.InvariantCultureIgnoreCase))))));\n+ verbExceptions.Any(ve => v.Equals(ve.ToString(), StringComparison.InvariantCultureIgnoreCase)))));\n+\n+ if (isGetOrHead)\n+ {\n+ _output.WriteLine($\"{DisplayMethodName(m)} - GET or HEAD\");\n+ }\n+\n+ return !isGetOrHead;\n+ })\n+ .Select(m =>\n+ {\n+ _output.WriteLine($\"{DisplayMethodName(m)} - to be verified\");\n+ return m;\n});\n// Assert\n@@ -141,19 +167,33 @@ public void AllActionsHaveUIAuthorizeAttribute()\nprivate IEnumerable<MethodInfo> GetAllActions(IEnumerable<ControllerActionRuleException> exceptions = null)\n{\n- return Assembly.GetAssembly(typeof(AppController)).GetTypes()\n+ return Assembly.GetAssembly(typeof(AppController))\n+ .GetTypes()\n// Get all types that are controllers.\n.Where(typeof(Controller).IsAssignableFrom)\n// Get all public methods of those types.\n.SelectMany(t => t.GetMethods(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public))\n// Filter out compiler generated methods.\n.Where(m => !m.GetCustomAttributes(typeof(CompilerGeneratedAttribute), inherit: true).Any())\n+ .OrderBy(DisplayMethodName)\n// Filter out exceptions.\n.Where(m =>\n{\nvar possibleException = new ControllerActionRuleException(m);\n- return !exceptions?.Any(a => a.Equals(possibleException)) ?? true;\n+ var isNotException = !exceptions?.Any(a => a.Equals(possibleException)) ?? true;\n+\n+ if (!isNotException)\n+ {\n+ _output.WriteLine($\"{DisplayMethodName(m)} - excluded due to exception\");\n+ }\n+\n+ return isNotException;\n});\n}\n+\n+ private static string DisplayMethodName(MethodInfo m)\n+ {\n+ return $\"{m.DeclaringType.FullName}.{m.Name}\";\n+ }\n}\n}\n\\ No newline at end of file\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add tracing to CSRF test and exclude non-actions (#7488)
Progress on https://github.com/NuGet/Engineering/issues/2679 |
455,736 | 29.08.2019 15:37:31 | 25,200 | 73ba62acc0a87719e694c5b9f3bf068831c349bb | Use POST for admin actions
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@@ -663,7 +663,7 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n@helper PostLink(\nSystem.Web.Mvc.WebViewPage page,\nstring formId,\n- string linkText,\n+ Func<MvcHtmlString, HelperResult> htmlContent,\nstring actionName,\nstring controllerName,\nstring role,\n@@ -686,7 +686,28 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);\n}\n}\n}\n- <a href=\"#\" class=\"post-link\" data-form-id=\"@formId\" role=\"@role\">@linkText</a>\n+ <a href=\"#\" class=\"post-link\" data-form-id=\"@formId\" role=\"@role\">@htmlContent(MvcHtmlString.Empty)</a>\n+}\n+\n+@helper PostLink(\n+ System.Web.Mvc.WebViewPage page,\n+ string formId,\n+ string linkText,\n+ string actionName,\n+ string controllerName,\n+ string role,\n+ string area = \"\",\n+ Dictionary<string, string> formValues = null)\n+{\n+ @PostLink(\n+ page,\n+ formId,\n+ @<text>@linkText</text>,\n+ actionName,\n+ controllerName,\n+ role,\n+ area,\n+ formValues);\n}\n@functions\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -226,6 +226,21 @@ public static void RegisterUIRoutes(RouteCollection routes)\nnew { controller = \"Packages\", action = \"SetLicenseReportVisibility\", visible = false },\nnew { version = new VersionRouteConstraint() });\n+ routes.MapRoute(\n+ RouteName.PackageReflowAction,\n+ \"packages/manage/reflow\",\n+ new { controller = \"Packages\", action = nameof(PackagesController.Reflow) });\n+\n+ routes.MapRoute(\n+ RouteName.PackageRevalidateAction,\n+ \"packages/manage/revalidate\",\n+ new { controller = \"Packages\", action = nameof(PackagesController.Revalidate) });\n+\n+ routes.MapRoute(\n+ RouteName.PackageRevalidateSymbolsAction,\n+ \"packages/manage/revalidate-symbols\",\n+ new { controller = \"Packages\", action = nameof(PackagesController.RevalidateSymbols) });\n+\nvar packageVersionActionRoute = routes.MapRoute(\nRouteName.PackageVersionAction,\n\"packages/{id}/{version}/{action}\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Controllers/HomeController.cs",
"new_path": "src/NuGetGallery/Areas/Admin/Controllers/HomeController.cs",
"diff": "@@ -35,7 +35,8 @@ public virtual ActionResult Throw()\nthrow new Exception(\"KA BOOM!\");\n}\n- [HttpGet]\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\npublic virtual ActionResult ClearContentCache()\n{\n_content.ClearCache();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Home/Index.cshtml",
"diff": "</li>\n<li>\n<h2>\n- <a href=\"@Url.Action(actionName: \"ClearContentCache\", controllerName: \"Home\")\">\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"clear-content-cache-form\",\n+ htmlContent: @<text>\n<i class=\"ms-Icon ms-Icon--Refresh\"></i>\n<span>Clear Content Cache</span>\n- </a>\n+ </text>,\n+ actionName: \"ClearContentCache\",\n+ controllerName: \"Home\",\n+ role: string.Empty,\n+ area: \"Admin\")\n</h2>\n<p>\nClear Content Cache\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml",
"new_path": "src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml",
"diff": "{\nif (package.ValidatingType == ValidatingType.Package)\n{\n- <a href=\"@Url.RevalidatePackage(package)\">Revalidate Package</a><br />\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"revalidate-package-form\",\n+ linkText: \"Revalidate package\",\n+ actionName: \"Revalidate\",\n+ controllerName: \"Packages\",\n+ role: string.Empty,\n+ formValues: new Dictionary<string, string>\n+ {\n+ { \"id\", package.Id },\n+ { \"version\", package.NormalizedVersion },\n+ })\n+ <br />\n}\nelse if (package.ValidatingType == ValidatingType.SymbolPackage)\n{\n- <a href=\"@Url.RevalidateSymbolsPackage(package)\">Revalidate Symbols</a><br />\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"revalidate-symbols-form\",\n+ linkText: \"Revalidate symbols\",\n+ actionName: \"RevalidateSymbols\",\n+ controllerName: \"Packages\",\n+ role: string.Empty,\n+ formValues: new Dictionary<string, string>\n+ {\n+ { \"id\", package.Id },\n+ { \"version\", package.NormalizedVersion },\n+ })\n+ <br />\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1638,6 +1638,8 @@ public virtual ActionResult DeleteSymbols(string id, string version)\nreturn View(model);\n}\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\n[UIAuthorize(Roles = \"Admins\")]\n[RequiresAccountConfirmation(\"reflow a package\")]\npublic virtual async Task<ActionResult> Reflow(string id, string version)\n@@ -1673,6 +1675,8 @@ public virtual async Task<ActionResult> Reflow(string id, string version)\nreturn SafeRedirect(Url.Package(id, version));\n}\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\n[UIAuthorize(Roles = \"Admins\")]\n[RequiresAccountConfirmation(\"revalidate a package\")]\npublic virtual async Task<ActionResult> Revalidate(string id, string version)\n@@ -1700,7 +1704,8 @@ public virtual async Task<ActionResult> Revalidate(string id, string version)\nreturn SafeRedirect(Url.Package(id, version));\n}\n-\n+ [HttpPost]\n+ [ValidateAntiForgeryToken]\n[UIAuthorize(Roles = \"Admins\")]\n[RequiresAccountConfirmation(\"revalidate a symbols package\")]\npublic virtual async Task<ActionResult> RevalidateSymbols(string id, string version)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteName.cs",
"new_path": "src/NuGetGallery/RouteName.cs",
"diff": "@@ -107,5 +107,8 @@ public static class RouteName\npublic const string PagesSimulateError = \"PagesSimulateError\";\npublic const string ApiSimulateError = \"ApiSimulateError\";\npublic const string ExperimentsSearchSideBySide = \"ExperimentsSearchSideBySide\";\n+ public const string PackageReflowAction = \"PackageReflowAction\";\n+ public const string PackageRevalidateAction = \"PackageRevalidateAction\";\n+ public const string PackageRevalidateSymbolsAction = \"PackageRevalidateSymbolsAction\";\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -744,30 +744,6 @@ public static string GetOrganizationCertificates(this UrlHelper url, string acco\nrelativeUrl);\n}\n- public static string ReflowPackage(\n- this UrlHelper url,\n- IPackageVersionModel package,\n- bool relativeUrl = true)\n- {\n- return url.PackageVersionAction(nameof(PackagesController.Reflow), package, relativeUrl);\n- }\n-\n- public static string RevalidatePackage(\n- this UrlHelper url,\n- IPackageVersionModel package,\n- bool relativeUrl = true)\n- {\n- return url.PackageVersionAction(nameof(PackagesController.Revalidate), package, relativeUrl);\n- }\n-\n- public static string RevalidateSymbolsPackage(\n- this UrlHelper url,\n- IPackageVersionModel package,\n- bool relativeUrl = true)\n- {\n- return url.PackageVersionAction(nameof(PackagesController.RevalidateSymbols), package, relativeUrl);\n- }\n-\npublic static string DeprecatePackage(this UrlHelper url, bool relativeUrl = true)\n{\nreturn GetActionLink(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "{\n<li>\n<i class=\"ms-Icon ms-Icon--Refresh\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.ReflowPackage(Model)\">Reflow package</a>\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"reflow-package-form\",\n+ linkText: \"Reflow package\",\n+ actionName: \"Reflow\",\n+ controllerName: \"Packages\",\n+ role: string.Empty,\n+ formValues: new Dictionary<string, string>\n+ {\n+ { \"id\", Model.Id },\n+ { \"version\", Model.Version },\n+ })\n</li>\n}\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Refresh\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.RevalidatePackage(Model)\">Revalidate package</a>\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"revalidate-package-form\",\n+ linkText: \"Revalidate package\",\n+ actionName: \"Revalidate\",\n+ controllerName: \"Packages\",\n+ role: string.Empty,\n+ formValues: new Dictionary<string, string>\n+ {\n+ { \"id\", Model.Id },\n+ { \"version\", Model.Version },\n+ })\n</li>\nif (Model.LatestSymbolsPackage != null)\n{\n<li>\n<i class=\"ms-Icon ms-Icon--Refresh\" aria-hidden=\"true\"></i>\n- <a href=\"@Url.RevalidateSymbolsPackage(Model)\">Revalidate symbols</a>\n+ @ViewHelpers.PostLink(\n+ this,\n+ formId: \"revalidate-symbols-form\",\n+ linkText: \"Revalidate symbols\",\n+ actionName: \"RevalidateSymbols\",\n+ controllerName: \"Packages\",\n+ role: string.Empty,\n+ formValues: new Dictionary<string, string>\n+ {\n+ { \"id\", Model.Id },\n+ { \"version\", Model.Version },\n+ })\n</li>\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/UrlHelperExtensionsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/UrlHelperExtensionsFacts.cs",
"diff": "@@ -139,27 +139,6 @@ public static IEnumerable<object[]> ResolvePathIsCorrect_Data\n(url, package) => url.ManagePackage(package))\n};\n- yield return new object[]\n- {\n- nameof(PackagesController.Reflow),\n- new Func<UrlHelper, IPackageVersionModel, string>(\n- (url, package) => url.ReflowPackage(package))\n- };\n-\n- yield return new object[]\n- {\n- nameof(PackagesController.Revalidate),\n- new Func<UrlHelper, IPackageVersionModel, string>(\n- (url, package) => url.RevalidatePackage(package))\n- };\n-\n- yield return new object[]\n- {\n- nameof(PackagesController.RevalidateSymbols),\n- new Func<UrlHelper, IPackageVersionModel, string>(\n- (url, package) => url.RevalidateSymbolsPackage(package))\n- };\n-\nyield return new object[]\n{\nnameof(PackagesController.DeleteSymbols),\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Use POST for admin actions (#7497)
Progress on https://github.com/NuGet/Engineering/issues/2679 |
455,736 | 30.08.2019 11:55:48 | 25,200 | 74909f82d6a2c49c58d5642e32d5dbd89f5cf882 | Make the cancel ownershipt request endpoint just redirect to Manage
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "@@ -147,10 +147,8 @@ public async Task<JsonResult> AddPackageOwner(AddPackageOwnerViewModel addOwnerD\nownerRequest.ConfirmationCode,\nrelativeUrl: false);\n- var cancellationUrl = Url.CancelPendingOwnershipRequest(\n+ var manageUrl = Url.ManagePackageOwnership(\nmodel.Package.Id,\n- model.CurrentUser.Username,\n- model.User.Username,\nrelativeUrl: false);\nvar packageOwnershipRequestMessage = new PackageOwnershipRequestMessage(\n@@ -168,7 +166,13 @@ public async Task<JsonResult> AddPackageOwner(AddPackageOwnerViewModel addOwnerD\nforeach (var owner in model.Package.Owners)\n{\n- var emailMessage = new PackageOwnershipRequestInitiatedMessage(_appConfiguration, model.CurrentUser, owner, model.User, model.Package, cancellationUrl);\n+ var emailMessage = new PackageOwnershipRequestInitiatedMessage(\n+ _appConfiguration,\n+ model.CurrentUser,\n+ owner,\n+ model.User,\n+ model.Package,\n+ manageUrl);\nawait _messageService.SendMessageAsync(emailMessage);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"new_path": "src/NuGetGallery/Controllers/OrganizationsController.cs",
"diff": "@@ -155,8 +155,7 @@ public async Task<JsonResult> AddMember(string accountName, string memberName, b\naccount,\ncurrentUser,\nrequest.NewMember,\n- request.IsAdmin,\n- cancellationUrl: Url.CancelOrganizationMembershipRequest(memberName, relativeUrl: false));\n+ request.IsAdmin);\nawait MessageService.SendMessageAsync(organizationMembershipRequestInitiatedMessage);\nreturn Json(new OrganizationMemberViewModel(request));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -2047,7 +2047,7 @@ private async Task<ActionResult> HandleOwnershipRequest(string id, string userna\n[HttpGet]\n[UIAuthorize]\n[RequiresAccountConfirmation(\"cancel pending ownership request\")]\n- public virtual async Task<ActionResult> CancelPendingOwnershipRequest(string id, string requestingUsername, string pendingUsername)\n+ public virtual ActionResult CancelPendingOwnershipRequest(string id, string requestingUsername, string pendingUsername)\n{\nvar package = _packageService.FindPackageRegistrationById(id);\nif (package == null)\n@@ -2078,12 +2078,7 @@ public virtual async Task<ActionResult> CancelPendingOwnershipRequest(string id,\nreturn HttpNotFound();\n}\n- await _packageOwnershipManagementService.DeletePackageOwnershipRequestAsync(package, pendingUser);\n-\n- var emailMessage = new PackageOwnershipRequestCanceledMessage(_config, requestingUser, pendingUser, package);\n- await _messageService.SendMessageAsync(emailMessage);\n-\n- return View(\"ConfirmOwner\", new PackageOwnerConfirmationModel(id, pendingUsername, ConfirmOwnershipResult.Cancelled));\n+ return Redirect(Url.ManagePackageOwnership(id));\n}\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Mail/Messages/OrganizationMembershipRequestInitiatedMessage.cs",
"new_path": "src/NuGetGallery/Infrastructure/Mail/Messages/OrganizationMembershipRequestInitiatedMessage.cs",
"diff": "@@ -12,18 +12,15 @@ namespace NuGetGallery.Infrastructure.Mail.Messages\npublic class OrganizationMembershipRequestInitiatedMessage : MarkdownEmailBuilder\n{\nprivate readonly IMessageServiceConfiguration _configuration;\n- private readonly string _cancellationUrl;\npublic OrganizationMembershipRequestInitiatedMessage(\nIMessageServiceConfiguration configuration,\nOrganization organization,\nUser requestingUser,\nUser pendingUser,\n- bool isAdmin,\n- string cancellationUrl)\n+ bool isAdmin)\n{\n_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));\n- _cancellationUrl = cancellationUrl ?? throw new ArgumentNullException(nameof(cancellationUrl));\nOrganization = organization ?? throw new ArgumentNullException(nameof(organization));\nRequestingUser = requestingUser ?? throw new ArgumentNullException(nameof(requestingUser));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnershipRequestInitiatedMessage.cs",
"new_path": "src/NuGetGallery/Infrastructure/Mail/Messages/PackageOwnershipRequestInitiatedMessage.cs",
"diff": "@@ -12,8 +12,8 @@ namespace NuGetGallery.Infrastructure.Mail.Messages\npublic class PackageOwnershipRequestInitiatedMessage : MarkdownEmailBuilder\n{\nprivate readonly IMessageServiceConfiguration _configuration;\n- private readonly string _rawCancellationUrl;\n- private readonly string _cancellationUrl;\n+ private readonly string _rawManageUrl;\n+ private readonly string _manageUrl;\npublic PackageOwnershipRequestInitiatedMessage(\nIMessageServiceConfiguration configuration,\n@@ -21,12 +21,12 @@ public class PackageOwnershipRequestInitiatedMessage : MarkdownEmailBuilder\nUser receivingOwner,\nUser newOwner,\nPackageRegistration packageRegistration,\n- string cancellationUrl)\n+ string manageUrl)\n{\n_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));\n- _rawCancellationUrl = cancellationUrl ?? throw new ArgumentNullException(nameof(cancellationUrl));\n- _cancellationUrl = EscapeLinkForMarkdown(cancellationUrl);\n+ _rawManageUrl = manageUrl ?? throw new ArgumentNullException(nameof(manageUrl));\n+ _manageUrl = EscapeLinkForMarkdown(manageUrl);\nRequestingOwner = requestingOwner ?? throw new ArgumentNullException(nameof(requestingOwner));\nReceivingOwner = receivingOwner ?? throw new ArgumentNullException(nameof(receivingOwner));\n@@ -64,7 +64,7 @@ protected override string GetMarkdownBody()\nTo cancel this request:\n-[{_cancellationUrl}]({_rawCancellationUrl})\n+[{_manageUrl}]({_rawManageUrl})\nThanks,\nThe {_configuration.GalleryOwner.DisplayName} Team\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "nuget.configureExpander = function (prefix, lessIcon, lessMessage, moreIcon, moreMessage) {\nvar hidden = $('#' + prefix);\n- var show = $('#show-' + prefix);\n+ var showId = '#show-' + prefix;\n+ var show = $(showId);\nvar showIcon = $('#show-' + prefix + ' i');\nvar showText = $('#show-' + prefix + ' span');\nhidden.on('hide.bs.collapse', function (e) {\nshow.on('click', function (e) {\ne.preventDefault();\n});\n+\n+ // If the URI fragment (hash) matches the expander ID, automatically expand the section.\n+ if (document.location.hash === showId) {\n+ hidden.collapse('show');\n+ }\n};\nnuget.configureExpanderHeading = function (prefix) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-manage-packages.js",
"diff": "this.CanCancel = ownerRequestItem.CanCancel;\nthis.ConfirmUrl = ownerRequestItem.ConfirmUrl;\nthis.RejectUrl = ownerRequestItem.RejectUrl;\n- this.CancelUrl = ownerRequestItem.CancelUrl;\n+ this.ManagePackageOwnershipUrl = ownerRequestItem.ManagePackageOwnershipUrl;\nthis.ShowReceived = showReceived;\nthis.ShowSent = showSent;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -21,6 +21,11 @@ public static class UrlHelperExtensions\nprivate static IGalleryConfigurationService _configuration;\nprivate const string PackageExplorerDeepLink = @\"https://npe.codeplex.com/releases/clickonce/NuGetPackageExplorer.application?url={0}&id={1}&version={2}\";\n+ public static class Fragments\n+ {\n+ public const string ManagePackageOwnership = \"#show-Owners-container\";\n+ }\n+\n// Shorthand for current url\npublic static string Current(this UrlHelper url)\n{\n@@ -726,6 +731,40 @@ public static string GetOrganizationCertificates(this UrlHelper url, string acco\nreturn url.PackageVersionActionTemplate(nameof(PackagesController.Manage), relativeUrl);\n}\n+ public static string ManagePackageOwnership(\n+ this UrlHelper url,\n+ string id,\n+ bool relativeUrl = true)\n+ {\n+ return GetRouteLink(\n+ url,\n+ RouteName.PackageAction,\n+ relativeUrl,\n+ routeValues: new RouteValueDictionary\n+ {\n+ { \"action\", nameof(PackagesController.Manage) },\n+ { \"id\", id }\n+ }) + Fragments.ManagePackageOwnership;\n+ }\n+\n+ public static RouteUrlTemplate<OwnerRequestsListItemViewModel> ManagePackageOwnershipTemplate(\n+ this UrlHelper url, bool relativeUrl = true)\n+ {\n+ var routesGenerator = new Dictionary<string, Func<OwnerRequestsListItemViewModel, object>>\n+ {\n+ { \"id\", r => r.Package.Id },\n+ };\n+\n+ Func<RouteValueDictionary, string> linkGenerator = rv => GetActionLink(\n+ url,\n+ nameof(PackagesController.Manage),\n+ \"Packages\",\n+ relativeUrl,\n+ routeValues: rv) + Fragments.ManagePackageOwnership;\n+\n+ return new RouteUrlTemplate<OwnerRequestsListItemViewModel>(linkGenerator, routesGenerator);\n+ }\n+\npublic static string ManagePackage(\nthis UrlHelper url,\nIPackageVersionModel package,\n@@ -1136,43 +1175,6 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\nreturn GetActionLink(url, routeName, \"Packages\", relativeUrl, routeValues);\n}\n- public static RouteUrlTemplate<OwnerRequestsListItemViewModel> CancelPendingOwnershipRequestTemplate(\n- this UrlHelper url, bool relativeUrl = true)\n- {\n- var routesGenerator = new Dictionary<string, Func<OwnerRequestsListItemViewModel, object>>\n- {\n- { \"id\", r => r.Package.Id },\n- { \"requestingUsername\", r => r.Request.RequestingOwner.Username },\n- { \"pendingUsername\", r => r.Request.NewOwner.Username }\n- };\n-\n- Func<RouteValueDictionary, string> linkGenerator = rv => GetActionLink(\n- url,\n- \"CancelPendingOwnershipRequest\",\n- \"Packages\",\n- relativeUrl,\n- routeValues: rv);\n-\n- return new RouteUrlTemplate<OwnerRequestsListItemViewModel>(linkGenerator, routesGenerator);\n- }\n-\n- public static string CancelPendingOwnershipRequest(\n- this UrlHelper url,\n- string packageId,\n- string requestingUsername,\n- string pendingUsername,\n- bool relativeUrl = true)\n- {\n- var routeValues = new RouteValueDictionary\n- {\n- [\"id\"] = packageId,\n- [\"requestingUsername\"] = requestingUsername,\n- [\"pendingUsername\"] = pendingUsername\n- };\n-\n- return GetActionLink(url, \"CancelPendingOwnershipRequest\", \"Packages\", relativeUrl, routeValues);\n- }\n-\npublic static string ConfirmEmail(\nthis UrlHelper url,\nstring username,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "</a>\n<!-- /ko -->\n<!-- ko if: !CanAccept && CanCancel -->\n- <a class=\"btn\" title=\"Cancel Ownership\" data-bind=\"attr: { href: CancelUrl, 'aria-label': 'Cancel Ownership of ' + Id }\">\n- <i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n+ <a class=\"btn\" title=\"Manage Ownership\" data-bind=\"attr: { href: ManagePackageOwnershipUrl, 'aria-label': 'Manage Ownership of ' + Id }\">\n+ <i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i>\n</a>\n<!-- /ko -->\n</td>\nprivate RouteUrlTemplate<OwnerRequestsListItemViewModel> confirmUrlTemplate;\nprivate RouteUrlTemplate<OwnerRequestsListItemViewModel> rejectUrlTemplate;\n- private RouteUrlTemplate<OwnerRequestsListItemViewModel> cancelUrlTemplate;\n+ private RouteUrlTemplate<OwnerRequestsListItemViewModel> manageOwnershipUrlTemplate;\ndynamic GetSerializablePackage(ListPackageItemRequiredSignerViewModel p)\n{\nrejectUrlTemplate = Url.RejectPendingOwnershipRequestTemplate();\n}\n- if (cancelUrlTemplate == null)\n+ if (manageOwnershipUrlTemplate == null)\n{\n- cancelUrlTemplate = Url.CancelPendingOwnershipRequestTemplate();\n+ manageOwnershipUrlTemplate = Url.ManagePackageOwnershipTemplate();\n}\nreturn new\nCanCancel = r.CanCancel,\nConfirmUrl = confirmUrlTemplate.Resolve(r),\nRejectUrl = rejectUrlTemplate.Resolve(r),\n- CancelUrl = cancelUrlTemplate.Resolve(r)\n+ ManagePackageOwnershipUrl = manageOwnershipUrlTemplate.Resolve(r)\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -2049,14 +2049,14 @@ public static IEnumerable<object[]> Owner_Data\n}\n[Fact]\n- public async Task WithNonExistentPackageIdReturnsHttpNotFound()\n+ public void WithNonExistentPackageIdReturnsHttpNotFound()\n{\n// Arrange\nvar controller = CreateController(GetConfigurationService());\ncontroller.SetCurrentUser(new User { Username = \"userA\" });\n// Act\n- var result = await controller.CancelPendingOwnershipRequest(\"foo\", \"userA\", \"userB\");\n+ var result = controller.CancelPendingOwnershipRequest(\"foo\", \"userA\", \"userB\");\n// Assert\nAssert.IsType<HttpNotFoundResult>(result);\n@@ -2064,7 +2064,7 @@ public async Task WithNonExistentPackageIdReturnsHttpNotFound()\n[Theory]\n[MemberData(nameof(NotOwner_Data))]\n- public async Task WithNonOwningCurrentUserReturnsNotYourRequest(User currentUser, User owner)\n+ public void WithNonOwningCurrentUserReturnsNotYourRequest(User currentUser, User owner)\n{\n// Arrange\nvar package = new PackageRegistration { Id = \"foo\", Owners = new[] { owner } };\n@@ -2076,7 +2076,7 @@ public async Task WithNonOwningCurrentUserReturnsNotYourRequest(User currentUser\ncontroller.SetCurrentUser(currentUser);\n// Act\n- var result = await controller.CancelPendingOwnershipRequest(\"foo\", \"userA\", \"userB\");\n+ var result = controller.CancelPendingOwnershipRequest(\"foo\", \"userA\", \"userB\");\n// Assert\nvar model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, \"ConfirmOwner\");\n@@ -2086,7 +2086,7 @@ public async Task WithNonOwningCurrentUserReturnsNotYourRequest(User currentUser\n[Theory]\n[MemberData(nameof(Owner_Data))]\n- public async Task WithNonExistentPendingUserReturnsHttpNotFound(User currentUser, User owner)\n+ public void WithNonExistentPendingUserReturnsHttpNotFound(User currentUser, User owner)\n{\n// Arrange\nvar package = new PackageRegistration { Id = \"foo\", Owners = new[] { owner } };\n@@ -2098,7 +2098,7 @@ public async Task WithNonExistentPendingUserReturnsHttpNotFound(User currentUser\ncontroller.SetCurrentUser(currentUser);\n// Act\n- var result = await controller.CancelPendingOwnershipRequest(\"foo\", \"userA\", \"userB\");\n+ var result = controller.CancelPendingOwnershipRequest(\"foo\", \"userA\", \"userB\");\n// Assert\nAssert.IsType<HttpNotFoundResult>(result);\n@@ -2106,7 +2106,7 @@ public async Task WithNonExistentPendingUserReturnsHttpNotFound(User currentUser\n[Theory]\n[MemberData(nameof(Owner_Data))]\n- public async Task WithNonExistentPackageOwnershipRequestReturnsHttpNotFound(User currentUser, User owner)\n+ public void WithNonExistentPackageOwnershipRequestReturnsHttpNotFound(User currentUser, User owner)\n{\n// Arrange\nvar packageId = \"foo\";\n@@ -2132,7 +2132,7 @@ public async Task WithNonExistentPackageOwnershipRequestReturnsHttpNotFound(User\ncontroller.SetCurrentUser(owner);\n// Act\n- var result = await controller.CancelPendingOwnershipRequest(packageId, userAName, userBName);\n+ var result = controller.CancelPendingOwnershipRequest(packageId, userAName, userBName);\n// Assert\nAssert.IsType<HttpNotFoundResult>(result);\n@@ -2140,7 +2140,7 @@ public async Task WithNonExistentPackageOwnershipRequestReturnsHttpNotFound(User\n[Theory]\n[MemberData(nameof(Owner_Data))]\n- public async Task ReturnsCancelledIfPackageOwnershipRequestExists(User currentUser, User owner)\n+ public void ReturnsRedirectIfPackageOwnershipRequestExists(User currentUser, User owner)\n{\n// Arrange\nvar userAName = \"userA\";\n@@ -2175,25 +2175,24 @@ public async Task ReturnsCancelledIfPackageOwnershipRequestExists(User currentUs\ncontroller.SetCurrentUser(currentUser);\n// Act\n- var result = await controller.CancelPendingOwnershipRequest(packageId, userAName, userBName);\n+ var result = controller.CancelPendingOwnershipRequest(packageId, userAName, userBName);\n// Assert\n- var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, \"ConfirmOwner\");\n- var expectedResult = ConfirmOwnershipResult.Cancelled;\n- Assert.Equal(expectedResult, model.Result);\n- Assert.Equal(packageId, model.PackageId);\n- packageService.Verify();\n- packageOwnershipManagementRequestService.Verify();\n+ var model = ResultAssert.IsRedirectTo(result, \"/packages/foo/Manage#show-Owners-container\");\n- messageService\n- .Verify(x => x.SendMessageAsync(\n- It.Is<PackageOwnershipRequestCanceledMessage>(\n- msg =>\n- msg.RequestingOwner == userA\n- && msg.NewOwner == userB\n- && msg.PackageRegistration == package),\n- false,\n- false));\n+ packageOwnershipManagementRequestService.Verify(\n+ x => x.DeletePackageOwnershipRequestAsync(\n+ It.IsAny<PackageRegistration>(),\n+ It.IsAny<User>(),\n+ It.IsAny<bool>()),\n+ Times.Never);\n+\n+ messageService.Verify(\n+ x => x.SendMessageAsync(\n+ It.IsAny<PackageOwnershipRequestCanceledMessage>(),\n+ It.IsAny<bool>(),\n+ It.IsAny<bool>()),\n+ Times.Never);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/MarkdownMessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/MarkdownMessageServiceFacts.cs",
"diff": "@@ -1846,7 +1846,6 @@ public async Task WillSendEmailIfEmailAllowed(bool isAdmin)\nvar organization = GetOrganizationWithRecipients();\nvar requestingUser = new User(\"optimusprime\") { EmailAddress = \"[email protected]\" };\nvar pendingUser = new User(\"shia_labeouf\") { EmailAddress = \"[email protected]\" };\n- var cancelUrl = \"www.cancel.com\";\nvar configurationService = GetConfigurationService();\nvar messageService = TestableMarkdownMessageService.Create(configurationService);\n@@ -1855,8 +1854,7 @@ public async Task WillSendEmailIfEmailAllowed(bool isAdmin)\norganization,\nrequestingUser,\npendingUser,\n- isAdmin,\n- cancelUrl);\n+ isAdmin);\n// Act\nawait messageService.SendMessageAsync(emailMessage);\n@@ -1881,7 +1879,6 @@ public async Task WillNotSendEmailIfEmailNotAllowed(bool isAdmin)\nvar organization = GetOrganizationWithoutRecipients();\nvar requestingUser = new User(\"optimusprime\") { EmailAddress = \"[email protected]\" };\nvar pendingUser = new User(\"shia_labeouf\") { EmailAddress = \"[email protected]\" };\n- var cancelUrl = \"www.cancel.com\";\nvar configurationService = GetConfigurationService();\nvar messageService = TestableMarkdownMessageService.Create(configurationService);\n@@ -1890,8 +1887,7 @@ public async Task WillNotSendEmailIfEmailNotAllowed(bool isAdmin)\norganization,\nrequestingUser,\npendingUser,\n- isAdmin,\n- cancelUrl);\n+ isAdmin);\n// Act\nawait messageService.SendMessageAsync(emailMessage);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/Messages/OrganizationMembershipRequestInitiatedMessageFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Mail/Messages/OrganizationMembershipRequestInitiatedMessageFacts.cs",
"diff": "@@ -18,11 +18,10 @@ public static IEnumerable<object[]> ConstructorArguments\n{\nget\n{\n- yield return new object[] { null, Fakes.RequestingOrganization, Fakes.RequestingUser, Fakes.RequestingUser, It.IsAny<bool>(), Fakes.CancellationUrl };\n- yield return new object[] { Configuration, null, Fakes.RequestingUser, Fakes.RequestingUser, It.IsAny<bool>(), Fakes.CancellationUrl };\n- yield return new object[] { Configuration, Fakes.RequestingOrganization, null, Fakes.RequestingUser, It.IsAny<bool>(), Fakes.CancellationUrl };\n- yield return new object[] { Configuration, Fakes.RequestingOrganization, Fakes.RequestingUser, null, It.IsAny<bool>(), Fakes.CancellationUrl };\n- yield return new object[] { Configuration, Fakes.RequestingOrganization, Fakes.RequestingUser, null, It.IsAny<bool>(), null };\n+ yield return new object[] { null, Fakes.RequestingOrganization, Fakes.RequestingUser, Fakes.RequestingUser, It.IsAny<bool>() };\n+ yield return new object[] { Configuration, null, Fakes.RequestingUser, Fakes.RequestingUser, It.IsAny<bool>() };\n+ yield return new object[] { Configuration, Fakes.RequestingOrganization, null, Fakes.RequestingUser, It.IsAny<bool>() };\n+ yield return new object[] { Configuration, Fakes.RequestingOrganization, Fakes.RequestingUser, null, It.IsAny<bool>() };\n}\n}\n@@ -33,16 +32,14 @@ public static IEnumerable<object[]> ConstructorArguments\nOrganization organization,\nUser requestingUser,\nUser pendingUser,\n- bool isAdmin,\n- string cancellationUrl)\n+ bool isAdmin)\n{\nAssert.Throws<ArgumentNullException>(() => new OrganizationMembershipRequestInitiatedMessage(\nconfiguration,\norganization,\nrequestingUser,\npendingUser,\n- isAdmin,\n- cancellationUrl));\n+ isAdmin));\n}\n}\n@@ -162,8 +159,7 @@ public void SetsGalleryNoReplyAddressAsSender()\norganization,\nFakes.RequestingUser,\npendingUser,\n- isAdmin,\n- Fakes.CancellationUrl);\n+ isAdmin);\n}\nprivate const string _expectedMessageBodyForAdmin =\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make the cancel ownershipt request endpoint just redirect to Manage (#7498)
Progress on https://github.com/NuGet/Engineering/issues/2679 |
455,736 | 04.09.2019 16:34:50 | 25,200 | efa17f687b7ea7a1360105e800cc9832d6e65459 | Order by created ascending by default in FindPackagesById()
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/GallerySearchClient.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/GallerySearchClient.cs",
"diff": "@@ -37,7 +37,9 @@ public async Task<ServiceResponse<JObject>> GetDiagnostics()\n{SearchModels.SortOrder.Relevance, \"relevance\"},\n{SearchModels.SortOrder.Published, \"published\"},\n{SearchModels.SortOrder.TitleAscending, \"title-asc\"},\n- {SearchModels.SortOrder.TitleDescending, \"title-desc\"}\n+ {SearchModels.SortOrder.TitleDescending, \"title-desc\"},\n+ {SearchModels.SortOrder.CreatedAscending, \"created-asc\"},\n+ {SearchModels.SortOrder.CreatedDescending, \"created-desc\"},\n};\n// This code is copied from the SearchClient\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/Models/SortOrder.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/Models/SortOrder.cs",
"diff": "@@ -8,6 +8,8 @@ public enum SortOrder\nLastEdited,\nPublished,\nTitleAscending,\n- TitleDescending\n+ TitleDescending,\n+ CreatedAscending,\n+ CreatedDescending,\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/SearchService/SearchAdaptor.cs",
"new_path": "src/NuGetGallery/OData/SearchService/SearchAdaptor.cs",
"diff": "@@ -100,7 +100,12 @@ private static IQueryable<Package> FormatResults(SearchFilter searchFilter, Sear\n// We can only use Lucene if:\n// a) The Index contains all versions of each package\n// b) The sort order is something Lucene can handle\n- if (TryReadSearchFilter(searchService.ContainsAllVersions, request.RawUrl, searchService.ContainsAllVersions, out searchFilter) && !string.IsNullOrWhiteSpace(id))\n+ if (TryReadSearchFilter(\n+ searchService.ContainsAllVersions,\n+ request.RawUrl,\n+ searchService.ContainsAllVersions,\n+ SortOrder.CreatedAscending,\n+ out searchFilter) && !string.IsNullOrWhiteSpace(id))\n{\nvar normalizedRegistrationId = id.Normalize(NormalizationForm.FormC);\n@@ -142,7 +147,12 @@ private static IQueryable<Package> FormatResults(SearchFilter searchFilter, Sear\n// We can only use Lucene if:\n// a) We are looking for the latest version of a package OR the Index contains all versions of each package\n// b) The sort order is something Lucene can handle\n- if (TryReadSearchFilter(searchService.ContainsAllVersions, request.RawUrl, false, out searchFilter))\n+ if (TryReadSearchFilter(\n+ searchService.ContainsAllVersions,\n+ request.RawUrl,\n+ ignoreLatestVersionFilter: false,\n+ defaultSortOrder: SortOrder.Relevance,\n+ searchFilter: out searchFilter))\n{\nsearchFilter.SearchTerm = searchTerm;\nsearchFilter.IncludePrerelease = includePrerelease;\n@@ -167,7 +177,12 @@ private static IQueryable<Package> FormatResults(SearchFilter searchFilter, Sear\nreturn new SearchAdaptorResult(false, packages.Search(searchTerm));\n}\n- private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, bool ignoreLatestVersionFilter, out SearchFilter searchFilter)\n+ private static bool TryReadSearchFilter(\n+ bool allVersionsInIndex,\n+ string url,\n+ bool ignoreLatestVersionFilter,\n+ SortOrder defaultSortOrder,\n+ out SearchFilter searchFilter)\n{\nif (url == null)\n{\n@@ -251,7 +266,7 @@ private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, boo\n{\nif (string.IsNullOrEmpty(orderBy))\n{\n- searchFilter.SortOrder = SortOrder.Relevance;\n+ searchFilter.SortOrder = defaultSortOrder;\n}\nelse if (orderBy.StartsWith(\"DownloadCount\", StringComparison.Ordinal))\n{\n@@ -278,6 +293,15 @@ private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, boo\nsearchFilter.SortOrder = SortOrder.TitleDescending;\n}\n}\n+ else if (orderBy.StartsWith(\"Created\", StringComparison.Ordinal))\n+ {\n+ searchFilter.SortOrder = SortOrder.CreatedAscending;\n+\n+ if (orderBy.Contains(\"%20desc\"))\n+ {\n+ searchFilter.SortOrder = SortOrder.CreatedDescending;\n+ }\n+ }\nelse\n{\nsearchFilter = null;\n@@ -286,7 +310,7 @@ private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, boo\n}\nelse\n{\n- searchFilter.SortOrder = SortOrder.Relevance;\n+ searchFilter.SortOrder = defaultSortOrder;\n}\nreturn true;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/GallerySearchServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/Lucene/GallerySearchServiceFacts.cs",
"diff": "using NuGetGallery.Infrastructure.Search.Models;\nusing Newtonsoft.Json.Linq;\nusing Xunit;\n+using System.Linq;\n+using System.Web;\nnamespace NuGetGallery.Infrastructure.Search\n{\n@@ -43,6 +45,24 @@ public async Task GetDiagnosticsUsesTheCorrectPath()\nAssert.Null(queryString);\n}\n+ [Theory]\n+ [MemberData(nameof(AllSortOrders))]\n+ public async Task MapsAllSortOrders(SortOrder sortOrder)\n+ {\n+ // Arrange\n+ var gallerySearchClient = new GallerySearchClient(ResilientClientForTest.GetTestInstance(HttpStatusCode.OK));\n+\n+ // Act\n+ var response = await gallerySearchClient.Search(query: string.Empty, sortBy: sortOrder);\n+\n+ // Assert\n+ var httpResponseContentAsString = await response.HttpResponse.Content.ReadAsStringAsync();\n+ var queryString = JObject.Parse(httpResponseContentAsString)[\"queryString\"].Value<string>();\n+ var parsedQueryString = HttpUtility.ParseQueryString(queryString);\n+ Assert.Contains(sortOrder, SortNames.Keys);\n+ Assert.Equal(SortNames[sortOrder], parsedQueryString[\"sortBy\"]);\n+ }\n+\n[Theory]\n[InlineData(null, null, false, SortOrder.Relevance, 1, 10, false, false, false, false, null, null, \"q=&skip=1&take=10&sortBy=relevance&luceneQuery=false\")]\n[InlineData(\"query\", \"projectTypeFilter\", true, SortOrder.LastEdited, 1, 10, true, true, true, true, \"supportedFramework\", \"semVerLevel\", \"q=query&skip=1&take=10&sortBy=lastEdited&semVerLevel=semVerLevel&supportedFramework=supportedFramework&projectType=projectTypeFilter&prerelease=true&explanation=true&ignoreFilter=true&countOnly=true\")]\n@@ -93,13 +113,20 @@ public async Task GetDiagnosticsUsesTheCorrectPath()\nAssert.Equal(expectedResult, queryString);\n}\n+ public static IEnumerable<object[]> AllSortOrders => Enum\n+ .GetValues(typeof(SortOrder))\n+ .Cast<SortOrder>()\n+ .Select(so => new object[] { so });\n+\nprivate static readonly Dictionary<SortOrder, string> SortNames = new Dictionary<SortOrder, string>\n{\n{SortOrder.LastEdited, \"lastEdited\"},\n{SortOrder.Relevance, \"relevance\"},\n{SortOrder.Published, \"published\"},\n{SortOrder.TitleAscending, \"title-asc\"},\n- {SortOrder.TitleDescending, \"title-desc\"}\n+ {SortOrder.TitleDescending, \"title-desc\"},\n+ {SortOrder.CreatedAscending, \"created-asc\"},\n+ {SortOrder.CreatedDescending, \"created-desc\"},\n};\npublic class ResilientClientForTest : IResilientSearchClient\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/SearchAdaptorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/SearchAdaptorFacts.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Generic;\n+using System.Linq;\nusing System.Net.Http;\n+using System.Threading.Tasks;\n+using System.Web;\nusing System.Web.Http.OData;\nusing System.Web.Http.OData.Query;\n+using Moq;\n+using NuGet.Services.Entities;\n+using NuGetGallery.Infrastructure.Search.Models;\nusing NuGetGallery.OData;\nusing NuGetGallery.WebApi;\nusing Xunit;\n@@ -28,6 +35,171 @@ protected static ODataQuerySettings GetODataQuerySettingsForTest()\n};\n}\n+ public class TheSearchCoreMethod : Facts\n+ {\n+ public TheSearchCoreMethod()\n+ {\n+ RawUrl = \"http://example/api/v2/Search()?q=%27json%27&\";\n+ SearchTerm = \"json\";\n+ TargetFramework = string.Empty;\n+ IncludePrerelease = true;\n+ }\n+\n+ public string SearchTerm { get; }\n+ public string TargetFramework { get; }\n+ public bool IncludePrerelease { get; }\n+\n+ [Theory]\n+ [MemberData(nameof(DefaultOrderByData))]\n+ public async Task DefaultsToOrderByRelevance(string queryString)\n+ {\n+ await TestOrderBy(queryString, SortOrder.Relevance);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(OrderByData))]\n+ public async Task ProperlyParsesOrderBy(string queryString, SortOrder? expected)\n+ {\n+ await TestOrderBy(queryString, expected);\n+ }\n+\n+ private async Task TestOrderBy(string queryString, SortOrder? expected)\n+ {\n+ RawUrl += \"&\" + queryString;\n+\n+ var result = await SearchAdaptor.SearchCore(\n+ SearchService.Object,\n+ Request.Object,\n+ Packages,\n+ SearchTerm,\n+ TargetFramework,\n+ IncludePrerelease,\n+ SemVerLevel);\n+\n+ VerifySortOrder(expected);\n+ }\n+ }\n+\n+ public class TheFindByIdAndVersionCoreMethod : Facts\n+ {\n+ public TheFindByIdAndVersionCoreMethod()\n+ {\n+ RawUrl = \"http://example/api/v2/FindPackagesById()?id=%27NuGet.Versioning%27\";\n+ Id = \"NuGet.Versioning\";\n+ Version = null;\n+ }\n+\n+ public string Id { get; }\n+ public string Version { get; set; }\n+\n+ [Theory]\n+ [MemberData(nameof(DefaultOrderByData))]\n+ public async Task DefaultsToOrderByRelevance(string queryString)\n+ {\n+ await TestOrderBy(queryString, SortOrder.CreatedAscending);\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(OrderByData))]\n+ public async Task ProperlyParsesOrderBy(string queryString, SortOrder? expected)\n+ {\n+ await TestOrderBy(queryString, expected);\n+ }\n+\n+ private async Task TestOrderBy(string queryString, SortOrder? expected)\n+ {\n+ RawUrl += \"&\" + queryString;\n+\n+ var result = await SearchAdaptor.FindByIdAndVersionCore(\n+ SearchService.Object,\n+ Request.Object,\n+ Packages,\n+ Id,\n+ Version,\n+ SemVerLevel);\n+\n+ VerifySortOrder(expected);\n+ }\n+ }\n+\n+ public abstract class Facts\n+ {\n+ public Facts()\n+ {\n+ SearchService = new Mock<ISearchService>();\n+ Request = new Mock<HttpRequestBase>();\n+ Packages = new List<Package>().AsQueryable();\n+\n+ RawUrl = \"http://example/api/v2/Packages()\";\n+ SemVerLevel = SemVerLevelKey.SemVerLevel2;\n+ SearchResults = new SearchResults(0, indexTimestampUtc: null);\n+\n+ Request\n+ .Setup(x => x.RawUrl)\n+ .Returns(() => RawUrl);\n+ SearchService\n+ .Setup(x => x.ContainsAllVersions)\n+ .Returns(true);\n+ SearchService\n+ .Setup(x => x.Search(It.IsAny<SearchFilter>()))\n+ .ReturnsAsync(() => SearchResults)\n+ .Callback<SearchFilter>(sf => LastSearchFilter = sf);\n+ }\n+\n+ public Mock<ISearchService> SearchService { get; }\n+ public Mock<HttpRequestBase> Request { get; }\n+ public IQueryable<Package> Packages { get; }\n+ public string RawUrl { get; set; }\n+ public string SemVerLevel { get; }\n+ public SearchResults SearchResults { get; }\n+ public SearchFilter LastSearchFilter { get; set; }\n+\n+ public static IEnumerable<object[]> DefaultOrderByData => new[]\n+ {\n+ new object[] { \"\" },\n+ new object[] { \"$orderby\" },\n+ new object[] { \"$orderby=\" },\n+ };\n+\n+ public static IEnumerable<object[]> OrderByData => new[]\n+ {\n+ new object[] { \"$orderby=Created\", SortOrder.CreatedAscending },\n+ new object[] { \"$orderby=Published&$orderby=Created\", SortOrder.CreatedAscending }, // Last one wins\n+ new object[] { \"$orderby=Created%20asc\", SortOrder.CreatedAscending },\n+ new object[] { \"$orderby=Created%20ASC\", SortOrder.CreatedAscending },\n+ new object[] { \"$orderby=Created%20foo\", SortOrder.CreatedAscending },\n+ new object[] { \"$orderby=CreatedFOO\", SortOrder.CreatedAscending }, // Probably shouldn't work, but it does today\n+ new object[] { \"$orderby=Created%20DESC\", SortOrder.CreatedAscending },\n+ new object[] { \"$orderby=Created%20desc\", SortOrder.CreatedDescending },\n+ new object[] { \"$orderby=Created%20asc%20desc\", SortOrder.CreatedDescending }, // Probably shouldn't work, but it does today\n+ new object[] { \"$orderby=DownloadCount\", SortOrder.Relevance },\n+ new object[] { \"$orderby=Published\", SortOrder.Published },\n+ new object[] { \"$orderby=LastEdited\", SortOrder.LastEdited },\n+ new object[] { \"$orderby=Id\", SortOrder.TitleAscending },\n+ new object[] { \"$orderby=Id%20desc\", SortOrder.TitleAscending }, // Probably should be TitleDescending, but it doesn't do this today\n+ new object[] { \"$orderby=concat\", SortOrder.TitleAscending },\n+ new object[] { \"$orderby=concat%20desc\", SortOrder.TitleDescending },\n+ new object[] { \"$orderby=Dependencies\", null },\n+ new object[] { \"$orderby=created\", null },\n+ };\n+\n+ public void VerifySortOrder(SortOrder? expected)\n+ {\n+ if (expected == null)\n+ {\n+ // The hijack to search service was not possible given the parameters.\n+ Assert.Null(LastSearchFilter);\n+ SearchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Never);\n+ }\n+ else\n+ {\n+ Assert.NotNull(LastSearchFilter);\n+ Assert.Equal(expected, LastSearchFilter.SortOrder);\n+ SearchService.Verify(x => x.Search(It.IsAny<SearchFilter>()), Times.Once);\n+ }\n+ }\n+ }\n+\npublic class TheGetNextLinkMethod\n{\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Order by created ascending by default in FindPackagesById() (#7505)
Progress on https://github.com/NuGet/NuGetGallery/issues/5432 |
455,736 | 06.09.2019 15:20:16 | 25,200 | a215d79035b7b5c68271426030739c506617cb21 | Make the readme show more link not jump to the top of the page
This is an improvement upon which did not work as expected. | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"new_path": "src/NuGetGallery/Scripts/gallery/page-display-package.js",
"diff": "@@ -41,8 +41,9 @@ $(function () {\nvar showLess = $(\"#readme-less\");\n$clamp(showLess[0], { clamp: 10, useNativeClamp: false });\n- $(\"#show-readme-more\").click(function () {\n+ $(\"#show-readme-more\").click(function (e) {\nshowLess.collapse(\"toggle\");\n+ e.preventDefault();\n});\nshowLess.on('hide.bs.collapse', function (e) {\ne.stopPropagation();\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make the readme show more link not jump to the top of the page (#7519)
This is an improvement upon https://github.com/NuGet/NuGetGallery/pull/7420 which did not work as expected. |
455,747 | 06.09.2019 16:44:30 | 25,200 | 66ef41cf20e8ebe6ab7792e58419701b629c2b69 | Add site admin check for tenant | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/Configuration/GalleryConfiguration.cs",
"new_path": "src/AccountDeleter/Configuration/GalleryConfiguration.cs",
"diff": "@@ -63,6 +63,7 @@ public string SiteRoot\npublic bool CollectPerfLogs { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic bool AutoUpdateSearchIndex { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string EnforcedAuthProviderForAdmin { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n+ public string EnforcedTenantIdForAdmin { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string UserPasswordRegex { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic string UserPasswordHint { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\npublic int ExpirationInDaysForApiKeyV1 { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/AppConfiguration.cs",
"new_path": "src/NuGetGallery.Services/Configuration/AppConfiguration.cs",
"diff": "@@ -231,6 +231,13 @@ public class AppConfiguration : IAppConfiguration\n/// </summary>\npublic string EnforcedAuthProviderForAdmin { get; set; }\n+ /// <summary>\n+ /// Gets a string indicating which AAD Tenant Id should be used for administrators.\n+ /// When specified, the gallery will ensure admin users are logging in using only the specified tenant ID.\n+ /// Blank means any AAD tenant ID can be used by administrators.\n+ /// </summary>\n+ public string EnforcedTenantIdForAdmin { get; set; }\n+\n/// <summary>\n/// A regex to validate password format. The default regex requires the password to be atlease 8 characters,\n/// include at least one uppercase letter, one lowercase letter and a digit.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Configuration/IAppConfiguration.cs",
"new_path": "src/NuGetGallery.Services/Configuration/IAppConfiguration.cs",
"diff": "@@ -242,6 +242,13 @@ public interface IAppConfiguration : IMessageServiceConfiguration\n/// </summary>\nstring EnforcedAuthProviderForAdmin { get; set; }\n+ /// <summary>\n+ /// Gets a string indicating which AAD Tenant Id should be used for administrators.\n+ /// When specified, the gallery will ensure admin users are logging in using only the specified tenant ID.\n+ /// Blank means any AAD tenant ID can be used by administrators.\n+ /// </summary>\n+ string EnforcedTenantIdForAdmin { get; set; }\n+\n/// <summary>\n/// The required format for a user password.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"new_path": "src/NuGetGallery/Controllers/AuthenticationController.cs",
"diff": "@@ -193,6 +193,14 @@ public virtual async Task<ActionResult> SignIn(LogOnViewModel model, string retu\nreturn challenge;\n}\n+ // If we are an administrator and Gallery.EnforcedTenantIdForAdmin is set\n+ // to require a specific tenant Id, check if the user logged in with the specified tenant.\n+ if (!SiteAdminHasValidTenant(authenticatedUser))\n+ {\n+ var errorMessage = string.Format(CultureInfo.CurrentCulture, Strings.SiteAdminNotLoggedInWithRequiredTenant, NuGetContext.Config.Current.EnforcedTenantIdForAdmin);\n+ return SignInFailure(model, linkingAccount, errorMessage);\n+ }\n+\n// Create session\nawait _authService.CreateSessionAsync(OwinContext, authenticatedUser, usedMultiFactorAuthentication);\n@@ -232,6 +240,17 @@ internal bool ShouldChallengeEnforcedProvider(string enforcedProviders, Authenti\nreturn false;\n}\n+ internal bool SiteAdminHasValidTenant(AuthenticatedUser authenticatedUser)\n+ {\n+ if (!string.IsNullOrEmpty(NuGetContext.Config.Current.EnforcedTenantIdForAdmin)\n+ && authenticatedUser.User.IsAdministrator)\n+ {\n+ return string.Equals(NuGetContext.Config.Current.EnforcedTenantIdForAdmin, authenticatedUser.CredentialUsed.TenantId, StringComparison.OrdinalIgnoreCase);\n+ }\n+\n+ return true;\n+ }\n+\n[HttpGet]\npublic virtual ActionResult RegisterLegacy(string returnUrl)\n{\n@@ -319,6 +338,14 @@ public virtual async Task<ActionResult> Register(LogOnViewModel model, string re\nreturn challenge;\n}\n+ // If we are an administrator and Gallery.EnforcedTenantIdForAdmin is set\n+ // to require a specific tenant Id, check if the user logged in with the specified tenant.\n+ if (!SiteAdminHasValidTenant(user))\n+ {\n+ ModelState.AddModelError(\"Register\", string.Format(Strings.SiteAdminNotLoggedInWithRequiredTenant, NuGetContext.Config.Current.EnforcedTenantIdForAdmin));\n+ return RegisterOrExternalLinkView(model, linkingAccount);\n+ }\n+\n// Create session\nawait _authService.CreateSessionAsync(OwinContext, user, usedMultiFactorAuthentication);\nreturn RedirectFromRegister(returnUrl);\n@@ -530,6 +557,14 @@ public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl, st\nreturn challenge;\n}\n+ // If we are an administrator and Gallery.EnforcedTenantIdForAdmin is set\n+ // to require a specific tenant Id, check if the user logged in with the specified tenant.\n+ if (!SiteAdminHasValidTenant(result.Authentication))\n+ {\n+ string errorMessage = string.Format(Strings.SiteAdminNotLoggedInWithRequiredTenant, NuGetContext.Config.Current.EnforcedTenantIdForAdmin);\n+ return AuthenticationFailureOrExternalLinkExpired(errorMessage);\n+ }\n+\nif (ShouldEnforceMultiFactorAuthentication(result))\n{\n// Invoke the authentication again enforcing multi-factor authentication for the same provider.\n@@ -764,7 +799,7 @@ private ActionResult AuthenticationFailureOrExternalLinkExpired(string errorMess\n{\n// User got here without an external login cookie (or an expired one)\n// Send them to the logon action with a message\n- TempData[\"Message\"] = string.IsNullOrEmpty(errorMessage) ? Strings.ExternalAccountLinkExpired : errorMessage;\n+ TempData[\"ErrorMessage\"] = string.IsNullOrEmpty(errorMessage) ? Strings.ExternalAccountLinkExpired : errorMessage;\nreturn Redirect(Url.LogOn(null, relativeUrl: false));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -1967,6 +1967,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The site admins are required to sign in with the '{0}' tenant only..\n+ /// </summary>\n+ public static string SiteAdminNotLoggedInWithRequiredTenant {\n+ get {\n+ return ResourceManager.GetString(\"SiteAdminNotLoggedInWithRequiredTenant\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The requested resource can only be accessed via SSL..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -1147,4 +1147,7 @@ The {1} Team</value>\n<data name=\"AccountDelete_SelfServiceSuccess\" xml:space=\"preserve\">\n<value>Your account is being deleted. You have been logged out.</value>\n</data>\n+ <data name=\"SiteAdminNotLoggedInWithRequiredTenant\" xml:space=\"preserve\">\n+ <value>The site admins are required to sign in with the '{0}' tenant only.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"Auth.AzureActiveDirectory.ClientId\" value=\"\"/>\n<add key=\"Auth.AzureActiveDirectory.Authority\" value=\"\"/>\n<add key=\"Auth.AzureActiveDirectory.Issuer\" value=\"\"/>\n- <add key=\"Auth.AzureActiveDirectory.ShowOnLoginPage\" value=\"true\"/>\n+ <add key=\"Auth.AzureActiveDirectory.ShowOnLoginPage\" value=\"false\"/>\n<add key=\"Gallery.EnforcedAuthProviderForAdmin\" value=\"\"/>\n+ <add key=\"Gallery.EnforcedTenantIdForAdmin\" value=\"\"/>\n<add key=\"Gallery.ExpirationInDaysForApiKeyV1\" value=\"365\"/>\n<add key=\"Gallery.WarnAboutExpirationInDaysForApiKeyV1\" value=\"10\"/>\n<!-- Semi-colon separated list of domains for the alternate site root for gallery, used for MSA authentication by AADv2-->\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs",
"diff": "@@ -1684,6 +1684,56 @@ public async Task ShouldUpdateMultiFactorSettingForMicrosoftAccounts(string cred\nResultAssert.IsSafeRedirectTo(result, returnUrl);\n}\n+ [Theory]\n+ [InlineData(\"AzureActiveDirectory\", false)]\n+ [InlineData(\"AzureActiveDirectory\", true)]\n+ public async Task GivenAssociatedLocalAdminUser_ItVerifiesTheEnforcedTenantId(string providerUsedForLogin, bool shouldError)\n+ {\n+ // Arrange\n+ var enforcedTenantId = \"Some-Tenant-Id\";\n+\n+ var configurationService = GetConfigurationService();\n+ configurationService.Current.ConfirmEmailAddresses = false;\n+ configurationService.Current.EnforcedTenantIdForAdmin = enforcedTenantId;\n+\n+ var fakes = Get<Fakes>();\n+ GetMock<AuthenticationService>(); // Force a mock to be created\n+ var controller = GetController<AuthenticationController>();\n+ var cred = new CredentialBuilder().CreateExternalCredential(providerUsedForLogin, \"blorg\", \"Bloog\", tenantId: shouldError ? \"non-enforced-tenant-id\" : enforcedTenantId);\n+ var authUser = new AuthenticatedUser(\n+ fakes.CreateUser(\"test\", cred),\n+ cred);\n+\n+ authUser.User.Roles.Add(new Role { Name = CoreConstants.AdminRoleName });\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))\n+ .CompletesWith(new AuthenticateExternalLoginResult()\n+ {\n+ ExternalIdentity = new ClaimsIdentity(),\n+ Authentication = authUser\n+ });\n+\n+ GetMock<AuthenticationService>()\n+ .Setup(x => x.CreateSessionAsync(controller.OwinContext, authUser, false))\n+ .Returns(Task.FromResult(0))\n+ .Verifiable();\n+\n+ // Act\n+ var result = await controller.LinkExternalAccount(\"theReturnUrl\");\n+\n+ // Assert\n+ if (shouldError)\n+ {\n+ var expectedMessage = string.Format(Strings.SiteAdminNotLoggedInWithRequiredTenant, enforcedTenantId);\n+ VerifyExternalLinkExpiredResult(controller, result, expectedMessage);\n+ } else\n+ {\n+ ResultAssert.IsSafeRedirectTo(result, \"theReturnUrl\");\n+ GetMock<AuthenticationService>().VerifyAll();\n+ }\n+ }\n+\n[Theory]\n[InlineData(\"MicrosoftAccount\", true)]\n[InlineData(\"AzureActiveDirectory\", false)]\n@@ -2251,7 +2301,7 @@ public static void VerifyExternalLinkExpiredResult(AuthenticationController cont\n{\nexpectedMessage = expectedMessage ?? Strings.ExternalAccountLinkExpired;\nResultAssert.IsRedirect(result, permanent: false, url: controller.Url.LogOn(relativeUrl: false));\n- Assert.Equal(expectedMessage, controller.TempData[\"Message\"]);\n+ Assert.Equal(expectedMessage, controller.TempData[\"ErrorMessage\"]);\n}\nprivate static void EnableAllAuthenticators(AuthenticationService authService)\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add site admin check for tenant (#7511) |
455,736 | 05.09.2019 13:37:57 | 25,200 | fae963f997eed964d1510bcd910d203b3fd186a8 | Make package ownership accept / reject require POST
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -1367,6 +1367,9 @@ img.reserved-indicator-icon {\nposition: relative;\ntop: 2px;\n}\n+.page-manage-packages .manage-package-listing .package-controls form {\n+ display: inline-block;\n+}\n.page-manage-packages .inner-table {\nmargin-bottom: 0px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"new_path": "src/Bootstrap/less/theme/page-manage-packages.less",
"diff": "position: relative;\ntop: 2px;\n}\n+\n+ .package-controls {\n+ form {\n+ display: inline-block;\n+ }\n+ }\n}\n.inner-table {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/Obfuscator.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/Obfuscator.cs",
"diff": "@@ -31,7 +31,9 @@ public static class Obfuscator\n\"Organizations/RejectMemberRequest\",\n\"Organizations/UpdateMember\",\n\"Packages/CancelPendingOwnershipRequest\",\n+ \"Packages/ConfirmPendingOwnershipRequestRedirect\",\n\"Packages/ConfirmPendingOwnershipRequest\",\n+ \"Packages/RejectPendingOwnershipRequestRedirect\",\n\"Packages/RejectPendingOwnershipRequest\",\n\"Packages/SetRequiredSigner\",\n\"Users/Confirm\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -162,11 +162,34 @@ public static void RegisterUIRoutes(RouteCollection routes)\nconstraints: new { httpMethod = new HttpMethodConstraint(\"POST\") },\nobfuscationMetadata: new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName));\n+ routes.MapRoute(\n+ RouteName.PackageOwnerConfirmationRedirect,\n+ \"packages/{id}/owners/{username}/confirm/{token}\",\n+ new { controller = \"Packages\", action = nameof(PackagesController.ConfirmPendingOwnershipRequestRedirect) },\n+ constraints: new { httpMethod = new HttpMethodConstraint(\"GET\") },\n+ obfuscationMetadatas: new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n+ });\n+\nroutes.MapRoute(\nRouteName.PackageOwnerConfirmation,\n\"packages/{id}/owners/{username}/confirm/{token}\",\n- new { controller = \"Packages\", action = \"ConfirmPendingOwnershipRequest\" },\n- new[]\n+ new { controller = \"Packages\", action = nameof(PackagesController.ConfirmPendingOwnershipRequest) },\n+ constraints: new { httpMethod = new HttpMethodConstraint(\"POST\") },\n+ obfuscationMetadatas: new[]\n+ {\n+ new RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\n+ new RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n+ });\n+\n+ routes.MapRoute(\n+ RouteName.PackageOwnerRejectionRedirect,\n+ \"packages/{id}/owners/{username}/reject/{token}\",\n+ new { controller = \"Packages\", action = nameof(PackagesController.RejectPendingOwnershipRequestRedirect) },\n+ constraints: new { httpMethod = new HttpMethodConstraint(\"GET\") },\n+ obfuscationMetadatas: new[]\n{\nnew RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\nnew RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n@@ -175,8 +198,9 @@ public static void RegisterUIRoutes(RouteCollection routes)\nroutes.MapRoute(\nRouteName.PackageOwnerRejection,\n\"packages/{id}/owners/{username}/reject/{token}\",\n- new { controller = \"Packages\", action = \"RejectPendingOwnershipRequest\" },\n- new[]\n+ new { controller = \"Packages\", action = nameof(PackagesController.RejectPendingOwnershipRequest) },\n+ constraints: new { httpMethod = new HttpMethodConstraint(\"POST\") },\n+ obfuscationMetadatas: new[]\n{\nnew RouteExtensions.ObfuscatedPathMetadata(3, Obfuscator.DefaultTelemetryUserName),\nnew RouteExtensions.ObfuscatedPathMetadata(5, Obfuscator.DefaultTelemetryToken)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1978,20 +1978,43 @@ public virtual async Task<JsonResult> Edit(string id, string version, VerifyPack\n[HttpGet]\n[UIAuthorize]\n[RequiresAccountConfirmation(\"accept ownership of a package\")]\n+ public virtual Task<ActionResult> ConfirmPendingOwnershipRequestRedirect(string id, string username, string token)\n+ {\n+ return HandleOwnershipRequest(id, username, token, redirect: true);\n+ }\n+\n+ [HttpPost]\n+ [UIAuthorize]\n+ [ValidateAntiForgeryToken]\n+ [RequiresAccountConfirmation(\"accept ownership of a package\")]\npublic virtual Task<ActionResult> ConfirmPendingOwnershipRequest(string id, string username, string token)\n{\n- return HandleOwnershipRequest(id, username, token, accept: true);\n+ return HandleOwnershipRequest(id, username, token, redirect: false, accept: true);\n}\n[HttpGet]\n[UIAuthorize]\n[RequiresAccountConfirmation(\"reject ownership of a package\")]\n+ public virtual Task<ActionResult> RejectPendingOwnershipRequestRedirect(string id, string username, string token)\n+ {\n+ return HandleOwnershipRequest(id, username, token, redirect: true);\n+ }\n+\n+ [HttpPost]\n+ [UIAuthorize]\n+ [ValidateAntiForgeryToken]\n+ [RequiresAccountConfirmation(\"reject ownership of a package\")]\npublic virtual Task<ActionResult> RejectPendingOwnershipRequest(string id, string username, string token)\n{\n- return HandleOwnershipRequest(id, username, token, accept: false);\n+ return HandleOwnershipRequest(id, username, token, redirect: false, accept: false);\n}\n- private async Task<ActionResult> HandleOwnershipRequest(string id, string username, string token, bool accept)\n+ private async Task<ActionResult> HandleOwnershipRequest(\n+ string id,\n+ string username,\n+ string token,\n+ bool redirect,\n+ bool accept = false)\n{\nif (string.IsNullOrEmpty(token))\n{\n@@ -2023,6 +2046,11 @@ private async Task<ActionResult> HandleOwnershipRequest(string id, string userna\nreturn View(\"ConfirmOwner\", new PackageOwnerConfirmationModel(id, user.Username, ConfirmOwnershipResult.Failure));\n}\n+ if (redirect)\n+ {\n+ return Redirect(Url.ManageMyReceivedPackageOwnershipRequests());\n+ }\n+\nif (accept)\n{\nawait _packageOwnershipManagementService.AddPackageOwnerAsync(package, user);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Extensions/RouteExtensions.cs",
"new_path": "src/NuGetGallery/Extensions/RouteExtensions.cs",
"diff": "@@ -56,9 +56,25 @@ public static void MapRoute(this RouteCollection routes, string name, string url\nroutes.MapRoute(name, url, defaults, new[] { obfuscationMetadata });\n}\n- public static void MapRoute(this RouteCollection routes, string name, string url, object defaults, ObfuscatedPathMetadata[] obfuscationMetadatas)\n+ public static void MapRoute(\n+ this RouteCollection routes,\n+ string name,\n+ string url,\n+ object defaults,\n+ ObfuscatedPathMetadata[] obfuscationMetadatas)\n{\n- routes.MapRoute(name, url, defaults);\n+ routes.MapRoute(name, url, defaults, constraints: null, obfuscationMetadatas: obfuscationMetadatas);\n+ }\n+\n+ public static void MapRoute(\n+ this RouteCollection routes,\n+ string name,\n+ string url,\n+ object defaults,\n+ object constraints,\n+ ObfuscatedPathMetadata[] obfuscationMetadatas)\n+ {\n+ routes.MapRoute(name, url, defaults, constraints);\nif (!ObfuscatedRouteMap.ContainsKey(url)) { ObfuscatedRouteMap.Add(url, obfuscationMetadatas); }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteName.cs",
"new_path": "src/NuGetGallery/RouteName.cs",
"diff": "@@ -38,9 +38,9 @@ public static class RouteName\npublic const string UploadPackage = \"UploadPackage\";\npublic const string UploadPackageProgress = \"UploadPackageProgress\";\npublic const string PackageVersionAction = \"PackageVersionAction\";\n- public const string ConfirmPendingOwnershipRequest = \"ConfirmPendingOwnershipRequest\";\n+ public const string PackageOwnerConfirmationRedirect = \"PackageOwnerConfirmationRedirect\";\npublic const string PackageOwnerConfirmation = \"PackageOwnerConfirmation\";\n- public const string RejectPendingOwnershipRequest = \"RejectPendingOwnershipRequest\";\n+ public const string PackageOwnerRejectionRedirect = \"PackageOwnerRejectionRedirect\";\npublic const string PackageOwnerRejection = \"PackageOwnerRejection\";\npublic const string PackageOwnerCancellation = \"PackageOwnerCancellation\";\npublic const string PackageAction = \"PackageAction\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"new_path": "src/NuGetGallery/UrlHelperExtensions.cs",
"diff": "@@ -23,7 +23,15 @@ public static class UrlHelperExtensions\npublic static class Fragments\n{\n- public const string ManagePackageOwnership = \"#show-Owners-container\";\n+ public static class ManagePage\n+ {\n+ public const string ShowOwnersContainer = \"#show-Owners-container\";\n+ }\n+\n+ public static class ManagePackagesPage\n+ {\n+ public const string ShowRequestsReceivedContainer = \"#show-requests-received-container\";\n+ }\n}\n// Shorthand for current url\n@@ -744,7 +752,7 @@ public static string GetOrganizationCertificates(this UrlHelper url, string acco\n{\n{ \"action\", nameof(PackagesController.Manage) },\n{ \"id\", id }\n- }) + Fragments.ManagePackageOwnership;\n+ }) + Fragments.ManagePage.ShowOwnersContainer;\n}\npublic static RouteUrlTemplate<OwnerRequestsListItemViewModel> ManagePackageOwnershipTemplate(\n@@ -760,7 +768,7 @@ public static string GetOrganizationCertificates(this UrlHelper url, string acco\nnameof(PackagesController.Manage),\n\"Packages\",\nrelativeUrl,\n- routeValues: rv) + Fragments.ManagePackageOwnership;\n+ routeValues: rv) + Fragments.ManagePage.ShowOwnersContainer;\nreturn new RouteUrlTemplate<OwnerRequestsListItemViewModel>(linkGenerator, routesGenerator);\n}\n@@ -1044,6 +1052,11 @@ public static string ManageMyPackages(this UrlHelper url, bool relativeUrl = tru\nreturn GetActionLink(url, \"Packages\", \"Users\", relativeUrl);\n}\n+ public static string ManageMyReceivedPackageOwnershipRequests(this UrlHelper url, bool relativeUrl = true)\n+ {\n+ return url.ManageMyPackages(relativeUrl) + Fragments.ManagePackagesPage.ShowRequestsReceivedContainer;\n+ }\n+\npublic static string GetPackageOwners(this UrlHelper url, bool relativeUrl = true)\n{\nreturn GetActionLink(url, \"GetPackageOwners\", \"JsonApi\", relativeUrl);\n@@ -1104,9 +1117,13 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\n}\npublic static RouteUrlTemplate<OwnerRequestsListItemViewModel> ConfirmPendingOwnershipRequestTemplate(\n- this UrlHelper url, bool relativeUrl = true)\n+ this UrlHelper url,\n+ bool relativeUrl = true)\n{\n- return HandlePendingOwnershipRequestTemplate(url, RouteName.ConfirmPendingOwnershipRequest, relativeUrl);\n+ return HandlePendingOwnershipRequestTemplate(\n+ url,\n+ nameof(PackagesController.ConfirmPendingOwnershipRequest),\n+ relativeUrl);\n}\npublic static string ConfirmPendingOwnershipRequest(\n@@ -1116,13 +1133,23 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\nstring confirmationCode,\nbool relativeUrl = true)\n{\n- return HandlePendingOwnershipRequest(url, RouteName.ConfirmPendingOwnershipRequest, packageId, username, confirmationCode, relativeUrl);\n+ return HandlePendingOwnershipRequest(\n+ url,\n+ nameof(PackagesController.ConfirmPendingOwnershipRequestRedirect),\n+ packageId,\n+ username,\n+ confirmationCode,\n+ relativeUrl);\n}\npublic static RouteUrlTemplate<OwnerRequestsListItemViewModel> RejectPendingOwnershipRequestTemplate(\n- this UrlHelper url, bool relativeUrl = true)\n+ this UrlHelper url,\n+ bool relativeUrl = true)\n{\n- return HandlePendingOwnershipRequestTemplate(url, RouteName.RejectPendingOwnershipRequest, relativeUrl);\n+ return HandlePendingOwnershipRequestTemplate(\n+ url,\n+ nameof(PackagesController.RejectPendingOwnershipRequest),\n+ relativeUrl);\n}\npublic static string RejectPendingOwnershipRequest(\n@@ -1132,12 +1159,18 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\nstring confirmationCode,\nbool relativeUrl = true)\n{\n- return HandlePendingOwnershipRequest(url, RouteName.RejectPendingOwnershipRequest, packageId, username, confirmationCode, relativeUrl);\n+ return HandlePendingOwnershipRequest(\n+ url,\n+ nameof(PackagesController.RejectPendingOwnershipRequestRedirect),\n+ packageId,\n+ username,\n+ confirmationCode,\n+ relativeUrl);\n}\nprivate static RouteUrlTemplate<OwnerRequestsListItemViewModel> HandlePendingOwnershipRequestTemplate(\nthis UrlHelper url,\n- string routeName,\n+ string actionName,\nbool relativeUrl = true)\n{\nvar routesGenerator = new Dictionary<string, Func<OwnerRequestsListItemViewModel, object>>\n@@ -1149,7 +1182,7 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\nFunc<RouteValueDictionary, string> linkGenerator = rv => GetActionLink(\nurl,\n- routeName,\n+ actionName,\n\"Packages\",\nrelativeUrl,\nrouteValues: rv);\n@@ -1159,7 +1192,7 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\nprivate static string HandlePendingOwnershipRequest(\nthis UrlHelper url,\n- string routeName,\n+ string actionName,\nstring packageId,\nstring username,\nstring confirmationCode,\n@@ -1172,7 +1205,7 @@ public static string SigninAssistance(this UrlHelper url, bool relativeUrl = tru\n[\"token\"] = confirmationCode\n};\n- return GetActionLink(url, routeName, \"Packages\", relativeUrl, routeValues);\n+ return GetActionLink(url, actionName, \"Packages\", relativeUrl, routeValues);\n}\npublic static string ConfirmEmail(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "</td>\n<td class=\"text-right align-middle package-controls\">\n<!-- ko if: CanAccept -->\n- <a class=\"btn\" title=\"Confirm Ownership\" data-bind=\"attr: { href: ConfirmUrl, 'aria-label': 'Confirm Ownership of ' + Id }\">\n+ <form method=\"post\" data-bind=\"attr: { action: ConfirmUrl }\">\n+ @Html.AntiForgeryToken()\n+ <button type=\"submit\" class=\"btn btn-default\" title=\"Confirm Ownership\" data-bind=\"attr: { 'aria-label': 'Confirm Ownership of ' + Id }\">\n<i class=\"ms-Icon ms-Icon--Accept\" aria-hidden=\"true\"></i>\n- </a>\n- <a class=\"btn\" title=\"Reject Ownership\" data-bind=\"attr: { href: RejectUrl, 'aria-label': 'Reject Ownership of ' + Id }\">\n+ </button>\n+ </form>\n+ <form method=\"post\" data-bind=\"attr: { action: RejectUrl }\">\n+ @Html.AntiForgeryToken()\n+ <button type=\"submit\" class=\"btn btn-default\" title=\"Reject Ownership\" data-bind=\"attr: { 'aria-label': 'Reject Ownership of ' + Id }\">\n<i class=\"ms-Icon ms-Icon--Cancel\" aria-hidden=\"true\"></i>\n- </a>\n+ </button>\n+ </form>\n<!-- /ko -->\n<!-- ko if: !CanAccept && CanCancel -->\n<a class=\"btn\" title=\"Manage Ownership\" data-bind=\"attr: { href: ManagePackageOwnershipUrl, 'aria-label': 'Manage Ownership of ' + Id }\">\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1701,11 +1701,23 @@ private static Task<ActionResult> RejectOwnershipRequest(PackagesController pack\nreturn packagesController.RejectPendingOwnershipRequest(id, username, token);\n}\n+ private static Task<ActionResult> ConfirmOwnershipRequestRedirect(PackagesController packagesController, string id, string username, string token)\n+ {\n+ return packagesController.ConfirmPendingOwnershipRequestRedirect(id, username, token);\n+ }\n+\n+ private static Task<ActionResult> RejectOwnershipRequestRedirect(PackagesController packagesController, string id, string username, string token)\n+ {\n+ return packagesController.RejectPendingOwnershipRequestRedirect(id, username, token);\n+ }\n+\npublic static IEnumerable<object[]> TheOwnershipRequestMethods_Data\n{\nget\n{\n+ yield return new object[] { new InvokeOwnershipRequest(ConfirmOwnershipRequestRedirect) };\nyield return new object[] { new InvokeOwnershipRequest(ConfirmOwnershipRequest) };\n+ yield return new object[] { new InvokeOwnershipRequest(RejectOwnershipRequestRedirect) };\nyield return new object[] { new InvokeOwnershipRequest(RejectOwnershipRequest) };\n}\n}\n@@ -1901,6 +1913,116 @@ private static IEmailBuilder EmailMessageVerificationForConfirmOwnershipRequest(\n&& msg.PackageUrl == It.IsAny<string>());\n}\n+ public static IEnumerable<object[]> ReturnsRedirectIfTokenIsValid_Data\n+ {\n+ get\n+ {\n+ foreach (var tokenValid in new bool[] { true, false })\n+ {\n+ foreach (var isOrganizationAdministrator in new bool[] { true, false })\n+ {\n+ yield return new object[]\n+ {\n+ new InvokeOwnershipRequest(ConfirmOwnershipRequestRedirect),\n+ new PackageOwnershipManagementServiceRequestExpression(PackagesServiceForConfirmOwnershipRequestExpression),\n+ tokenValid,\n+ isOrganizationAdministrator\n+ };\n+ yield return new object[]\n+ {\n+ new InvokeOwnershipRequest(RejectOwnershipRequestRedirect),\n+ new PackageOwnershipManagementServiceRequestExpression(PackagesServiceForRejectOwnershipRequestExpression),\n+ tokenValid,\n+ isOrganizationAdministrator\n+ };\n+ }\n+ }\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(nameof(ReturnsRedirectIfTokenIsValid_Data))]\n+ public async Task ReturnsRedirectIfTokenIsValid(\n+ InvokeOwnershipRequest invokeOwnershipRequest,\n+ PackageOwnershipManagementServiceRequestExpression packageOwnershipManagementServiceExpression,\n+ bool tokenValid,\n+ bool isOrganizationAdministrator)\n+ {\n+ // Arrange\n+ var token = \"token\";\n+ var requestingOwner = new User { Key = _key++, Username = \"owner\", EmailAllowed = true };\n+ var package = new PackageRegistration { Id = \"foo\", Owners = new[] { requestingOwner } };\n+\n+ var currentUser = new User { Key = _key++, Username = \"username\" };\n+\n+ User newOwner;\n+ if (isOrganizationAdministrator)\n+ {\n+ newOwner = new Organization { Key = _key++, Username = \"organization\", Members = new[] { new Membership { Member = currentUser, IsAdmin = true } } };\n+ }\n+ else\n+ {\n+ newOwner = currentUser;\n+ }\n+\n+ var mockHttpContext = new Mock<HttpContextBase>();\n+\n+ var packageService = new Mock<IPackageService>();\n+ packageService.Setup(p => p.FindPackageRegistrationById(package.Id)).Returns(package);\n+\n+ var packageOwnershipManagementService = new Mock<IPackageOwnershipManagementService>();\n+ packageOwnershipManagementService.Setup(p => p.AddPackageOwnerAsync(package, newOwner, true)).Returns(Task.CompletedTask).Verifiable();\n+ packageOwnershipManagementService.Setup(p => p.DeletePackageOwnershipRequestAsync(package, newOwner, true)).Returns(Task.CompletedTask).Verifiable();\n+\n+ var request = new PackageOwnerRequest\n+ {\n+ PackageRegistration = package,\n+ RequestingOwner = requestingOwner,\n+ NewOwner = newOwner,\n+ ConfirmationCode = token\n+ };\n+ packageOwnershipManagementService.Setup(p => p.GetPackageOwnershipRequest(package, newOwner, token))\n+ .Returns(tokenValid ? request : null);\n+\n+ var configurationService = GetConfigurationService();\n+ var messageService = new Mock<IMessageService>();\n+\n+ var userService = new Mock<IUserService>();\n+ userService.Setup(x => x.FindByUsername(newOwner.Username, false)).Returns(newOwner);\n+\n+ var controller = CreateController(\n+ configurationService,\n+ httpContext: mockHttpContext,\n+ packageService: packageService,\n+ messageService: messageService,\n+ packageOwnershipManagementService: packageOwnershipManagementService,\n+ userService: userService);\n+\n+ controller.SetCurrentUser(currentUser);\n+ TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);\n+\n+ // Act\n+ var result = await invokeOwnershipRequest(controller, package.Id, newOwner.Username, token);\n+\n+ // Assert\n+ if (tokenValid)\n+ {\n+ ResultAssert.IsRedirectTo(result, \"/account/Packages#show-requests-received-container\");\n+ }\n+ else\n+ {\n+ var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, \"ConfirmOwner\");\n+ Assert.Equal(ConfirmOwnershipResult.Failure, model.Result);\n+ Assert.Equal(package.Id, model.PackageId);\n+ }\n+ packageOwnershipManagementService.Verify(\n+ packageOwnershipManagementServiceExpression(package, newOwner),\n+ Times.Never);\n+ messageService.Verify(\n+ svc => svc.SendMessageAsync(It.IsAny<IEmailBuilder>(), false, false),\n+ Times.Never);\n+ }\n+\npublic static IEnumerable<object[]> ReturnsSuccessIfTokenIsValid_Data\n{\nget\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"new_path": "tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs",
"diff": "@@ -63,7 +63,8 @@ public void ValidatePIIActions()\nList<string> piiOperationsFromRoutes = GetPIIOperationsFromRoute();\n// Act and Assert\n- Assert.True(existentPIIOperations.SetEquals(piiOperationsFromRoutes));\n+ Assert.Empty(existentPIIOperations.Except(piiOperationsFromRoutes));\n+ Assert.Empty(piiOperationsFromRoutes.Except(existentPIIOperations));\n}\n[Fact]\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Make package ownership accept / reject require POST (#7515)
Progress on https://github.com/NuGet/Engineering/issues/2679 |
455,736 | 07.09.2019 05:44:27 | -7,200 | 04047b395e4f5ab26cf852ce151310ec334c1a35 | Fix timezone issues
Address | [
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1442,7 +1442,8 @@ public void GivenAnExistentPackageTheFeatureFlagHidesTheFeed(bool enabled)\nPackageRegistration = new PackageRegistration()\n{\nId = \"Foo\"\n- }\n+ },\n+ Created = new DateTime(2019, 9, 7),\n};\npackageRegistration.Packages.Add(onlyVersion);\n@@ -1492,7 +1493,8 @@ public void GivenAExistentPackagePrereleaseVersionsCanBeFilteredOut(bool include\nPackageRegistration = new PackageRegistration()\n{\nId = \"Foo\"\n- }\n+ },\n+ Created = new DateTime(2019, 9, 7),\n};\npackageRegistration.Packages.Add(onlyVersion);\n@@ -1669,7 +1671,8 @@ public void UsesProperIconUrl(bool prerel)\n{\nPackageRegistration = packageRegistration,\nVersion = packageVersion,\n- NormalizedVersion = packageVersion\n+ NormalizedVersion = packageVersion,\n+ Created = new DateTime(2019, 9, 7),\n};\npackageRegistration.Packages.Add(package);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Fix timezone issues (#7521)
Address https://github.com/NuGet/Engineering/issues/2499 |
455,736 | 06.09.2019 15:41:05 | 25,200 | d1373fa2b38f1755762c44324214376ab5258e43 | Update to latest ServerCommon to react to method rename
Progress on | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleter.csproj",
"new_path": "src/AccountDeleter/AccountDeleter.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.ServiceBus\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Common.Job\">\n<Version>4.1.0-dev-2759568</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"new_path": "src/DatabaseMigrationTools/DatabaseMigrationTools.csproj",
"diff": "<Version>4.1.0-master-2758883</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"new_path": "src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj",
"diff": "<Version>4.1.0-master-2602271</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Configuration\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"NuGet.Services.Entities\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.FeatureFlags\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Messaging.Email\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Validation.Issues\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"new_path": "src/NuGetGallery.Services/NuGetGallery.Services.csproj",
"diff": "<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Logging\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.WebBackgrounder\">\n<Version>0.2.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Version>2.2.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Licenses\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.StrongName.AnglicanGeek.MarkdownMailer\">\n<Version>1.2.0</Version>\n<Version>5.0.0-preview1.5665</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.KeyVault\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Owin\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"NuGet.Services.Sql\">\n- <Version>2.54.0</Version>\n+ <Version>2.55.0</Version>\n</PackageReference>\n<PackageReference Include=\"Owin\">\n<Version>1.0.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/AsynchronousPackageValidationInitiator.cs",
"new_path": "src/NuGetGallery/Services/AsynchronousPackageValidationInitiator.cs",
"diff": "@@ -64,7 +64,7 @@ public async Task<PackageStatus> StartValidationAsync(TPackageEntity package)\n{\nvar postponeProcessingTill = DateTimeOffset.UtcNow + _appConfiguration.AsynchronousPackageValidationDelay;\n- await _validationEnqueuer.StartValidationAsync(data, postponeProcessingTill);\n+ await _validationEnqueuer.SendMessageAsync(data, postponeProcessingTill);\n}\nreturn TargetPackageStatus;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/AsynchronousPackageValidationInitiatorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/AsynchronousPackageValidationInitiatorFacts.cs",
"diff": "@@ -43,7 +43,7 @@ public async Task UsesProvidedPackageIdAndVersion()\n// Assert\n_enqueuer.Verify(\n- x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\n+ x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\nTimes.Once);\nAssert.Equal(1, _data.Count);\nAssert.NotNull(_data[0]);\n@@ -65,7 +65,7 @@ public async Task AddsEntityKeyAsAppropriate(int packageKey, int? expectedEntity\n// Assert\n_enqueuer.Verify(\n- x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\n+ x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\nTimes.Once);\nAssert.Equal(1, _data.Count);\nAssert.NotNull(_data[0]);\n@@ -88,7 +88,7 @@ public async Task FailsWhenTheGalleryIsInReadOnlyMode()\n() => _target.StartValidationAsync(package));\nAssert.Equal(Strings.CannotEnqueueDueToReadOnly, exception.Message);\n_enqueuer.Verify(\n- x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>()),\n+ x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>()),\nTimes.Never);\n}\n@@ -168,7 +168,7 @@ public async Task UsesProvidedPackageIdAndVersion()\n// Assert\n_enqueuer.Verify(\n- x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\n+ x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\nTimes.Once);\nAssert.Equal(1, _data.Count);\nAssert.NotNull(_data[0]);\n@@ -190,7 +190,7 @@ public async Task AddsEntityKeyAsAppropriate(int symbolPackageKey, int? expected\n// Assert\n_enqueuer.Verify(\n- x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\n+ x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()),\nTimes.Once);\nAssert.Equal(1, _data.Count);\nAssert.NotNull(_data[0]);\n@@ -213,7 +213,7 @@ public async Task FailsWhenTheGalleryIsInReadOnlyMode()\n() => _target.StartValidationAsync(symbolPackage));\nAssert.Equal(Strings.CannotEnqueueDueToReadOnly, exception.Message);\n_enqueuer.Verify(\n- x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>()),\n+ x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>()),\nTimes.Never);\n}\n@@ -280,7 +280,7 @@ public FactsBase()\n{\n_enqueuer = new Mock<IPackageValidationEnqueuer>();\n_enqueuer\n- .Setup(x => x.StartValidationAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()))\n+ .Setup(x => x.SendMessageAsync(It.IsAny<PackageValidationMessageData>(), It.IsAny<DateTimeOffset>()))\n.Returns(Task.CompletedTask)\n.Callback<PackageValidationMessageData, DateTimeOffset>((d, o) => _data.Add(d));\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Update to latest ServerCommon to react to method rename (#7520)
Progress on https://github.com/NuGet/NuGetGallery/issues/7490 |
455,733 | 09.09.2019 14:16:27 | 25,200 | bc4bb535648939ce7348f527bce8bba0b5abe861 | Add codeowners for the NuGetGallery repo to get reviews requested automatically | [
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/CODEOWNERS",
"diff": "+# These owners will be the default owners for everything in\n+# the repo. Unless a later match takes precedence,\n+# review when someone opens a pull request.\n+# For more on how to customize the CODEOWNERS file - https://help.github.com/en/articles/about-code-owners\n+* @agr @cristinamanu @dannyjdev @joelverhagen @loic-sharma @ryuyu @scottbommarito @skofman1 @shishirx34 @xavierdecoster @zhhyu\n+\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add codeowners for the NuGetGallery repo to get reviews requested automatically (#7523) |
455,776 | 10.09.2019 13:28:22 | 25,200 | 5cdb04ee6139db8101858fd2cdccb67c62831191 | Add abbr tags to hidden column headers in display package version history table | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "{\n<th>Status</th>\n}\n- <th aria-label=\"Signature Information\"></th>\n- <th aria-label=\"Deprecation Information\"></th>\n+ <th aria-label=\"Signature Information\" abbr=\"Signature Information\"></th>\n+ <th aria-label=\"Deprecation Information\" abbr=\"Deprecation Information\"></th>\n</tr>\n</thead>\n<tbody class=\"no-border\">\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Add abbr tags to hidden column headers in display package version history table (#7510) |
455,776 | 11.09.2019 13:03:57 | 25,200 | 95cee6bf1a756ffbe571b2970250214bda324b58 | Hotfix: Stats index page should not use integers to store download counts | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Telemetry/UserPackageDeleteEvent.cs",
"new_path": "src/NuGetGallery.Services/Telemetry/UserPackageDeleteEvent.cs",
"diff": "@@ -12,10 +12,10 @@ public class UserPackageDeleteEvent\nint packageKey,\nstring packageId,\nstring packageVersion,\n- int idDatabaseDownloads,\n- int idReportDownloads,\n- int versionDatabaseDownloads,\n- int versionReportDownloads,\n+ long idDatabaseDownloads,\n+ long idReportDownloads,\n+ long versionDatabaseDownloads,\n+ long versionReportDownloads,\nReportPackageReason? reportPackageReason,\nPackageDeleteDecision? packageDeleteDecision)\n{\n@@ -35,10 +35,10 @@ public class UserPackageDeleteEvent\npublic int PackageKey { get; }\npublic string PackageId { get; }\npublic string PackageVersion { get; }\n- public int IdDatabaseDownloads { get; }\n- public int IdReportDownloads { get; }\n- public int VersionDatabaseDownloads { get; }\n- public int VersionReportDownloads { get; }\n+ public long IdDatabaseDownloads { get; }\n+ public long IdReportDownloads { get; }\n+ public long VersionDatabaseDownloads { get; }\n+ public long VersionReportDownloads { get; }\npublic ReportPackageReason? ReportPackageReason { get; }\npublic PackageDeleteDecision? PackageDeleteDecision { get; }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/StatisticsController.cs",
"new_path": "src/NuGetGallery/Controllers/StatisticsController.cs",
"diff": "@@ -321,7 +321,7 @@ private void ProcessReport(StatisticsPackagesReport report, string[] groupby, st\nif (groupby != null)\n{\n- Tuple<StatisticsPivot.TableEntry[][], int> result = StatisticsPivot.GroupBy(report.Facts, pivot);\n+ var result = StatisticsPivot.GroupBy(report.Facts, pivot);\nif (id != null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/JsonStatisticsService.cs",
"new_path": "src/NuGetGallery/Services/JsonStatisticsService.cs",
"diff": "@@ -187,7 +187,7 @@ private Task<StatisticsReportResult> LoadDownloadCommunityPackages()\nnew StatisticsPackagesItemViewModel\n{\nPackageId = item[\"PackageId\"].ToString(),\n- Downloads = item[\"Downloads\"].Value<int>()\n+ Downloads = item[\"Downloads\"].Value<long>()\n}\n);\n@@ -247,7 +247,7 @@ private Task<StatisticsReportResult> LoadDownloadCommunityPackageVersions()\n{\nPackageId = item[\"PackageId\"].ToString(),\nPackageVersion = item[\"PackageVersion\"].ToString(),\n- Downloads = item[\"Downloads\"].Value<int>(),\n+ Downloads = item[\"Downloads\"].Value<long>(),\n}\n);\n@@ -287,7 +287,7 @@ private async Task<StatisticsReportResult> LoadNuGetClientVersion()\nnew StatisticsNuGetUsageItem\n{\nVersion = string.Format(CultureInfo.InvariantCulture, \"{0}.{1}\", item[\"Major\"], item[\"Minor\"]),\n- Downloads = (int)item[\"Downloads\"]\n+ Downloads = (long)item[\"Downloads\"]\n});\n}\n@@ -322,7 +322,7 @@ private async Task<StatisticsReportResult> LoadLast6Weeks()\n{\nYear = (int)item[\"Year\"],\nWeekOfYear = (int)item[\"WeekOfYear\"],\n- Downloads = (int)item[\"Downloads\"]\n+ Downloads = (long)item[\"Downloads\"]\n});\n}\n@@ -475,7 +475,7 @@ private static IList<StatisticsFact> CreateFacts(JObject data)\noperation = (string)opt;\n}\n- var downloads = (int)perClient[\"Downloads\"];\n+ var downloads = (long)perClient[\"Downloads\"];\nfacts.Add(new StatisticsFact(CreateDimensions(version, clientName, clientVersion, operation), downloads));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsFact.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsFact.cs",
"diff": "@@ -7,13 +7,13 @@ namespace NuGetGallery\n{\npublic class StatisticsFact\n{\n- public StatisticsFact(IDictionary<string, string> dimensions, int amount)\n+ public StatisticsFact(IDictionary<string, string> dimensions, long amount)\n{\nDimensions = new Dictionary<string, string>(dimensions);\nAmount = amount;\n}\npublic IDictionary<string, string> Dimensions { get; private set; }\n- public int Amount { get; private set; }\n+ public long Amount { get; private set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsNuGetUsageItem.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsNuGetUsageItem.cs",
"diff": "@@ -6,6 +6,6 @@ namespace NuGetGallery\npublic class StatisticsNuGetUsageItem\n{\npublic string Version { get; set; }\n- public int Downloads { get; set; }\n+ public long Downloads { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsPackagesItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsPackagesItemViewModel.cs",
"diff": "@@ -10,6 +10,6 @@ public class StatisticsPackagesItemViewModel\npublic string PackageTitle { get; set; }\npublic string PackageDescription { get; set; }\npublic string PackageIconUrl { get; set; }\n- public int Downloads { get; set; }\n+ public long Downloads { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsPackagesReport.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsPackagesReport.cs",
"diff": "@@ -10,7 +10,7 @@ namespace NuGetGallery\npublic class StatisticsPackagesReport\n{\npublic IList<StatisticsPackagesItemViewModel> Rows { get; private set; }\n- public int Total { get; set; }\n+ public long Total { get; set; }\npublic IList<StatisticsDimension> Dimensions { get; private set; }\npublic IList<StatisticsFact> Facts { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsPackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsPackagesViewModel.cs",
"diff": "@@ -56,7 +56,7 @@ public StatisticsPackagesViewModel()\npublic bool IsLast6WeeksAvailable { get; set; }\n- public int NuGetClientVersionTotalDownloads { get; private set; }\n+ public long NuGetClientVersionTotalDownloads { get; private set; }\npublic string PackageId { get; private set; }\n@@ -81,7 +81,7 @@ public void SetPackageVersionDownloadsByClient(string packageId, string packageV\nPackageVersion = packageVersion;\n}\n- public string DisplayDownloads(int downloads)\n+ public string DisplayDownloads(long downloads)\n{\nreturn downloads.ToNuGetNumberString();\n}\n@@ -142,7 +142,7 @@ public string DisplayPercentage(float amount, float total)\nreturn (amount / total).ToString(\"P0\", CultureInfo.CurrentCulture);\n}\n- public string DisplayShortNumber(int number)\n+ public string DisplayShortNumber(long number)\n{\nvar numDiv = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsPivot.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsPivot.cs",
"diff": "@@ -14,7 +14,7 @@ namespace NuGetGallery\n{\npublic class StatisticsPivot\n{\n- public static Tuple<TableEntry[][], int> GroupBy(IList<StatisticsFact> facts, string[] pivot)\n+ public static Tuple<TableEntry[][], long> GroupBy(IList<StatisticsFact> facts, string[] pivot)\n{\n// Firstly take the facts and the pivot vector and produce a tree structure\n@@ -36,7 +36,7 @@ public class StatisticsPivot\nPopulateTable(level, table);\n- return new Tuple<TableEntry[][], int>(table, level.Total);\n+ return new Tuple<TableEntry[][], long>(table, level.Total);\n}\nprivate static void AddOrderedNext(Level level)\n@@ -126,7 +126,7 @@ private static void Assign(Level result, StatisticsFact fact, string[] dimension\nif (depth == dimensions.Length - 1)\n{\n- int current = result.Next[fact.Dimensions[dimensions[depth]]].Amount;\n+ var current = result.Next[fact.Dimensions[dimensions[depth]]].Amount;\nresult.Next[fact.Dimensions[dimensions[depth]]].Amount = current + fact.Amount;\n}\n@@ -162,9 +162,9 @@ private static int Count(Level level)\n// The total in a pivot can be found by adding up all the leaf nodes\n// The subtotals are also stored in the tree.\n- private static int Total(Level level)\n+ private static long Total(Level level)\n{\n- int total = 0;\n+ long total = 0;\nforeach (KeyValuePair<string, Level> item in level.Next)\n{\nif (item.Value.Next == null)\n@@ -188,7 +188,7 @@ private static int Total(Level level)\npublic class TableEntry\n{\npublic string Data { get; set; }\n- public int Rowspan { get; set; }\n+ public long Rowspan { get; set; }\npublic string Uri { get; set; }\npublic bool IsNumeric { get; set; }\n@@ -217,15 +217,15 @@ public Level(IDictionary<string, Level> next)\n// Either Next is not null or this is a leaf in the pivot tree, in which case Amount is valid\npublic IDictionary<string, Level> Next { get; set; }\n- public int Amount { get; set; }\n+ public long Amount { get; set; }\n// Count is the count of child nodes in the tree - recursively so grandchildren etc. also get counted\n- public int Count { get; set; }\n+ public long Count { get; set; }\n// Total is the sum Total of all the Amounts in all the descendants. (See Total function above.)\n- public int Total { get; set; }\n+ public long Total { get; set; }\n// An ordered list for each level\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsWeeklyUsageItem.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsWeeklyUsageItem.cs",
"diff": "@@ -7,6 +7,6 @@ public class StatisticsWeeklyUsageItem\n{\npublic int Year { get; set; }\npublic int WeekOfYear { get; set; }\n- public int Downloads { get; set; }\n+ public long Downloads { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/Index.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/Index.cshtml",
"diff": "for (var i = 0; i < numYAxisLabels; i++)\n{\n- @:<text class=\"graph-y-axis-text\" x=\"0\" y=\"@Format(i / numYAxisLabels * chartFullHeightInPercent)%\" dy=\"1em\" text-overflow=\"clip\">@Model.DisplayShortNumber((int)Math.Floor(max * (numYAxisLabels - i) / numYAxisLabels))</text>\n+ @:<text class=\"graph-y-axis-text\" x=\"0\" y=\"@Format(i / numYAxisLabels * chartFullHeightInPercent)%\" dy=\"1em\" text-overflow=\"clip\">@Model.DisplayShortNumber((long)Math.Floor(max * (numYAxisLabels - i) / numYAxisLabels))</text>\n}\n}\n</svg>\nfor (var i = 0; i < numYAxisLabels; i++)\n{\n- @:<text class=\"graph-y-axis-text\" x=\"0\" y=\"@Format(topOffset + i / numYAxisLabels * chartFullHeightInPercent)%\" dy=\"1em\" text-overflow=\"clip\">@Model.DisplayShortNumber((int)Math.Floor(max * (numYAxisLabels - i) / numYAxisLabels))</text>\n+ @:<text class=\"graph-y-axis-text\" x=\"0\" y=\"@Format(topOffset + i / numYAxisLabels * chartFullHeightInPercent)%\" dy=\"1em\" text-overflow=\"clip\">@Model.DisplayShortNumber((long)Math.Floor(max * (numYAxisLabels - i) / numYAxisLabels))</text>\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs",
"diff": "@@ -112,7 +112,7 @@ public async Task StatisticsHomePage_ValidateReportStructureAndAvailability()\nvar model = (StatisticsPackagesViewModel)((ViewResult)await controller.Index()).Model;\n- int sum = 0;\n+ long sum = 0;\nif (model.IsDownloadPackageAvailable)\n{\n@@ -286,7 +286,7 @@ public async Task StatisticsHomePage_Packages_ValidateReportStructureAndAvailabi\nvar model = (StatisticsPackagesViewModel)((ViewResult)await controller.Packages()).Model;\n- int sum = 0;\n+ long sum = 0;\nforeach (var item in model.DownloadPackagesAll)\n{\n@@ -334,7 +334,7 @@ public async Task StatisticsHomePage_PackageVersions_ValidateReportStructureAndA\nvar model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageVersions()).Model;\n- int sum = 0;\n+ long sum = 0;\nforeach (var item in model.DownloadPackageVersionsAll)\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Hotfix: Stats index page should not use integers to store download counts (#7545) |
455,772 | 12.09.2019 14:31:06 | 25,200 | 69f5de7f11597b8ff204900fc5fd7c6680c3864b | Build&Sign config for GalleryTools | [
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -84,6 +84,7 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' {\n(Join-Path $PSScriptRoot \"src\\NuGet.Services.DatabaseMigration\\Properties\\AssemblyInfo.g.cs\"), `\n(Join-Path $PSScriptRoot \"src\\DatabaseMigrationTools\\Properties\\AssemblyInfo.g.cs\"), `\n(Join-Path $PSScriptRoot \"src\\AccountDeleter\\Properties\\AssemblyInfo.g.cs\")\n+ (Join-Path $PSScriptRoot \"src\\GalleryTools\\Properties\\AssemblyInfo.g.cs\")\nForeach ($Path in $Paths) {\nSet-VersionInfo -Path $Path -Version $SimpleVersion -Branch $Branch -Commit $CommitSHA\n@@ -105,6 +106,7 @@ Invoke-BuildStep 'Creating artifacts' { `\nNew-Package (Join-Path $PSScriptRoot \"src\\DatabaseMigrationTools\\DatabaseMigration.SupportRequest.nuspec\") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion \"15\"\nNew-Package (Join-Path $PSScriptRoot \"src\\DatabaseMigrationTools\\DatabaseMigration.Validation.nuspec\") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion \"15\"\nNew-Package (Join-Path $PSScriptRoot \"src\\AccountDeleter\\Gallery.AccountDeleter.nuspec\") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion \"15\"\n+ New-Package (Join-Path $PSScriptRoot \"src\\GalleryTools\\Gallery.GalleryTools.nuspec\") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion \"15\"\n} `\n-ev +BuildErrors\n"
},
{
"change_type": "MODIFY",
"old_path": "sign.thirdparty.targets",
"new_path": "sign.thirdparty.targets",
"diff": "<ThirdPartyBinaries Include=\"Autofac.Integration.Owin.dll\" />\n<ThirdPartyBinaries Include=\"Autofac.Integration.WebApi.dll\" />\n<ThirdPartyBinaries Include=\"CommonMark.dll\" />\n+ <ThirdPartyBinaries Include=\"CsvHelper.dll\" />\n<ThirdPartyBinaries Include=\"Dapper.StrongName.dll\" />\n<ThirdPartyBinaries Include=\"DynamicData.EFCodeFirstProvider.dll\" />\n<ThirdPartyBinaries Include=\"Elmah.dll\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/GalleryTools/Gallery.GalleryTools.nuspec",
"diff": "+<?xml version=\"1.0\"?>\n+<package >\n+ <metadata>\n+ <id>Gallery.GalleryTools</id>\n+ <version>$version$</version>\n+ <title>Gallery.GalleryTools</title>\n+ <authors>Microsoft corp.</authors>\n+ <owners>Microsoft corp.</owners>\n+ <description>Tools for performing manual one-time/maintenance operations on the Gallery</description>\n+ <copyright>Copyright Microsoft corp.</copyright>\n+ </metadata>\n+ <files>\n+ <file src=\"bin\\$configuration$\\**\\*.*\" target=\"bin\"/>\n+ </files>\n+</package>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/GalleryTools.csproj",
"new_path": "src/GalleryTools/GalleryTools.csproj",
"diff": "<Compile Include=\"Commands\\VerifyApiKeyCommand.cs\" />\n<Compile Include=\"Program.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n+ <Compile Include=\"Properties\\AssemblyInfo.*.cs\" />\n<Compile Include=\"Utils\\ServiceDiscoveryClient.cs\" />\n</ItemGroup>\n<ItemGroup>\n</ProjectReference>\n</ItemGroup>\n<ItemGroup>\n+ <PackageReference Include=\"MicroBuild.Core\">\n+ <Version>0.3.0</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Autofac\">\n<Version>4.6.2</Version>\n</PackageReference>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n+ <PropertyGroup>\n+ <SignPath>..\\..\\build</SignPath>\n+ <SignPath Condition=\"'$(BUILD_SOURCESDIRECTORY)' != ''\">$(BUILD_SOURCESDIRECTORY)\\build</SignPath>\n+ <SignPath Condition=\"'$(NuGetBuildPath)' != ''\">$(NuGetBuildPath)</SignPath>\n+ <SignType Condition=\"'$(SignType)' == ''\">none</SignType>\n+ </PropertyGroup>\n+ <Import Project=\"$(SignPath)\\sign.targets\" Condition=\"Exists('$(SignPath)\\sign.targets')\" />\n+ <Import Project=\"$(SignPath)\\sign.microbuild.targets\" Condition=\"Exists('$(SignPath)\\sign.microbuild.targets')\" />\n+ <Import Project=\"..\\..\\sign.thirdparty.targets\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/GalleryTools/Properties/AssemblyInfo.cs",
"new_path": "src/GalleryTools/Properties/AssemblyInfo.cs",
"diff": "using System.Resources;\nusing System.Runtime.InteropServices;\n-// General Information about an assembly is controlled through the following\n-// set of attributes. Change these attribute values to modify the information\n-// associated with an assembly.\n[assembly: AssemblyTitle(\"GalleryTools\")]\n[assembly: AssemblyCompany(\".NET Foundation\")]\n[assembly: AssemblyProduct(\"NuGet Services\")]\n[assembly: AssemblyTrademark(\"\")]\n[assembly: AssemblyCulture(\"\")]\n-\n#if !PORTABLE\n[assembly: ComVisible(false)]\n#endif\n[assembly: CLSCompliant(false)]\n[assembly: NeutralResourcesLanguage(\"en-us\")]\n+[assembly: AssemblyDescription(\"Tools for performing manual one-time/maintenance operations on the Gallery\")]\n+\n+// The build will automatically inject the following attributes:\n+// AssemblyVersion, AssemblyFileVersion, AssemblyInformationalVersion, AssemblyMetadata (for Branch, CommitId, and BuildDateUtc)\n+\n[assembly: AssemblyMetadata(\"RepositoryUrl\", \"https://www.github.com/NuGet/NuGetGallery\")]\n+\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Build&Sign config for GalleryTools (#7541) |
455,747 | 17.09.2019 11:07:14 | 25,200 | 5f1355c9e0196e887acc54e5e238a8d5ec6d0dda | [MSA] Use EmailClaim instead of preferred_username during auth/register | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"new_path": "src/NuGetGallery.Services/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs",
"diff": "@@ -20,11 +20,12 @@ public class AzureActiveDirectoryV2Authenticator : Authenticator<AzureActiveDire\n{\npublic static class V2Claims\n{\n- public const string TenantId = \"http://schemas.microsoft.com/identity/claims/tenantid\";\n+ public const string EmailAddress = ClaimTypes.Email;\npublic const string Identifier = \"http://schemas.microsoft.com/identity/claims/objectidentifier\";\n- public const string Email = \"preferred_username\";\n- public const string Name = \"name\";\npublic const string Issuer = \"iss\";\n+ public const string Name = \"name\";\n+ public const string PreferredUsername = \"preferred_username\";\n+ public const string TenantId = \"http://schemas.microsoft.com/identity/claims/tenantid\";\n/// <summary>\n/// ACR is the Authentication Class Reference token, which is the claim that is returned by OpenId upon usage of multi-factor during authentication.\n@@ -182,10 +183,10 @@ public override IdentityInformation GetIdentityInformation(ClaimsIdentity claims\n}\nvar nameClaim = claimsIdentity.FindFirst(V2Claims.Name);\n- var emailClaim = claimsIdentity.FindFirst(V2Claims.Email);\n+ var emailClaim = claimsIdentity.FindFirst(V2Claims.EmailAddress);\nif (emailClaim == null)\n{\n- throw new ArgumentException($\"External Authentication is missing required claim: '{V2Claims.Email}'\");\n+ throw new ArgumentException($\"External Authentication is missing required claim: '{V2Claims.EmailAddress}'\");\n}\nvar acrClaim = claimsIdentity.FindFirst(V2Claims.ACR);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/Providers/CommonAuth/AzureActiveDirectoryV2AuthenticatorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/Providers/CommonAuth/AzureActiveDirectoryV2AuthenticatorFacts.cs",
"diff": "@@ -180,7 +180,7 @@ public void ReturnsAuthInformationForCorrectClaims()\nAssert.Equal(\"blarg\", result.Identifier);\nAssert.Equal(\"bloog\", result.Name);\nAssert.Equal(AzureActiveDirectoryV2Authenticator.AuthenticationType.AzureActiveDirectory, result.AuthenticationType);\n- Assert.Equal(\"[email protected]\", result.Email);\n+ Assert.Equal(\"[email protected]\", result.Email);\nAssert.Equal(TestData.TEST_TENANT_ID, result.TenantId);\n}\n@@ -206,7 +206,7 @@ public void ReturnsFormattedIdentifierForMSA()\nAssert.Equal(\"0ae45d63e22e4a60\", result.Identifier);\nAssert.Equal(\"bloog\", result.Name);\nAssert.Equal(AzureActiveDirectoryV2Authenticator.AuthenticationType.MicrosoftAccount, result.AuthenticationType);\n- Assert.Equal(\"[email protected]\", result.Email);\n+ Assert.Equal(\"[email protected]\", result.Email);\nAssert.Equal(AzureActiveDirectoryV2Authenticator.PersonalMSATenant, result.TenantId);\n}\n}\n@@ -219,7 +219,7 @@ private static class TestData\npublic static Claim Identifier = new Claim(AzureActiveDirectoryV2Authenticator.V2Claims.Identifier, \"blarg\", ClaimValueTypes.String, Authority);\npublic static Claim Name = new Claim(AzureActiveDirectoryV2Authenticator.V2Claims.Name, \"bloog\", ClaimValueTypes.String, Authority);\npublic static Claim TenantId = new Claim(AzureActiveDirectoryV2Authenticator.V2Claims.TenantId, TEST_TENANT_ID, ClaimValueTypes.String, Authority);\n- public static Claim Email = new Claim(AzureActiveDirectoryV2Authenticator.V2Claims.Email, \"[email protected]\", ClaimValueTypes.String, Authority);\n+ public static Claim Email = new Claim(AzureActiveDirectoryV2Authenticator.V2Claims.EmailAddress, \"[email protected]\", ClaimValueTypes.String, Authority);\npublic static ClaimsIdentity GetIdentity()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | [MSA] Use EmailClaim instead of preferred_username during auth/register (#7565) |
455,776 | 17.09.2019 13:02:41 | 25,200 | 641da821ca5dac0da340cfcd688daafc453ebb7e | Do not throw if trying to list an unlisted package that is marked latest | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Services/PackageManagement/PackageUpdateService.cs",
"new_path": "src/NuGetGallery.Services/PackageManagement/PackageUpdateService.cs",
"diff": "@@ -54,11 +54,6 @@ public async Task MarkPackageListedAsync(Package package, bool commitChanges = t\nthrow new InvalidOperationException(\"A package that failed validation should never be listed!\");\n}\n- if (!package.Listed && (package.IsLatestStable || package.IsLatest || package.IsLatestSemVer2 || package.IsLatestStableSemVer2))\n- {\n- throw new InvalidOperationException(\"An unlisted package should never be latest or latest stable!\");\n- }\n-\npackage.Listed = true;\npackage.LastUpdated = DateTime.UtcNow;\n// NOTE: LastEdited will be overwritten by a trigger defined in the migration named \"AddTriggerForPackagesLastEdited\".\n@@ -98,7 +93,7 @@ public async Task MarkPackageUnlistedAsync(Package package, bool commitChanges =\n// NOTE: LastEdited will be overwritten by a trigger defined in the migration named \"AddTriggerForPackagesLastEdited\".\npackage.LastEdited = DateTime.UtcNow;\n- if (ShouldUpdateIsLatestForPackageWhenUnlisting(package))\n+ if (package.IsLatest || package.IsLatestStable || package.IsLatestSemVer2 || package.IsLatestStableSemVer2)\n{\nawait _packageService.UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);\n}\n@@ -172,10 +167,5 @@ private async Task UpdatePackagesInBulkAsync(IReadOnlyList<int> packageKeys)\n$\"Updated {result} packages instead of {expectedResult}.\");\n}\n}\n-\n- private bool ShouldUpdateIsLatestForPackageWhenUnlisting(Package package)\n- {\n- return package.IsLatest || package.IsLatestStable || package.IsLatestSemVer2 || package.IsLatestStableSemVer2;\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageUpdateServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageUpdateServiceFacts.cs",
"diff": "@@ -60,41 +60,6 @@ public async Task ThrowsWhenPackageFailedValidation()\nawait Assert.ThrowsAsync<InvalidOperationException>(async () => await service.MarkPackageListedAsync(package));\n}\n- public static IEnumerable<object[]> ThrowsWhenPackageIsLatest_Data\n- {\n- get\n- {\n- foreach (var latestState in Enum.GetValues(typeof(PackageLatestState)).Cast<PackageLatestState>())\n- {\n- if (latestState == PackageLatestState.Not)\n- {\n- continue;\n- }\n-\n- yield return MemberDataHelper.AsData(latestState);\n- }\n- }\n- }\n-\n- [Theory]\n- [MemberData(nameof(ThrowsWhenPackageIsLatest_Data))]\n- public async Task ThrowsWhenPackageIsLatest(PackageLatestState latestState)\n- {\n- var packageRegistration = new PackageRegistration { Id = \"theId\" };\n- var package = new Package\n- {\n- Version = \"1.0\",\n- PackageRegistration = packageRegistration,\n- Listed = false\n- };\n-\n- SetLatestOfPackage(package, latestState);\n-\n- var service = Get<PackageUpdateService>();\n-\n- await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.MarkPackageListedAsync(package));\n- }\n-\n[Fact]\npublic async Task WritesAnAuditRecord()\n{\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Do not throw if trying to list an unlisted package that is marked latest (#7566) |
455,737 | 18.09.2019 11:16:28 | 25,200 | 8af925c564bad3ca30e7949caed836441d0ee2e0 | Enable sending mails to users. | [
{
"change_type": "MODIFY",
"old_path": "src/AccountDeleter/AccountDeleteMessageHandler.cs",
"new_path": "src/AccountDeleter/AccountDeleteMessageHandler.cs",
"diff": "@@ -80,8 +80,7 @@ public async Task<bool> HandleAsync(AccountDeleteMessage command)\nvar configuration = _accountDeleteConfigurationAccessor.Value;\nvar senderAddress = configuration.EmailConfiguration.GalleryOwner;\nvar ccEmail = new List<MailAddress>();\n- // toEmail.Add(new MailAddress(recipientEmail)); // Temporarily disable sending to end user while we are in phase 1.\n- toEmail.Add(new MailAddress(senderAddress)); // Remove this when we switch to phase 2.\n+ toEmail.Add(new MailAddress(recipientEmail));\nccEmail.Add(new MailAddress(senderAddress));\nvar recipients = new EmailRecipients(toEmail, ccEmail);\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Enable sending mails to users. (#7563) |
455,732 | 20.09.2019 17:39:17 | -10,800 | 9391dd65ec2d3447f71fb16a8e3c914e65b2fc44 | Render dotnet-new-install for template packages
* Render dotnet-new-install for template packages
* Use tool name instead of action in title
Address | [
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Helpers/ViewModelExtensions/DisplayPackageViewModelFactory.cs",
"new_path": "src/NuGetGallery/Helpers/ViewModelExtensions/DisplayPackageViewModelFactory.cs",
"diff": "@@ -93,6 +93,7 @@ public DisplayPackageViewModelFactory(IIconUrlProvider iconUrlProvider)\nviewModel.DownloadsPerDay = viewModel.TotalDownloadCount / viewModel.TotalDaysSinceCreated; // for the package\nviewModel.DownloadsPerDayLabel = viewModel.DownloadsPerDay < 1 ? \"<1\" : viewModel.DownloadsPerDay.ToNuGetNumberString();\nviewModel.IsDotnetToolPackageType = package.PackageTypes.Any(e => e.Name.Equals(\"DotnetTool\", StringComparison.OrdinalIgnoreCase));\n+ viewModel.IsDotnetNewTemplatePackageType = package.PackageTypes.Any(e => e.Name.Equals(\"Template\", StringComparison.OrdinalIgnoreCase));\n}\nif (deprecation != null)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs",
"diff": "@@ -31,6 +31,7 @@ public class DisplayPackageViewModel : ListPackageItemViewModel\npublic bool HasSemVer2Version { get; set; }\npublic bool HasSemVer2Dependency { get; set; }\npublic bool IsDotnetToolPackageType { get; set; }\n+ public bool IsDotnetNewTemplatePackageType { get; set; }\npublic bool IsAtomFeedEnabled { get; set; }\npublic bool IsPackageDeprecationEnabled { get; set; }\npublic bool IsGitHubUsageEnabled { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "CommandPrefix = \"> \",\nInstallPackageCommand = string.Format(\"dotnet tool install --global {0} --version {1}\", Model.Id, Model.Version),\nAlertLevel = AlertLevel.Info,\n- AlertMessage = string.Format(\"This package contains a <a href=\\\"{0}\\\">.NET Core Global Tool</a> you can call from the shell/command line.\", \"https://aka.ms/global-tools\"),\n+ AlertMessage = \"This package contains a <a href='https://aka.ms/global-tools'>.NET Core Global Tool</a> you can call from the shell/command line.\",\n+ }\n+ };\n+ }\n+ else if (Model.IsDotnetNewTemplatePackageType)\n+ {\n+ packageManagers = new PackageManagerViewModel[]\n+ {\n+ new PackageManagerViewModel(\".NET CLI\")\n+ {\n+ Id = \"dotnet-cli\",\n+ CommandPrefix = \"> \",\n+ InstallPackageCommand = string.Format(\"dotnet new --install {0}::{1}\", Model.Id, Model.Version),\n+ AlertLevel = AlertLevel.Info,\n+ AlertMessage = \"This package contains a <a href='https://aka.ms/dotnet-new'>.NET Core Template Package</a> you can call from the shell/command line.\",\n}\n};\n}\n"
}
]
| C# | Apache License 2.0 | nuget/nugetgallery | Render dotnet-new-install for template packages (#7548)
* Render dotnet-new-install for template packages
* Use tool name instead of action in title
Address https://github.com/NuGet/NuGetGallery/issues/5216 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.