* Use JsonPropertyName

Author: lukebakken

projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs

@@ -34,6 +34,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -237,35 +238,38 @@ internal class JsonToken
     {
         public JsonToken()
         {
-            access_token = string.Empty;
-            refresh_token = string.Empty;
+            AccessToken = string.Empty;
+            RefreshToken = string.Empty;
         }
 
         public JsonToken(string access_token, string refresh_token, TimeSpan expires_in_span)
         {
-            this.access_token = access_token;
-            this.refresh_token = refresh_token;
-            this.expires_in = (long)expires_in_span.TotalSeconds;
+            AccessToken = access_token;
+            RefreshToken = refresh_token;
+            ExpiresIn = (long)expires_in_span.TotalSeconds;
         }
 
         public JsonToken(string access_token, string refresh_token, long expires_in)
         {
-            this.access_token = access_token;
-            this.refresh_token = refresh_token;
-            this.expires_in = expires_in;
+            AccessToken = access_token;
+            RefreshToken = refresh_token;
+            ExpiresIn = expires_in;
         }
 
-        public string access_token
+        [JsonPropertyName("access_token")]
+        public string AccessToken
         {
             get; set;
         }
 
-        public string refresh_token
+        [JsonPropertyName("refresh_token")]
+        public string RefreshToken
         {
             get; set;
         }
 
-        public long expires_in
+        [JsonPropertyName("expires_in")]
+        public long ExpiresIn
         {
             get; set;
         }

projects/RabbitMQ.Client.OAuth2/Token.cs

@@ -56,23 +56,23 @@ public string AccessToken
         {
             get
             {
-                return _source.access_token;
+                return _source.AccessToken;
             }
         }
 
         public string RefreshToken
         {
             get
             {
-                return _source.refresh_token;
+                return _source.RefreshToken;
             }
         }
 
         public TimeSpan ExpiresIn
         {
             get
             {
-                return TimeSpan.FromSeconds(_source.expires_in);
+                return TimeSpan.FromSeconds(_source.ExpiresIn);
             }
         }
 

projects/Test/OAuth2/TestOAuth2Client.cs

@@ -68,9 +68,9 @@ public async Task TestRequestToken()
 
             IToken token = await _client.RequestTokenAsync();
             Assert.NotNull(token);
-            Assert.Equal(expectedJsonToken.access_token, token.AccessToken);
-            Assert.Equal(expectedJsonToken.refresh_token, token.RefreshToken);
-            Assert.Equal(TimeSpan.FromSeconds(expectedJsonToken.expires_in), token.ExpiresIn);
+            Assert.Equal(expectedJsonToken.AccessToken, token.AccessToken);
+            Assert.Equal(expectedJsonToken.RefreshToken, token.RefreshToken);
+            Assert.Equal(TimeSpan.FromSeconds(expectedJsonToken.ExpiresIn), token.ExpiresIn);
         }
 
         [Fact]
@@ -97,9 +97,9 @@ public async Task TestRefreshToken()
             IToken refreshedToken = await _client.RefreshTokenAsync(token);
             Assert.NotNull(refreshedToken);
             Assert.False(Object.ReferenceEquals(refreshedToken, token));
-            Assert.Equal(responseJsonToken.access_token, refreshedToken.AccessToken);
-            Assert.Equal(responseJsonToken.refresh_token, refreshedToken.RefreshToken);
-            Assert.Equal(TimeSpan.FromSeconds(responseJsonToken.expires_in), refreshedToken.ExpiresIn);
+            Assert.Equal(responseJsonToken.AccessToken, refreshedToken.AccessToken);
+            Assert.Equal(responseJsonToken.RefreshToken, refreshedToken.RefreshToken);
+            Assert.Equal(TimeSpan.FromSeconds(responseJsonToken.ExpiresIn), refreshedToken.ExpiresIn);
         }
 
         [Fact]