feat: resolve prefix conflicts (#13)

Farfetch · Feb 1, 2022 · fddf009 · fddf009
1 parent 9ad1194
commit fddf009
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 68 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,10 +20,10 @@ jobs:
         dotnet-version: '6.0.x'
 
     - name: Install dependencies
-      run: dotnet restore ./IdentityServer.Contrib.TokenExchange.sln
+      run: dotnet restore ./Farfetch.IdentityServer.Contrib.TokenExchange.sln
 
     - name: Build
-      run: dotnet build ./IdentityServer.Contrib.TokenExchange.sln -c Release
+      run: dotnet build ./Farfetch.IdentityServer.Contrib.TokenExchange.sln -c Release
 
     - name: Test
-      run: dotnet test tests/IdentityServer.Contrib.TokenExchange.Tests/IdentityServer.Contrib.TokenExchange.Tests.csproj -c Release --no-restore --verbosity normal
+      run: dotnet test tests/Farfetch.IdentityServer.Contrib.TokenExchange.Tests/Farfetch.IdentityServer.Contrib.TokenExchange.Tests.csproj -c Release --no-restore --verbosity normal
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,13 +17,13 @@ jobs:
         dotnet-version: '6.0.x'
 
     - name: Install dependencies
-      run: dotnet restore ./IdentityServer.Contrib.TokenExchange.sln
+      run: dotnet restore ./Farfetch.IdentityServer.Contrib.TokenExchange.sln
 
     - name: Test
-      run: dotnet test tests/IdentityServer.Contrib.TokenExchange.Tests/IdentityServer.Contrib.TokenExchange.Tests.csproj -c Release --no-restore --verbosity normal
+      run: dotnet test tests/Farfetch.IdentityServer.Contrib.TokenExchange.Tests/Farfetch.IdentityServer.Contrib.TokenExchange.Tests.csproj -c Release --no-restore --verbosity normal
 
     - name: Pack
-      run: dotnet pack ./IdentityServer.Contrib.TokenExchange.sln -c Release /p:Version=${{ github.event.release.tag_name }} -o ./drop
+      run: dotnet pack ./Farfetch.IdentityServer.Contrib.TokenExchange.sln -c Release /p:Version=${{ github.event.release.tag_name }} -o ./drop
 
     - name: Publish
       run: dotnet nuget push */*.nupkg -k ${{ secrets.NUGET_PUBLISH_KEY }} -s https://api.nuget.org/v3/index.json

diff --git a/IdentityServer.Contrib.TokenExchange.sln → ....IdentityServer.Contrib.TokenExchange.sln b/IdentityServer.Contrib.TokenExchange.sln → ....IdentityServer.Contrib.TokenExchange.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.Contrib.TokenExchange", "src\IdentityServer.Contrib.TokenExchange\IdentityServer.Contrib.TokenExchange.csproj", "{3C7F98F2-9B59-4F7C-B0DC-3F792DF29FEB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Farfetch.IdentityServer.Contrib.TokenExchange", "src\Farfetch.IdentityServer.Contrib.TokenExchange\Farfetch.IdentityServer.Contrib.TokenExchange.csproj", "{3C7F98F2-9B59-4F7C-B0DC-3F792DF29FEB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.Contrib.TokenExchange.Tests", "tests\IdentityServer.Contrib.TokenExchange.Tests\IdentityServer.Contrib.TokenExchange.Tests.csproj", "{FED3EE81-CF40-423E-B9E2-1F458300C05F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Farfetch.IdentityServer.Contrib.TokenExchange.Tests", "tests\Farfetch.IdentityServer.Contrib.TokenExchange.Tests\Farfetch.IdentityServer.Contrib.TokenExchange.Tests.csproj", "{FED3EE81-CF40-423E-B9E2-1F458300C05F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3C7F98F2-9B59-4F7C-B0DC-3F792DF29FEB} = {3C7F98F2-9B59-4F7C-B0DC-3F792DF29FEB}
 	EndProjectSection

diff --git a/...ge/Builders/TokenExchangeResultBuilder.cs → ...ge/Builders/TokenExchangeResultBuilder.cs b/...ge/Builders/TokenExchangeResultBuilder.cs → ...ge/Builders/TokenExchangeResultBuilder.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Builders
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Builders
 {
     using System;
     using System.Collections.Generic;
@@ -9,13 +9,13 @@
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;
 
-    using IdentityModel;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Config;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Extensions;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Models;
 
-    using IdentityServer.Contrib.TokenExchange.Config;
-    using IdentityServer.Contrib.TokenExchange.Constants;
-    using IdentityServer.Contrib.TokenExchange.Extensions;
-    using IdentityServer.Contrib.TokenExchange.Interfaces;
-    using IdentityServer.Contrib.TokenExchange.Models;
+    using IdentityModel;
 
     using Microsoft.Extensions.Logging;
 

diff --git a/...ntityServerBuilderExtensionsAdditional.cs → ...ntityServerBuilderExtensionsAdditional.cs b/...ntityServerBuilderExtensionsAdditional.cs → ...ntityServerBuilderExtensionsAdditional.cs
@@ -2,11 +2,11 @@
 {
     using Duende.IdentityServer.Validation;
 
-    using IdentityServer.Contrib.TokenExchange;
-    using IdentityServer.Contrib.TokenExchange.Builders;
-    using IdentityServer.Contrib.TokenExchange.Config;
-    using IdentityServer.Contrib.TokenExchange.Interfaces;
-    using IdentityServer.Contrib.TokenExchange.Validators;
+    using Farfetch.IdentityServer.Contrib.TokenExchange;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Builders;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Config;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Validators;
 
     public static class TokenExchangeDependencyInjectionExtensions
     {

diff --git a/...enExchange/Config/TokenExchangeOptions.cs → ...enExchange/Config/TokenExchangeOptions.cs b/...enExchange/Config/TokenExchangeOptions.cs → ...enExchange/Config/TokenExchangeOptions.cs
@@ -1,10 +1,10 @@
-namespace IdentityServer.Contrib.TokenExchange.Config
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Config
 {
     using System.Collections.Generic;
 
-    using IdentityModel;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
 
-    using IdentityServer.Contrib.TokenExchange.Constants;
+    using IdentityModel;
 
     public class TokenExchangeOptions
     {

diff --git a/...hange/Constants/TokenExchangeConstants.cs → ...hange/Constants/TokenExchangeConstants.cs b/...hange/Constants/TokenExchangeConstants.cs → ...hange/Constants/TokenExchangeConstants.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Constants
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Constants
 {
     public static class TokenExchangeConstants
     {

diff --git a/...enExchange/Extensions/ClaimsExtensions.cs → ...enExchange/Extensions/ClaimsExtensions.cs b/...enExchange/Extensions/ClaimsExtensions.cs → ...enExchange/Extensions/ClaimsExtensions.cs
@@ -1,12 +1,12 @@
-namespace IdentityServer.Contrib.TokenExchange.Extensions
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Extensions
 {
     using System.Collections.Generic;
     using System.Linq;
     using System.Security.Claims;
 
-    using IdentityModel;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
 
-    using IdentityServer.Contrib.TokenExchange.Constants;
+    using IdentityModel;
 
     public static class ClaimsExtensions
     {

diff --git a/...entityServer.Contrib.TokenExchange.csproj → ...entityServer.Contrib.TokenExchange.csproj b/...entityServer.Contrib.TokenExchange.csproj → ...entityServer.Contrib.TokenExchange.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <AssemblyName>IdentityServer.Contrib.TokenExchange</AssemblyName>
-    <RootNamespace>IdentityServer.Contrib.TokenExchange</RootNamespace>
-    <PackageId>IdentityServer.Contrib.TokenExchange</PackageId>
+    <AssemblyName>Farfetch.IdentityServer.Contrib.TokenExchange</AssemblyName>
+    <RootNamespace>Farfetch.IdentityServer.Contrib.TokenExchange</RootNamespace>
+    <PackageId>Farfetch.IdentityServer.Contrib.TokenExchange</PackageId>
     <Authors>Farfetch</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Description>Extends Duende Identity Server capabilities by implementing support for Token Exchange following the specifications defined in the RFC 8693 - OAuth 2.0 Token Exchange - https://www.rfc-editor.org/rfc/rfc8693.html.</Description>

diff --git a/...nterfaces/IExtensionGrantResultBuilder.cs → ...nterfaces/IExtensionGrantResultBuilder.cs b/...nterfaces/IExtensionGrantResultBuilder.cs → ...nterfaces/IExtensionGrantResultBuilder.cs
@@ -1,9 +1,9 @@
-namespace IdentityServer.Contrib.TokenExchange.Interfaces
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces
 {
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;
 
-    using IdentityServer.Contrib.TokenExchange.Models;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Models;
 
     public interface IExtensionGrantResultBuilder
     {

diff --git a/...erfaces/ITokenExchangeRequestValidator.cs → ...erfaces/ITokenExchangeRequestValidator.cs b/...erfaces/ITokenExchangeRequestValidator.cs → ...erfaces/ITokenExchangeRequestValidator.cs
@@ -1,10 +1,10 @@
-namespace IdentityServer.Contrib.TokenExchange.Interfaces
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces
 {
     using System.Threading.Tasks;
 
     using Duende.IdentityServer.Validation;
 
-    using IdentityServer.Contrib.TokenExchange.Models;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Models;
 
     public interface ITokenExchangeRequestValidator
     {

diff --git a/...change/Models/TokenExchangeGrantResult.cs → ...change/Models/TokenExchangeGrantResult.cs b/...change/Models/TokenExchangeGrantResult.cs → ...change/Models/TokenExchangeGrantResult.cs
@@ -1,12 +1,12 @@
-namespace IdentityServer.Contrib.TokenExchange.Models
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Models
 {
     using System.Collections.Generic;
     using System.Security.Claims;
 
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;
 
-    using IdentityServer.Contrib.TokenExchange.Constants;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
 
     public class TokenExchangeGrantResult : GrantValidationResult
     {

diff --git a/...xchange/Models/TokenExchangeValidation.cs → ...xchange/Models/TokenExchangeValidation.cs b/...xchange/Models/TokenExchangeValidation.cs → ...xchange/Models/TokenExchangeValidation.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Models
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Models
 {
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;

diff --git a/...ntrib.TokenExchange/TokenExchangeGrant.cs → ...ntrib.TokenExchange/TokenExchangeGrant.cs b/...ntrib.TokenExchange/TokenExchangeGrant.cs → ...ntrib.TokenExchange/TokenExchangeGrant.cs
@@ -1,11 +1,11 @@
-namespace IdentityServer.Contrib.TokenExchange
+namespace Farfetch.IdentityServer.Contrib.TokenExchange
 {
     using System.Threading.Tasks;
 
     using Duende.IdentityServer.Validation;
 
-    using IdentityServer.Contrib.TokenExchange.Constants;
-    using IdentityServer.Contrib.TokenExchange.Interfaces;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces;
 
     public class TokenExchangeGrant : IExtensionGrantValidator
     {

diff --git a/...lidators/TokenExchangeRequestValidator.cs → ...lidators/TokenExchangeRequestValidator.cs b/...lidators/TokenExchangeRequestValidator.cs → ...lidators/TokenExchangeRequestValidator.cs
@@ -1,19 +1,19 @@
-namespace IdentityServer.Contrib.TokenExchange.Validators
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Validators
 {
     using System.Linq;
     using System.Threading.Tasks;
 
     using Duende.IdentityServer.Validation;
 
-    using IdentityModel;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Config;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Models;
 
-    using IdentityServer.Contrib.TokenExchange.Config;
-    using IdentityServer.Contrib.TokenExchange.Interfaces;
-    using IdentityServer.Contrib.TokenExchange.Models;
+    using IdentityModel;
 
     using Microsoft.Extensions.Logging;
 
-    using static IdentityServer.Contrib.TokenExchange.Constants.TokenExchangeConstants;
+    using static Farfetch.IdentityServer.Contrib.TokenExchange.Constants.TokenExchangeConstants;
 
     public class TokenExchangeRequestValidator : ITokenExchangeRequestValidator
     {

diff --git a/...uilder/TokenExchangeResultBuilderTests.cs → ...uilder/TokenExchangeResultBuilderTests.cs b/...uilder/TokenExchangeResultBuilderTests.cs → ...uilder/TokenExchangeResultBuilderTests.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Tests.Builder
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Tests.Builder
 {
     using System;
     using System.Collections.Generic;
@@ -9,13 +9,13 @@ namespace IdentityServer.Contrib.TokenExchange.Tests.Builder
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;
 
-    using IdentityModel;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Builders;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Config;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Extensions;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Tests.Extensions;
 
-    using IdentityServer.Contrib.TokenExchange.Builders;
-    using IdentityServer.Contrib.TokenExchange.Config;
-    using IdentityServer.Contrib.TokenExchange.Constants;
-    using IdentityServer.Contrib.TokenExchange.Extensions;
-    using IdentityServer.Contrib.TokenExchange.Tests.Extensions;
+    using IdentityModel;
 
     using Microsoft.Extensions.Logging;
     using Microsoft.VisualStudio.TestTools.UnitTesting;

diff --git a/....Tests/Extensions/MockLoggerExtensions.cs → ....Tests/Extensions/MockLoggerExtensions.cs b/....Tests/Extensions/MockLoggerExtensions.cs → ....Tests/Extensions/MockLoggerExtensions.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Tests.Extensions
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Tests.Extensions
 {
     using System;
 

diff --git a/...Server.Contrib.TokenExchange.Tests.csproj → ...Server.Contrib.TokenExchange.Tests.csproj b/...Server.Contrib.TokenExchange.Tests.csproj → ...Server.Contrib.TokenExchange.Tests.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\IdentityServer.Contrib.TokenExchange\IdentityServer.Contrib.TokenExchange.csproj" />
+    <ProjectReference Include="..\..\src\Farfetch.IdentityServer.Contrib.TokenExchange\Farfetch.IdentityServer.Contrib.TokenExchange.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Exchange.Tests/TokenExchangeGrantTests.cs → ...Exchange.Tests/TokenExchangeGrantTests.cs b/...Exchange.Tests/TokenExchangeGrantTests.cs → ...Exchange.Tests/TokenExchangeGrantTests.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Tests
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Tests
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -8,13 +8,13 @@ namespace IdentityServer.Contrib.TokenExchange.Tests
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;
 
-    using IdentityModel;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Builders;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Config;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Extensions;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Interfaces;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Models;
 
-    using IdentityServer.Contrib.TokenExchange.Builders;
-    using IdentityServer.Contrib.TokenExchange.Config;
-    using IdentityServer.Contrib.TokenExchange.Extensions;
-    using IdentityServer.Contrib.TokenExchange.Interfaces;
-    using IdentityServer.Contrib.TokenExchange.Models;
+    using IdentityModel;
 
     using Microsoft.Extensions.Logging;
     using Microsoft.VisualStudio.TestTools.UnitTesting;

diff --git a/...ors/TokenExchangeRequestValidatorTests.cs → ...ors/TokenExchangeRequestValidatorTests.cs b/...ors/TokenExchangeRequestValidatorTests.cs → ...ors/TokenExchangeRequestValidatorTests.cs
@@ -1,4 +1,4 @@
-namespace IdentityServer.Contrib.TokenExchange.Tests.Validators
+namespace Farfetch.IdentityServer.Contrib.TokenExchange.Tests.Validators
 {
     using System.Collections.Generic;
     using System.Collections.Specialized;
@@ -8,17 +8,17 @@
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Validation;
 
-    using IdentityServer.Contrib.TokenExchange.Config;
-    using IdentityServer.Contrib.TokenExchange.Constants;
-    using IdentityServer.Contrib.TokenExchange.Tests.Extensions;
-    using IdentityServer.Contrib.TokenExchange.Validators;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Config;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Constants;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Tests.Extensions;
+    using Farfetch.IdentityServer.Contrib.TokenExchange.Validators;
 
     using Microsoft.Extensions.Logging;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     using Moq;
 
-    using static IdentityServer.Contrib.TokenExchange.Constants.TokenExchangeConstants;
+    using static Farfetch.IdentityServer.Contrib.TokenExchange.Constants.TokenExchangeConstants;
 
     [TestClass]
     public class TokenExchangeRequestValidatorTests