Enabled lint rule for 'this' checks

hiranya911 · hiranya911 · commit 1b9558aedf6a · 2019-01-21T19:51:53.000-08:00
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/ServiceAccountSignerTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/ServiceAccountSignerTest.cs
@@ -36,7 +36,7 @@ public async Task Signer()
                 "client@test-project.iam.gserviceaccount.com", await signer.GetKeyIdAsync());
             byte[] data = Encoding.UTF8.GetBytes("Hello world");
             byte[] signature = signer.SignDataAsync(data).Result;
-            Assert.True(Verify(data, signature));
+            Assert.True(this.Verify(data, signature));
         }
 
         [Fact]
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs
@@ -222,7 +222,7 @@ internal class MockService : IFirebaseService
 
         public void Delete()
         {
-            Deleted = true;
+            this.Deleted = true;
         }
     }
 
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/MockClock.cs b/FirebaseAdmin/FirebaseAdmin.Tests/MockClock.cs
@@ -24,13 +24,13 @@ public class MockClock : IClock
 
         public MockClock()
         {
-            Now = DateTime.Now;
+            this.Now = DateTime.Now;
         }
 
         public DateTime Now
         {
-            get { return UtcNow.ToLocalTime(); }
-            set { UtcNow = value.ToUniversalTime(); }
+            get { return this.UtcNow.ToLocalTime(); }
+            set { this.UtcNow = value.ToUniversalTime(); }
         }
 
         public DateTime UtcNow
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/MockMessageHandler.cs b/FirebaseAdmin/FirebaseAdmin.Tests/MockMessageHandler.cs
@@ -34,7 +34,7 @@ internal class MockMessageHandler : CountableMessageHandler
     {
         public MockMessageHandler()
         {
-            StatusCode = HttpStatusCode.OK;
+            this.StatusCode = HttpStatusCode.OK;
         }
 
         public delegate void SetHeaders(HttpResponseHeaders header);
@@ -52,32 +52,32 @@ protected override async Task<HttpResponseMessage> SendAsyncCore(
         {
             if (request.Content != null)
             {
-                Request = await request.Content.ReadAsStringAsync();
+                this.Request = await request.Content.ReadAsStringAsync();
             }
             else
             {
-                Request = null;
+                this.Request = null;
             }
 
             var resp = new HttpResponseMessage();
             string json;
-            if (Response is byte[])
+            if (this.Response is byte[])
             {
-                json = Encoding.UTF8.GetString(Response as byte[]);
+                json = Encoding.UTF8.GetString(this.Response as byte[]);
             }
-            else if (Response is string)
+            else if (this.Response is string)
             {
-                json = Response as string;
+                json = this.Response as string;
             }
             else
             {
-                json = NewtonsoftJsonSerializer.Instance.Serialize(Response);
+                json = NewtonsoftJsonSerializer.Instance.Serialize(this.Response);
             }
 
-            resp.StatusCode = StatusCode;
-            if (ApplyHeaders != null)
+            resp.StatusCode = this.StatusCode;
+            if (this.ApplyHeaders != null)
             {
-                ApplyHeaders(resp.Headers);
+                this.ApplyHeaders(resp.Headers);
             }
 
             resp.Content = new StringContent(json, Encoding.UTF8, "application/json");
@@ -104,7 +104,7 @@ protected sealed override Task<HttpResponseMessage> SendAsync(
           HttpRequestMessage request, CancellationToken cancellationToken)
         {
             Interlocked.Increment(ref this.calls);
-            return SendAsyncCore(request, cancellationToken);
+            return this.SendAsyncCore(request, cancellationToken);
         }
 
         protected abstract Task<HttpResponseMessage> SendAsyncCore(
diff --git a/FirebaseAdmin/FirebaseAdmin/AppOptions.cs b/FirebaseAdmin/FirebaseAdmin/AppOptions.cs
@@ -32,9 +32,9 @@ public AppOptions() { }
 
         internal AppOptions(AppOptions options)
         {
-            Credential = options.Credential;
-            ProjectId = options.ProjectId;
-            ServiceAccountId = options.ServiceAccountId;
+            this.Credential = options.Credential;
+            this.ProjectId = options.ProjectId;
+            this.ServiceAccountId = options.ServiceAccountId;
         }
 
         /// <summary>
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseAuth.cs b/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseAuth.cs
@@ -111,7 +111,7 @@ public static FirebaseAuth GetAuth(FirebaseApp app)
         /// 128 characters.</param>
         public async Task<string> CreateCustomTokenAsync(string uid)
         {
-            return await CreateCustomTokenAsync(uid, default(CancellationToken));
+            return await this.CreateCustomTokenAsync(uid, default(CancellationToken));
         }
 
         /// <summary>
@@ -150,7 +150,7 @@ public async Task<string> CreateCustomTokenAsync(string uid)
         public async Task<string> CreateCustomTokenAsync(
             string uid, CancellationToken cancellationToken)
         {
-            return await CreateCustomTokenAsync(uid, null, cancellationToken);
+            return await this.CreateCustomTokenAsync(uid, null, cancellationToken);
         }
 
         /// <summary>
@@ -177,7 +177,7 @@ public async Task<string> CreateCustomTokenAsync(
         public async Task<string> CreateCustomTokenAsync(
             string uid, IDictionary<string, object> developerClaims)
         {
-            return await CreateCustomTokenAsync(uid, developerClaims, default(CancellationToken));
+            return await this.CreateCustomTokenAsync(uid, developerClaims, default(CancellationToken));
         }
 
         /// <summary>
@@ -241,7 +241,7 @@ public async Task<string> CreateCustomTokenAsync(
         /// <param name="idToken">A Firebase ID token string to parse and verify.</param>
         public async Task<FirebaseToken> VerifyIdTokenAsync(string idToken)
         {
-            return await VerifyIdTokenAsync(idToken, default(CancellationToken));
+            return await this.VerifyIdTokenAsync(idToken, default(CancellationToken));
         }
 
         /// <summary>
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseToken.cs b/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseToken.cs
@@ -25,13 +25,13 @@ public sealed class FirebaseToken
     {
         internal FirebaseToken(FirebaseTokenArgs args)
         {
-            Issuer = args.Issuer;
-            Subject = args.Subject;
-            Audience = args.Audience;
-            ExpirationTimeSeconds = args.ExpirationTimeSeconds;
-            IssuedAtTimeSeconds = args.IssuedAtTimeSeconds;
-            Uid = args.Subject;
-            Claims = args.Claims;
+            this.Issuer = args.Issuer;
+            this.Subject = args.Subject;
+            this.Audience = args.Audience;
+            this.ExpirationTimeSeconds = args.ExpirationTimeSeconds;
+            this.IssuedAtTimeSeconds = args.IssuedAtTimeSeconds;
+            this.Uid = args.Subject;
+            this.Claims = args.Claims;
         }
 
         /// <summary>
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseTokenFactory.cs b/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseTokenFactory.cs
@@ -152,7 +152,7 @@ public async Task<string> CreateCustomTokenAsync(
 
         public void Dispose()
         {
-            signer.Dispose();
+            this.signer.Dispose();
         }
 
         internal class CustomTokenPayload : JsonWebToken.Payload
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseTokenVerifier.cs b/FirebaseAdmin/FirebaseAdmin/Auth/FirebaseTokenVerifier.cs
@@ -38,9 +38,6 @@ internal sealed class FirebaseTokenVerifier
         private const string FirebaseAudience = "https://identitytoolkit.googleapis.com/"
             + "google.identity.identitytoolkit.v1.IdentityToolkit";
 
-        // See http://oid-info.com/get/2.16.840.1.101.3.4.2.1
-        private const string Sha256Oid = "2.16.840.1.101.3.4.2.1";
-
         private static readonly IReadOnlyList<string> StandardClaims =
             ImmutableList.Create<string>("iss", "aud", "exp", "iat", "sub", "uid");
 
@@ -54,7 +51,7 @@ internal sealed class FirebaseTokenVerifier
 
         internal FirebaseTokenVerifier(FirebaseTokenVerifierArgs args)
         {
-            ProjectId = args.ProjectId.ThrowIfNullOrEmpty(nameof(args.ProjectId));
+            this.ProjectId = args.ProjectId.ThrowIfNullOrEmpty(nameof(args.ProjectId));
             this.shortName = args.ShortName.ThrowIfNullOrEmpty(nameof(args.ShortName));
             this.operation = args.Operation.ThrowIfNullOrEmpty(nameof(args.Operation));
             this.url = args.Url.ThrowIfNullOrEmpty(nameof(args.Url));
@@ -118,7 +115,7 @@ internal async Task<FirebaseToken> VerifyTokenAsync(
                 + "project as the credential used to initialize this SDK.";
             var verifyTokenMessage = $"See {this.url} for details on how to retrieve a value "
                 + $"{this.shortName}.";
-            var issuer = this.issuer + ProjectId;
+            var issuer = this.issuer + this.ProjectId;
             string error = null;
             if (string.IsNullOrEmpty(header.KeyId))
             {
@@ -142,9 +139,9 @@ internal async Task<FirebaseToken> VerifyTokenAsync(
                 error = $"Firebase {this.shortName} has incorrect algorithm. Expected RS256 but got "
                     + $"{header.Algorithm}. {verifyTokenMessage}";
             }
-            else if (ProjectId != payload.Audience)
+            else if (this.ProjectId != payload.Audience)
             {
-                error = $"{this.shortName} has incorrect audience (aud) claim. Expected {ProjectId} "
+                error = $"{this.shortName} has incorrect audience (aud) claim. Expected {this.ProjectId} "
                     + $"but got {payload.Audience}. {projectIdMessage} {verifyTokenMessage}";
             }
             else if (payload.Issuer != issuer)
@@ -174,7 +171,7 @@ internal async Task<FirebaseToken> VerifyTokenAsync(
                 throw new FirebaseException(error);
             }
 
-            await VerifySignatureAsync(segments, header.KeyId, cancellationToken)
+            await this.VerifySignatureAsync(segments, header.KeyId, cancellationToken)
                 .ConfigureAwait(false);
             var allClaims = JwtUtils.Decode<Dictionary<string, object>>(segments[1]);
 
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/HttpPublicKeySource.cs b/FirebaseAdmin/FirebaseAdmin/Auth/HttpPublicKeySource.cs
@@ -66,26 +66,26 @@ public HttpPublicKeySource(string certUrl, IClock clock, HttpClientFactory clien
         public async Task<IReadOnlyList<PublicKey>> GetPublicKeysAsync(
             CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (cachedKeys == null || clock.UtcNow >= expirationTime)
+            if (this.cachedKeys == null || this.clock.UtcNow >= this.expirationTime)
             {
-                await cacheLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+                await this.cacheLock.WaitAsync(cancellationToken).ConfigureAwait(false);
 
                 try
                 {
-                    var now = clock.UtcNow;
-                    if (cachedKeys == null || now >= expirationTime)
+                    var now = this.clock.UtcNow;
+                    if (this.cachedKeys == null || now >= this.expirationTime)
                     {
-                        using (var httpClient = clientFactory.CreateDefaultHttpClient())
+                        using (var httpClient = this.clientFactory.CreateDefaultHttpClient())
                         {
-                            var response = await httpClient.GetAsync(certUrl, cancellationToken)
+                            var response = await httpClient.GetAsync(this.certUrl, cancellationToken)
                                 .ConfigureAwait(false);
                             response.EnsureSuccessStatusCode();
-                            cachedKeys = ParseKeys(await response.Content.ReadAsStringAsync()
+                            this.cachedKeys = this.ParseKeys(await response.Content.ReadAsStringAsync()
                                 .ConfigureAwait(false));
                             var cacheControl = response.Headers.CacheControl;
                             if (cacheControl?.MaxAge != null)
                             {
-                                expirationTime = now.Add(cacheControl.MaxAge.Value)
+                                this.expirationTime = now.Add(cacheControl.MaxAge.Value)
                                     .Subtract(ClockSkew);
                             }
                         }
@@ -97,11 +97,11 @@ public async Task<IReadOnlyList<PublicKey>> GetPublicKeysAsync(
                 }
                 finally
                 {
-                    cacheLock.Release();
+                    this.cacheLock.Release();
                 }
             }
 
-            return cachedKeys;
+            return this.cachedKeys;
         }
 
         private IReadOnlyList<PublicKey> ParseKeys(string json)
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/IAMSigner.cs b/FirebaseAdmin/FirebaseAdmin/Auth/IAMSigner.cs
@@ -54,7 +54,7 @@ public IAMSigner(HttpClientFactory clientFactory, GoogleCredential credential)
         public async Task<byte[]> SignDataAsync(
             byte[] data, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var keyId = await GetKeyIdAsync(cancellationToken).ConfigureAwait(false);
+            var keyId = await this.GetKeyIdAsync(cancellationToken).ConfigureAwait(false);
             var url = string.Format(SignBlobUrl, keyId);
             var request = new SignBlobRequest
             {
@@ -63,10 +63,10 @@ public async Task<byte[]> SignDataAsync(
 
             try
             {
-                var response = await httpClient.PostJsonAsync(url, request, cancellationToken)
+                var response = await this.httpClient.PostJsonAsync(url, request, cancellationToken)
                     .ConfigureAwait(false);
                 var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                ThrowIfError(response, json);
+                this.ThrowIfError(response, json);
                 var parsed = NewtonsoftJsonSerializer.Instance.Deserialize<SignBlobResponse>(json);
                 return Convert.FromBase64String(parsed.Signature);
             }
@@ -81,7 +81,7 @@ public virtual async Task<string> GetKeyIdAsync(
         {
             try
             {
-                return await keyId.Value.ConfigureAwait(false);
+                return await this.keyId.Value.ConfigureAwait(false);
             }
             catch (Exception e)
             {
@@ -96,7 +96,7 @@ public virtual async Task<string> GetKeyIdAsync(
 
         public void Dispose()
         {
-            httpClient.Dispose();
+            this.httpClient.Dispose();
         }
 
         private static async Task<string> DiscoverServiceAccountIdAsync(
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/PublicKey.cs b/FirebaseAdmin/FirebaseAdmin/Auth/PublicKey.cs
@@ -29,8 +29,8 @@ internal sealed class PublicKey
     {
         public PublicKey(string keyId, RSAKey rsa)
         {
-            Id = keyId;
-            RSA = rsa;
+            this.Id = keyId;
+            this.RSA = rsa;
         }
 
         /// <summary>
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/ServiceAccountSigner.cs b/FirebaseAdmin/FirebaseAdmin/Auth/ServiceAccountSigner.cs
@@ -16,6 +16,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Google.Apis.Auth.OAuth2;
+using Google.Apis.Util;
 
 namespace FirebaseAdmin.Auth
 {
@@ -29,23 +30,18 @@ internal sealed class ServiceAccountSigner : ISigner
 
         public ServiceAccountSigner(ServiceAccountCredential credential)
         {
-            if (credential == null)
-            {
-                throw new ArgumentNullException("Credential must not be null.");
-            }
-
-            this.credential = credential;
+            this.credential = credential.ThrowIfNull(nameof(credential));
         }
 
         public Task<string> GetKeyIdAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            return Task.FromResult(credential.Id);
+            return Task.FromResult(this.credential.Id);
         }
 
         public Task<byte[]> SignDataAsync(byte[] data, CancellationToken cancellationToken = default(CancellationToken))
         {
             cancellationToken.ThrowIfCancellationRequested();
-            var signature = credential.CreateSignature(data);
+            var signature = this.credential.CreateSignature(data);
             return Task.FromResult(Convert.FromBase64String(signature));
         }
 
diff --git a/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs b/FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs
@@ -78,7 +78,7 @@ private FirebaseApp(AppOptions options, string name)
                 this.options.Credential = this.options.Credential.CreateScoped(DefaultScopes);
             }
 
-            Name = name;
+            this.Name = name;
         }
 
         /// <summary>
@@ -237,7 +237,7 @@ public void Delete()
             // Clean up global state
             lock (Apps)
             {
-                Apps.Remove(Name);
+                Apps.Remove(this.Name);
             }
         }
 
@@ -292,12 +292,12 @@ internal T GetOrInit<T>(string id, ServiceFactory<T> initializer)
         /// <returns>A project ID string or null.</returns>
         internal string GetProjectId()
         {
-            if (!string.IsNullOrEmpty(Options.ProjectId))
+            if (!string.IsNullOrEmpty(this.Options.ProjectId))
             {
-                return Options.ProjectId;
+                return this.Options.ProjectId;
             }
 
-            var projectId = Options.Credential.ToServiceAccountCredential()?.ProjectId;
+            var projectId = this.Options.Credential.ToServiceAccountCredential()?.ProjectId;
             if (!string.IsNullOrEmpty(projectId))
             {
                 return projectId;
diff --git a/stylecop.ruleset b/stylecop.ruleset
diff --git a/stylecop_test.ruleset b/stylecop_test.ruleset

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public async Task Signer()`
`36`	`36`	`"[email protected]", await signer.GetKeyIdAsync());`
`37`	`37`	`byte[] data = Encoding.UTF8.GetBytes("Hello world");`
`38`	`38`	`byte[] signature = signer.SignDataAsync(data).Result;`
`39`		`- Assert.True(Verify(data, signature));`
	`39`	`+ Assert.True(this.Verify(data, signature));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ internal class MockService : IFirebaseService`
`222`	`222`
`223`	`223`	`public void Delete()`
`224`	`224`	`{`
`225`		`- Deleted = true;`
	`225`	`+ this.Deleted = true;`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@ public class MockClock : IClock`
`24`	`24`
`25`	`25`	`public MockClock()`
`26`	`26`	`{`
`27`		`- Now = DateTime.Now;`
	`27`	`+ this.Now = DateTime.Now;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public DateTime Now`
`31`	`31`	`{`
`32`		`- get { return UtcNow.ToLocalTime(); }`
`33`		`- set { UtcNow = value.ToUniversalTime(); }`
	`32`	`+ get { return this.UtcNow.ToLocalTime(); }`
	`33`	`+ set { this.UtcNow = value.ToUniversalTime(); }`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public DateTime UtcNow`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ internal class MockMessageHandler : CountableMessageHandler`
`34`	`34`	`{`
`35`	`35`	`public MockMessageHandler()`
`36`	`36`	`{`
`37`		`- StatusCode = HttpStatusCode.OK;`
	`37`	`+ this.StatusCode = HttpStatusCode.OK;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public delegate void SetHeaders(HttpResponseHeaders header);`
`@@ -52,32 +52,32 @@ protected override async Task<HttpResponseMessage> SendAsyncCore(`
`52`	`52`	`{`
`53`	`53`	`if (request.Content != null)`
`54`	`54`	`{`
`55`		`- Request = await request.Content.ReadAsStringAsync();`
	`55`	`+ this.Request = await request.Content.ReadAsStringAsync();`
`56`	`56`	`}`
`57`	`57`	`else`
`58`	`58`	`{`
`59`		`- Request = null;`
	`59`	`+ this.Request = null;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`var resp = new HttpResponseMessage();`
`63`	`63`	`string json;`
`64`		`- if (Response is byte[])`
	`64`	`+ if (this.Response is byte[])`
`65`	`65`	`{`
`66`		`- json = Encoding.UTF8.GetString(Response as byte[]);`
	`66`	`+ json = Encoding.UTF8.GetString(this.Response as byte[]);`
`67`	`67`	`}`
`68`		`- else if (Response is string)`
	`68`	`+ else if (this.Response is string)`
`69`	`69`	`{`
`70`		`- json = Response as string;`
	`70`	`+ json = this.Response as string;`
`71`	`71`	`}`
`72`	`72`	`else`
`73`	`73`	`{`
`74`		`- json = NewtonsoftJsonSerializer.Instance.Serialize(Response);`
	`74`	`+ json = NewtonsoftJsonSerializer.Instance.Serialize(this.Response);`
`75`	`75`	`}`
`76`	`76`
`77`		`- resp.StatusCode = StatusCode;`
`78`		`- if (ApplyHeaders != null)`
	`77`	`+ resp.StatusCode = this.StatusCode;`
	`78`	`+ if (this.ApplyHeaders != null)`
`79`	`79`	`{`
`80`		`- ApplyHeaders(resp.Headers);`
	`80`	`+ this.ApplyHeaders(resp.Headers);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`resp.Content = new StringContent(json, Encoding.UTF8, "application/json");`
`@@ -104,7 +104,7 @@ protected sealed override Task<HttpResponseMessage> SendAsync(`
`104`	`104`	`HttpRequestMessage request, CancellationToken cancellationToken)`
`105`	`105`	`{`
`106`	`106`	`Interlocked.Increment(ref this.calls);`
`107`		`- return SendAsyncCore(request, cancellationToken);`
	`107`	`+ return this.SendAsyncCore(request, cancellationToken);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`protected abstract Task<HttpResponseMessage> SendAsyncCore(`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public AppOptions() { }`
`32`	`32`
`33`	`33`	`internal AppOptions(AppOptions options)`
`34`	`34`	`{`
`35`		`- Credential = options.Credential;`
`36`		`- ProjectId = options.ProjectId;`
`37`		`- ServiceAccountId = options.ServiceAccountId;`
	`35`	`+ this.Credential = options.Credential;`
	`36`	`+ this.ProjectId = options.ProjectId;`
	`37`	`+ this.ServiceAccountId = options.ServiceAccountId;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public static FirebaseAuth GetAuth(FirebaseApp app)`
`111`	`111`	`/// 128 characters.</param>`
`112`	`112`	`public async Task<string> CreateCustomTokenAsync(string uid)`
`113`	`113`	`{`
`114`		`- return await CreateCustomTokenAsync(uid, default(CancellationToken));`
	`114`	`+ return await this.CreateCustomTokenAsync(uid, default(CancellationToken));`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/// <summary>`
`@@ -150,7 +150,7 @@ public async Task<string> CreateCustomTokenAsync(string uid)`
`150`	`150`	`public async Task<string> CreateCustomTokenAsync(`
`151`	`151`	`string uid, CancellationToken cancellationToken)`
`152`	`152`	`{`
`153`		`- return await CreateCustomTokenAsync(uid, null, cancellationToken);`
	`153`	`+ return await this.CreateCustomTokenAsync(uid, null, cancellationToken);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/// <summary>`
`@@ -177,7 +177,7 @@ public async Task<string> CreateCustomTokenAsync(`
`177`	`177`	`public async Task<string> CreateCustomTokenAsync(`
`178`	`178`	`string uid, IDictionary<string, object> developerClaims)`
`179`	`179`	`{`
`180`		`- return await CreateCustomTokenAsync(uid, developerClaims, default(CancellationToken));`
	`180`	`+ return await this.CreateCustomTokenAsync(uid, developerClaims, default(CancellationToken));`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`/// <summary>`
`@@ -241,7 +241,7 @@ public async Task<string> CreateCustomTokenAsync(`
`241`	`241`	`/// <param name="idToken">A Firebase ID token string to parse and verify.</param>`
`242`	`242`	`public async Task<FirebaseToken> VerifyIdTokenAsync(string idToken)`
`243`	`243`	`{`
`244`		`- return await VerifyIdTokenAsync(idToken, default(CancellationToken));`
	`244`	`+ return await this.VerifyIdTokenAsync(idToken, default(CancellationToken));`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public async Task<string> CreateCustomTokenAsync(`
`152`	`152`
`153`	`153`	`public void Dispose()`
`154`	`154`	`{`
`155`		`- signer.Dispose();`
	`155`	`+ this.signer.Dispose();`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`internal class CustomTokenPayload : JsonWebToken.Payload`
Original file line number	Diff line number	Diff line change
`@@ -66,26 +66,26 @@ public HttpPublicKeySource(string certUrl, IClock clock, HttpClientFactory clien`
`66`	`66`	`public async Task<IReadOnlyList<PublicKey>> GetPublicKeysAsync(`
`67`	`67`	`CancellationToken cancellationToken = default(CancellationToken))`
`68`	`68`	`{`
`69`		`- if (cachedKeys == null \|\| clock.UtcNow >= expirationTime)`
	`69`	`+ if (this.cachedKeys == null \|\| this.clock.UtcNow >= this.expirationTime)`
`70`	`70`	`{`
`71`		`- await cacheLock.WaitAsync(cancellationToken).ConfigureAwait(false);`
	`71`	`+ await this.cacheLock.WaitAsync(cancellationToken).ConfigureAwait(false);`
`72`	`72`
`73`	`73`	`try`
`74`	`74`	`{`
`75`		`- var now = clock.UtcNow;`
`76`		`- if (cachedKeys == null \|\| now >= expirationTime)`
	`75`	`+ var now = this.clock.UtcNow;`
	`76`	`+ if (this.cachedKeys == null \|\| now >= this.expirationTime)`
`77`	`77`	`{`
`78`		`- using (var httpClient = clientFactory.CreateDefaultHttpClient())`
	`78`	`+ using (var httpClient = this.clientFactory.CreateDefaultHttpClient())`
`79`	`79`	`{`
`80`		`- var response = await httpClient.GetAsync(certUrl, cancellationToken)`
	`80`	`+ var response = await httpClient.GetAsync(this.certUrl, cancellationToken)`
`81`	`81`	`.ConfigureAwait(false);`
`82`	`82`	`response.EnsureSuccessStatusCode();`
`83`		`- cachedKeys = ParseKeys(await response.Content.ReadAsStringAsync()`
	`83`	`+ this.cachedKeys = this.ParseKeys(await response.Content.ReadAsStringAsync()`
`84`	`84`	`.ConfigureAwait(false));`
`85`	`85`	`var cacheControl = response.Headers.CacheControl;`
`86`	`86`	`if (cacheControl?.MaxAge != null)`
`87`	`87`	`{`
`88`		`- expirationTime = now.Add(cacheControl.MaxAge.Value)`
	`88`	`+ this.expirationTime = now.Add(cacheControl.MaxAge.Value)`
`89`	`89`	`.Subtract(ClockSkew);`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -97,11 +97,11 @@ public async Task<IReadOnlyList<PublicKey>> GetPublicKeysAsync(`
`97`	`97`	`}`
`98`	`98`	`finally`
`99`	`99`	`{`
`100`		`- cacheLock.Release();`
	`100`	`+ this.cacheLock.Release();`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- return cachedKeys;`
	`104`	`+ return this.cachedKeys;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`private IReadOnlyList<PublicKey> ParseKeys(string json)`