Add nullable annotations to Identity.Extensions

Author: pranavkm

src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs

@@ -98,17 +98,17 @@ protected IdentityDbContext() { }
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of User roles.
     /// </summary>
-    public virtual DbSet<TUserRole> UserRoles { get; set; }
+    public virtual DbSet<TUserRole> UserRoles { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of roles.
     /// </summary>
-    public virtual DbSet<TRole> Roles { get; set; }
+    public virtual DbSet<TRole> Roles { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of role claims.
     /// </summary>
-    public virtual DbSet<TRoleClaim> RoleClaims { get; set; }
+    public virtual DbSet<TRoleClaim> RoleClaims { get; set; } = default!;
 
     /// <summary>
     /// Configures the schema needed for the identity framework.

src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs

@@ -26,7 +26,7 @@ public static IdentityBuilder AddEntityFrameworkStores<TContext>(this IdentityBu
         return builder;
     }
 
-    private static void AddStores(IServiceCollection services, Type userType, Type roleType, Type contextType)
+    private static void AddStores(IServiceCollection services, Type userType, Type? roleType, Type contextType)
     {
         var identityUserType = FindGenericBaseType(userType, typeof(IdentityUser<>));
         if (identityUserType == null)
@@ -89,12 +89,11 @@ private static void AddStores(IServiceCollection services, Type userType, Type r
             }
             services.TryAddScoped(typeof(IUserStore<>).MakeGenericType(userType), userStoreType);
         }
-
     }
 
-    private static Type FindGenericBaseType(Type currentType, Type genericBaseType)
+    private static Type? FindGenericBaseType(Type currentType, Type genericBaseType)
     {
-        var type = currentType;
+        Type? type = currentType;
         while (type != null)
         {
             var genericType = type.IsGenericType ? type.GetGenericTypeDefinition() : null;

src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs

@@ -78,24 +78,24 @@ protected IdentityUserContext() { }
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of Users.
     /// </summary>
-    public virtual DbSet<TUser> Users { get; set; }
+    public virtual DbSet<TUser> Users { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of User claims.
     /// </summary>
-    public virtual DbSet<TUserClaim> UserClaims { get; set; }
+    public virtual DbSet<TUserClaim> UserClaims { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of User logins.
     /// </summary>
-    public virtual DbSet<TUserLogin> UserLogins { get; set; }
+    public virtual DbSet<TUserLogin> UserLogins { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the <see cref="DbSet{TEntity}"/> of User tokens.
     /// </summary>
-    public virtual DbSet<TUserToken> UserTokens { get; set; }
+    public virtual DbSet<TUserToken> UserTokens { get; set; } = default!;
 
-    private StoreOptions GetStoreOptions() => this.GetService<IDbContextOptions>()
+    private StoreOptions? GetStoreOptions() => this.GetService<IDbContextOptions>()
                         .Extensions.OfType<CoreOptionsExtension>()
                         .FirstOrDefault()?.ApplicationServiceProvider
                         ?.GetService<IOptions<IdentityOptions>>()
@@ -118,7 +118,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         var storeOptions = GetStoreOptions();
         var maxKeyLength = storeOptions?.MaxLengthForKeys ?? 0;
         var encryptPersonalData = storeOptions?.ProtectPersonalData ?? false;
-        PersonalDataConverter converter = null;
+        PersonalDataConverter? converter = null;
 
         builder.Entity<TUser>(b =>
         {

src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj

@@ -5,7 +5,8 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;entityframeworkcore;identity;membership</PackageTags>
-    <Nullable>disable</Nullable>
+    <NoWarn>$(NoWarn);RS0036</NoWarn>
+
   </PropertyGroup>
 
   <ItemGroup>

src/Identity/EntityFrameworkCore/src/RoleStore.cs

@@ -20,7 +20,7 @@ public class RoleStore<TRole> : RoleStore<TRole, DbContext, string>
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public RoleStore(DbContext context, IdentityErrorDescriber describer = null) : base(context, describer) { }
+    public RoleStore(DbContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
 }
 
 /// <summary>
@@ -37,7 +37,7 @@ public class RoleStore<TRole, TContext> : RoleStore<TRole, TContext, string>
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public RoleStore(TContext context, IdentityErrorDescriber describer = null) : base(context, describer) { }
+    public RoleStore(TContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
 }
 
 /// <summary>
@@ -58,7 +58,7 @@ public class RoleStore<TRole, TContext, TKey> : RoleStore<TRole, TContext, TKey,
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public RoleStore(TContext context, IdentityErrorDescriber describer = null) : base(context, describer) { }
+    public RoleStore(TContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
 }
 
 /// <summary>
@@ -83,7 +83,7 @@ public class RoleStore<TRole, TContext, TKey, TUserRole, TRoleClaim> :
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public RoleStore(TContext context, IdentityErrorDescriber describer = null)
+    public RoleStore(TContext context, IdentityErrorDescriber? describer = null)
     {
         if (context == null)
         {
@@ -211,7 +211,7 @@ protected virtual async Task SaveChanges(CancellationToken cancellationToken)
         {
             throw new ArgumentNullException(nameof(role));
         }
-        return Task.FromResult(ConvertIdToString(role.Id));
+        return Task.FromResult(ConvertIdToString(role.Id)!);
     }
 
     /// <summary>
@@ -255,21 +255,21 @@ protected virtual async Task SaveChanges(CancellationToken cancellationToken)
     /// </summary>
     /// <param name="id">The id to convert.</param>
     /// <returns>An instance of <typeparamref name="TKey"/> representing the provided <paramref name="id"/>.</returns>
-    public virtual TKey ConvertIdFromString(string id)
+    public virtual TKey? ConvertIdFromString(string id)
     {
         if (id == null)
         {
             return default(TKey);
         }
-        return (TKey)TypeDescriptor.GetConverter(typeof(TKey)).ConvertFromInvariantString(id);
+        return (TKey?)TypeDescriptor.GetConverter(typeof(TKey)).ConvertFromInvariantString(id);
     }
 
     /// <summary>
     /// Converts the provided <paramref name="id"/> to its string representation.
     /// </summary>
     /// <param name="id">The id to convert.</param>
     /// <returns>An <see cref="string"/> representation of the provided <paramref name="id"/>.</returns>
-    public virtual string ConvertIdToString(TKey id)
+    public virtual string? ConvertIdToString(TKey id)
     {
         if (id.Equals(default(TKey)))
         {
@@ -284,7 +284,7 @@ public virtual string ConvertIdToString(TKey id)
     /// <param name="id">The role ID to look for.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>A <see cref="Task{TResult}"/> that result of the look up.</returns>
-    public virtual Task<TRole> FindByIdAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
+    public virtual Task<TRole?> FindByIdAsync(string id, CancellationToken cancellationToken = default(CancellationToken))
     {
         cancellationToken.ThrowIfCancellationRequested();
         ThrowIfDisposed();
@@ -298,7 +298,7 @@ public virtual string ConvertIdToString(TKey id)
     /// <param name="normalizedName">The normalized role name to look for.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>A <see cref="Task{TResult}"/> that result of the look up.</returns>
-    public virtual Task<TRole> FindByNameAsync(string normalizedName, CancellationToken cancellationToken = default(CancellationToken))
+    public virtual Task<TRole?> FindByNameAsync(string normalizedName, CancellationToken cancellationToken = default(CancellationToken))
     {
         cancellationToken.ThrowIfCancellationRequested();
         ThrowIfDisposed();

src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs

@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore;
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public UserOnlyStore(DbContext context, IdentityErrorDescriber describer = null) : base(context, describer) { }
+    public UserOnlyStore(DbContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
 }
 
 /// <summary>
@@ -35,7 +35,7 @@ public class UserOnlyStore<TUser, TContext> : UserOnlyStore<TUser, TContext, str
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public UserOnlyStore(TContext context, IdentityErrorDescriber describer = null) : base(context, describer) { }
+    public UserOnlyStore(TContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
 }
 
 /// <summary>
@@ -54,7 +54,7 @@ public class UserOnlyStore<TUser, TContext, TKey> : UserOnlyStore<TUser, TContex
     /// </summary>
     /// <param name="context">The <see cref="DbContext"/>.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
-    public UserOnlyStore(TContext context, IdentityErrorDescriber describer = null) : base(context, describer) { }
+    public UserOnlyStore(TContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
 }
 
 /// <summary>
@@ -93,7 +93,7 @@ public class UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserT
     /// </summary>
     /// <param name="context">The context used to access the store.</param>
     /// <param name="describer">The <see cref="IdentityErrorDescriber"/> used to describe store errors.</param>
-    public UserOnlyStore(TContext context, IdentityErrorDescriber describer = null) : base(describer ?? new IdentityErrorDescriber())
+    public UserOnlyStore(TContext context, IdentityErrorDescriber? describer = null) : base(describer ?? new IdentityErrorDescriber())
     {
         if (context == null)
         {
@@ -226,12 +226,12 @@ protected Task SaveChanges(CancellationToken cancellationToken)
     /// <returns>
     /// The <see cref="Task"/> that represents the asynchronous operation, containing the user matching the specified <paramref name="userId"/> if it exists.
     /// </returns>
-    public override Task<TUser> FindByIdAsync(string userId, CancellationToken cancellationToken = default(CancellationToken))
+    public override Task<TUser?> FindByIdAsync(string userId, CancellationToken cancellationToken = default(CancellationToken))
     {
         cancellationToken.ThrowIfCancellationRequested();
         ThrowIfDisposed();
         var id = ConvertIdFromString(userId);
-        return UsersSet.FindAsync(new object[] { id }, cancellationToken).AsTask();
+        return UsersSet.FindAsync(new object?[] { id }, cancellationToken).AsTask();
     }
 
     /// <summary>
@@ -242,7 +242,7 @@ protected Task SaveChanges(CancellationToken cancellationToken)
     /// <returns>
     /// The <see cref="Task"/> that represents the asynchronous operation, containing the user matching the specified <paramref name="normalizedUserName"/> if it exists.
     /// </returns>
-    public override Task<TUser> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken = default(CancellationToken))
+    public override Task<TUser?> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken = default(CancellationToken))
     {
         cancellationToken.ThrowIfCancellationRequested();
         ThrowIfDisposed();
@@ -264,7 +264,7 @@ public override IQueryable<TUser> Users
     /// <param name="userId">The user's id.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The user if it exists.</returns>
-    protected override Task<TUser> FindUserAsync(TKey userId, CancellationToken cancellationToken)
+    protected override Task<TUser?> FindUserAsync(TKey userId, CancellationToken cancellationToken)
     {
         return Users.SingleOrDefaultAsync(u => u.Id.Equals(userId), cancellationToken);
     }
@@ -277,7 +277,7 @@ protected override Task<TUser> FindUserAsync(TKey userId, CancellationToken canc
     /// <param name="providerKey">The key provided by the <paramref name="loginProvider"/> to identify a user.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The user login if it exists.</returns>
-    protected override Task<TUserLogin> FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, CancellationToken cancellationToken)
+    protected override Task<TUserLogin?> FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, CancellationToken cancellationToken)
     {
         return UserLogins.SingleOrDefaultAsync(userLogin => userLogin.UserId.Equals(userId) && userLogin.LoginProvider == loginProvider && userLogin.ProviderKey == providerKey, cancellationToken);
     }
@@ -289,7 +289,7 @@ protected override Task<TUserLogin> FindUserLoginAsync(TKey userId, string login
     /// <param name="providerKey">The key provided by the <paramref name="loginProvider"/> to identify a user.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The user login if it exists.</returns>
-    protected override Task<TUserLogin> FindUserLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
+    protected override Task<TUserLogin?> FindUserLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
     {
         return UserLogins.SingleOrDefaultAsync(userLogin => userLogin.LoginProvider == loginProvider && userLogin.ProviderKey == providerKey, cancellationToken);
     }
@@ -474,7 +474,7 @@ public override async Task RemoveLoginAsync(TUser user, string loginProvider, st
     /// <returns>
     /// The <see cref="Task"/> for the asynchronous operation, containing the user, if any which matched the specified login provider and key.
     /// </returns>
-    public override async Task<TUser> FindByLoginAsync(string loginProvider, string providerKey,
+    public override async Task<TUser?> FindByLoginAsync(string loginProvider, string providerKey,
         CancellationToken cancellationToken = default(CancellationToken))
     {
         cancellationToken.ThrowIfCancellationRequested();
@@ -495,7 +495,7 @@ public override async Task<TUser> FindByLoginAsync(string loginProvider, string
     /// <returns>
     /// The task object containing the results of the asynchronous lookup operation, the user if any associated with the specified normalized email address.
     /// </returns>
-    public override Task<TUser> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken = default(CancellationToken))
+    public override Task<TUser?> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken = default(CancellationToken))
     {
         cancellationToken.ThrowIfCancellationRequested();
         ThrowIfDisposed();
@@ -537,7 +537,7 @@ join user in Users on userclaims.UserId equals user.Id
     /// <param name="name">The name of the token.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The user token if it exists.</returns>
-    protected override Task<TUserToken> FindTokenAsync(TUser user, string loginProvider, string name, CancellationToken cancellationToken)
+    protected override Task<TUserToken?> FindTokenAsync(TUser user, string loginProvider, string name, CancellationToken cancellationToken)
         => UserTokens.FindAsync(new object[] { user.Id, loginProvider, name }, cancellationToken).AsTask();
 
     /// <summary>