* Fixup TestRefreshToken

Author: lukebakken

projects/Test/OAuth2/TestOAuth2Client.cs

@@ -76,7 +76,12 @@ public async Task TestRequestToken()
         [Fact]
         public async Task TestRefreshToken()
         {
-            JsonToken expectedJsonToken = new JsonToken("the_access_token", "the_refresh_token", TimeSpan.FromSeconds(10));
+            const string accessToken0 = "the_access_token";
+            const string accessToken1 = "the_access_token_2";
+            const string refreshToken = "the_refresh_token";
+
+            JsonToken expectedJsonToken = new JsonToken(accessToken0, refreshToken, TimeSpan.FromSeconds(10));
+
             ExpectTokenRequest(new RequestFormMatcher()
                             .WithParam("client_id", _client_id)
                             .WithParam("client_secret", _client_secret)
@@ -86,12 +91,12 @@ public async Task TestRefreshToken()
             IToken token = await _client.RequestTokenAsync();
             _oauthServer.Reset();
 
-            JsonToken responseJsonToken = new JsonToken("the_access_token2", "the_refresh_token", TimeSpan.FromSeconds(20));
-            ExpectTokenRequest(new RequestFormMatcher()
+            JsonToken responseJsonToken = new JsonToken(accessToken1, refreshToken, TimeSpan.FromSeconds(20));
+            ExpectTokenRefresh(new RequestFormMatcher()
                             .WithParam("client_id", _client_id)
                             .WithParam("client_secret", _client_secret)
                             .WithParam("grant_type", "refresh_token")
-                            .WithParam("refresh_token", "the_refresh_token"),
+                            .WithParam("refresh_token", refreshToken),
                             responseJsonToken);
 
             IToken refreshedToken = await _client.RefreshTokenAsync(token);
@@ -147,19 +152,13 @@ private void ExpectTokenRequest(RequestFormMatcher expectedRequestBody, JsonToke
                 );
         }
 
-        /*
-         * TODO - remove
-        private void ExpectTokenRefresh(JsonToken expectedResponse)
+        private void ExpectTokenRefresh(RequestFormMatcher expectedRequestBody, JsonToken expectedResponse)
         {
             _oauthServer
                 .Given(
                     Request.Create()
                         .WithPath("/token")
-                        .WithParam("client_id", _client_id)
-                        .WithParam("client_secret", _client_secret)
-                        .WithParam("grant_type", "refresh_token")
-                        .WithParam("refresh_token", expectedResponse.refresh_token)
-                        .WithHeader("content_type", "application/x-www-form-urlencoded")
+                        .WithBody(expectedRequestBody.Matcher())
                         .UsingPost()
                 )
                 .RespondWith(
@@ -169,6 +168,5 @@ private void ExpectTokenRefresh(JsonToken expectedResponse)
                     .WithBody(JsonSerializer.Serialize(expectedResponse))
                 );
         }
-        */
     }
 }