Skip to content

Removing dependency of MongoDatabase from UserStore implementation #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

Removing dependency of MongoDatabase from UserStore implementation #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 59 additions & 28 deletions UserStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,25 @@ public class UserStore<TUser> : UserStore<TUser, IdentityRole, string, IdentityU
/// </summary>
/// <param name="context">The context.</param>
public UserStore(IdentityDbContext context) : base(context.db) { }

/// <summary>
/// Initializes a new instance of the <see cref="UserStore{TUser}"/> class.
/// </summary>
/// <param name="db">The database.</param>
public UserStore(MongoDatabase db) : base(db) { }

/// <summary>
/// Initializes a new instance of the <see cref="UserStore{TUser}"/> class.
/// </summary>
/// <param name="db">The database.</param>
/// <param name="collectionName">The user collection name</param>
public UserStore(MongoDatabase db, string collectionName) : base(db, collectionName) { }

/// <summary>
/// Initializes a new instance of the <see cref="UserStore{TUser}"/> class.
/// </summary>
/// <param name="userCollection">The user collection</param>
public UserStore(MongoCollection<TUser> userCollection) : base(userCollection) { }
}


Expand All @@ -51,12 +65,10 @@ public class UserStore<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim> :
{
#region Private Methods & Variables



/// <summary>
/// The database
/// The user collection
/// </summary>
private readonly MongoDatabase db;
private readonly MongoCollection<TUser> userCollection;

/// <summary>
/// The _disposed
Expand All @@ -76,15 +88,25 @@ public class UserStore<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim> :
/// <summary>
/// Initializes a new instance of the <see cref="UserStore{TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim}"/> class.
/// </summary>
public UserStore(): this(new IdentityDbContext().db) {}
public UserStore() : this(new IdentityDbContext().db) { }

/// <summary>
/// Initializes a new instance of the <see cref="UserStore{TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim}"/> class.
/// </summary>
/// <param name="context">The context.</param>
public UserStore(MongoDatabase context)
/// <param name="collectionName">The user collection name</param>
public UserStore(MongoDatabase context, string collectionName = collectionName)
{
userCollection = context.GetCollection<TUser>(collectionName);
}

/// <summary>
/// Initializes a new instance of the <see cref="UserStore{TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim}"/> class.
/// </summary>
/// <param name="userCollection">The user collection</param>
public UserStore(MongoCollection<TUser> userCollection)
{
db = context;
this.userCollection = userCollection;
}


Expand Down Expand Up @@ -164,7 +186,7 @@ public Task CreateAsync(TUser user)
if (user == null)
throw new ArgumentNullException("user");

db.GetCollection<TUser>(collectionName).Insert(user);
userCollection.Insert(user);

return Task.FromResult(user);
}
Expand All @@ -181,7 +203,7 @@ public Task DeleteAsync(TUser user)
if (user == null)
throw new ArgumentNullException("user");

db.GetCollection(collectionName).Remove((Query.EQ("_id", ObjectId.Parse(user.Id.ToString()))));
userCollection.Remove((Query.EQ("_id", ObjectId.Parse(user.Id.ToString()))));
return Task.FromResult(true);
}

Expand All @@ -193,7 +215,7 @@ public Task DeleteAsync(TUser user)
public Task<TUser> FindByIdAsync(TKey userId)
{
ThrowIfDisposed();
TUser user = db.GetCollection<TUser>(collectionName).FindOne((Query.EQ("_id", ObjectId.Parse(userId.ToString()))));
TUser user = userCollection.FindOne((Query.EQ("_id", ObjectId.Parse(userId.ToString()))));
return Task.FromResult(user);
}

Expand All @@ -205,7 +227,7 @@ public Task<TUser> FindByIdAsync(TKey userId)
public Task<TUser> FindByIdAsync(string userId)
{
ThrowIfDisposed();
TUser user = db.GetCollection<TUser>(collectionName).FindOne((Query.EQ("_id", ObjectId.Parse(userId))));
TUser user = userCollection.FindOne((Query.EQ("_id", ObjectId.Parse(userId))));
return Task.FromResult(user);
}

