Merge remote-tracking branch 'origin/dev' into dev

Author: alexeyzimarev

.github/workflows/build-dev.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v3
       -  
         name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '6.0'
       -

.github/workflows/pull-request.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v3
       -  
         name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '6.0'
       -  

docs/usage.md

@@ -48,8 +48,8 @@ public class TwitterAuthenticator : AuthenticatorBase {
     }
 
     protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken) {
-        var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
-        return new HeaderParameter(KnownHeaders.Authorization, token);
+        Token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
+        return new HeaderParameter(KnownHeaders.Authorization, Token);
     }
 }
 ```

src/RestSharp/Authenticators/JwtAuthenticator.cs

@@ -28,7 +28,7 @@ public JwtAuthenticator(string accessToken) : base(GetToken(accessToken)) { }
     [PublicAPI]
     public void SetBearerToken(string accessToken) => Token = GetToken(accessToken);
 
-    static string GetToken(string accessToken) => $"Bearer {Ensure.NotEmpty(accessToken, nameof(accessToken))}";
+    static string GetToken(string accessToken) => Ensure.NotEmpty(accessToken, nameof(accessToken)).StartsWith("Bearer ") ? accessToken : $"Bearer {accessToken}";
 
     protected override ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
         => new(new HeaderParameter(KnownHeaders.Authorization, accessToken));

test/RestSharp.Tests/JwtAuthTests.cs

@@ -34,6 +34,20 @@ public async Task Can_Set_ValidFormat_Auth_Header() {
         Assert.True(authParam.Type == ParameterType.HttpHeader);
         Assert.Equal(_expectedAuthHeaderContent, authParam.Value);
     }
+    
+    [Fact]
+    public async Task Can_Set_ValidFormat_Auth_Header_With_Bearer_Prefix() {
+        var client  = new RestClient { Authenticator = new JwtAuthenticator($"Bearer {_testJwt}") };
+        var request = new RestRequest();
+
+        //In real case client.Execute(request) will invoke Authenticate method
+        await client.Authenticator.Authenticate(client, request);
+
+        var authParam = request.Parameters.Single(p => p.Name.Equals(KnownHeaders.Authorization, StringComparison.OrdinalIgnoreCase));
+
+        Assert.True(authParam.Type == ParameterType.HttpHeader);
+        Assert.Equal(_expectedAuthHeaderContent, authParam.Value);
+    }
 
     [Fact]
     public async Task Check_Only_Header_Authorization() {