Expand All @@ -217,8 +239,8 @@ public Task<TUser> FindByIdAsync(string userId)
public Task<TUser> FindByNameAsync(string userName)
{
ThrowIfDisposed();
TUser user = db.GetCollection<TUser>(collectionName).FindOne((Query.EQ("UserName", userName)));

TUser user = userCollection.FindOne((Query.EQ("UserName", userName)));
return Task.FromResult(user);
}

Expand All @@ -228,10 +250,15 @@ public Task<TUser> FindByNameAsync(string userName)
/// <param name="user">The user.</param>
/// <param name="confirmed">if set to <c>true</c> [confirmed].</param>
/// <returns>Task.</returns>
/// <exception cref="System.NotImplementedException"></exception>
/// <exception cref="System.ArgumentNullException">user</exception>
public Task SetEmailConfirmedAsync(TUser user, bool confirmed)
{
throw new NotImplementedException();
this.ThrowIfDisposed();
if (user == null)
throw new ArgumentNullException("user");

user.EmailConfirmed = confirmed;
return Task.FromResult(0);
}

/// <summary>
Expand All @@ -243,7 +270,7 @@ public Task<TUser> FindByEmailAsync(string email)
{
ThrowIfDisposed();

TUser user = db.GetCollection<TUser>(collectionName).FindOne((Query.EQ("Email", email)));
TUser user = userCollection.FindOne((Query.EQ("Email", email)));
return Task.FromResult(user);
}

Expand All @@ -253,10 +280,15 @@ public Task<TUser> FindByEmailAsync(string email)
/// <param name="user">The user.</param>
/// <param name="email">The email.</param>
/// <returns>Task.</returns>
/// <exception cref="System.NotImplementedException"></exception>
/// <exception cref="System.ArgumentNullException">user</exception>
public Task SetEmailAsync(TUser user, string email)
{
throw new NotImplementedException();
ThrowIfDisposed();
if (user == null)
throw new ArgumentNullException("user");

user.Email = email;
return Task.FromResult(0);
}

/// <summary>
Expand All @@ -272,18 +304,21 @@ public Task<string> GetEmailAsync(TUser user)
{
throw new ArgumentException("user");
}
return Task.FromResult<string>(user.Email);
return Task.FromResult(user.Email);
}

/// <summary>
/// Gets the email confirmed asynchronous.
/// </summary>
/// <param name="user">The user.</param>
/// <returns>Task{System.Boolean}.</returns>
/// <exception cref="System.NotImplementedException"></exception>
/// <exception cref="System.ArgumentNullException">user</exception>
public Task<bool> GetEmailConfirmedAsync(TUser user)
{
throw new NotImplementedException();
this.ThrowIfDisposed();
if (user == null)
throw new ArgumentNullException("user");
return Task.FromResult(user.EmailConfirmed);
}

/// <summary>
Expand All @@ -298,7 +333,7 @@ public Task UpdateAsync(TUser user)
if (user == null)
throw new ArgumentNullException("user");

db.GetCollection<TUser>(collectionName).Update(Query.EQ("_id", ObjectId.Parse(user.Id.ToString())), Update.Replace(user), UpdateFlags.Upsert);
userCollection.Update(Query.EQ("_id", ObjectId.Parse(user.Id.ToString())), Update.Replace(user), UpdateFlags.Upsert);

return Task.FromResult(user);
}
Expand Down Expand Up @@ -340,10 +375,7 @@ public Task AddLoginAsync(TUser user, UserLoginInfo login)
public Task<TUser> FindAsync(UserLoginInfo login)
{
TUser user = null;
user =
db.GetCollection<TUser>(collectionName)
.FindOne(Query.And(Query.EQ("Logins.LoginProvider", login.LoginProvider),
Query.EQ("Logins.ProviderKey", login.ProviderKey)));
user = userCollection.FindOne(Query.And(Query.EQ("Logins.LoginProvider", login.LoginProvider), Query.EQ("Logins.ProviderKey", login.ProviderKey)));

return Task.FromResult(user);
}
Expand Down Expand Up @@ -576,7 +608,7 @@ public Task<string> GetPhoneNumberAsync(TUser user)
{
throw new ArgumentNullException("user");
}

return Task.FromResult<string>(user.PhoneNumber);
}

Expand Down Expand Up @@ -649,4 +681,3 @@ public Task<bool> GetTwoFactorEnabledAsync(TUser user)
}
}
}