Driver update to v-2.0 beta

Author: iiwaasnet

src/AspNet.Identity.MongoDB.sln.DotSettings

@@ -4,6 +4,6 @@
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Shared/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Shared"&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_IMPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;VBOptimizeImports&gt;True&lt;/VBOptimizeImports&gt;&lt;VBShortenReferences&gt;True&lt;/VBShortenReferences&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;VBFormatDocComments&gt;True&lt;/VBFormatDocComments&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;/Profile&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Shared</s:String>
+	
+	
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/AspNet.Identity.MongoDB/AspNet.Identity.MongoDB.csproj

@@ -49,10 +49,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MongoDB.Driver.Core.2.0.0-beta3\lib\net45\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver.Legacy, Version=2.0.0.741, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\mongocsharpdriver.2.0.0-beta3\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -62,6 +58,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="UsersContext.cs" />
+    <Compile Include="RolesContext.cs" />
     <Compile Include="IdentityContext.cs" />
     <Compile Include="IdentityRole.cs" />
     <Compile Include="IdentityUser.cs" />

src/AspNet.Identity.MongoDB/IdentityContext.cs

@@ -3,29 +3,29 @@
 	using System;
 	using global::MongoDB.Driver;
 
-	public class IdentityContext
-	{
-		public MongoCollection Users { get; set; }
-		public MongoCollection Roles { get; set; }
+    //public class IdentityContext
+    //{
+    //    public MongoCollection Users { get; set; }
+    //    public MongoCollection Roles { get; set; }
 
-		public IdentityContext()
-		{
-		}
+    //    public IdentityContext()
+    //    {
+    //    }
 
-		public IdentityContext(MongoCollection users)
-		{
-			Users = users;
-		}
+    //    public IdentityContext(MongoCollection users)
+    //    {
+    //        Users = users;
+    //    }
 
-		public IdentityContext(MongoCollection users, MongoCollection roles) : this(users)
-		{
-			Roles = roles;
-		}
+    //    public IdentityContext(MongoCollection users, MongoCollection roles) : this(users)
+    //    {
+    //        Roles = roles;
+    //    }
 
-		[Obsolete("Use IndexChecks.EnsureUniqueIndexOnEmail")]
-		public void EnsureUniqueIndexOnEmail()
-		{
-			IndexChecks.EnsureUniqueIndexOnEmail(Users);
-		}
-	}
+    //    [Obsolete("Use IndexChecks.EnsureUniqueIndexOnEmail")]
+    //    public void EnsureUniqueIndexOnEmail()
+    //    {
+    //        IndexChecks.EnsureUniqueIndexOnEmail(Users);
+    //    }
+    //}
 }

src/AspNet.Identity.MongoDB/IndexChecks.cs

@@ -1,29 +1,40 @@
 namespace AspNet.Identity.MongoDB
 {
-	using global::MongoDB.Driver;
-	using global::MongoDB.Driver.Builders;
+    using global::MongoDB.Driver;
 
-	public class IndexChecks
-	{
-		public static void EnsureUniqueIndexOnUserName(MongoCollection users)
-		{
-			var userName = new IndexKeysBuilder<IdentityUser>().Ascending(t => t.UserName);
-			var unique = new IndexOptionsBuilder().SetUnique(true);
-			users.CreateIndex(userName, unique);
-		}
+    public static class IndexChecks
+    {
+        public static void EnsureUniqueIndexOnUserName<TUser>(this IMongoCollection<TUser> users)
+            where TUser : IdentityUser
+        {
+            users.Indexes.CreateAsync(new IndexDefinitionBuilder<TUser>().Ascending(u => u.UserName),
+                                      new CreateIndexOptions {Background = true, Unique = true});
 
-		public static void EnsureUniqueIndexOnRoleName(MongoCollection roles)
-		{
-			var roleName = new IndexKeysBuilder<IdentityRole>().Ascending(t => t.Name);
-			var unique = new IndexOptionsBuilder().SetUnique(true);
-			roles.CreateIndex(roleName, unique);
-		}
+            //var userName = new IndexKeysBuilder<IdentityUser>().Ascending(t => t.UserName);
+            //var unique = new IndexOptionsBuilder().SetUnique(true);
+            //users.CreateIndex(userName, unique);
+        }
 
-		public static void EnsureUniqueIndexOnEmail(MongoCollection users)
-		{
-			var email = new IndexKeysBuilder<IdentityUser>().Ascending(t => t.Email);
-			var unique = new IndexOptionsBuilder().SetUnique(true);
-			users.CreateIndex(email, unique);
-		}
-	}
+        public static void EnsureUniqueIndexOnRoleName<TRole>(this IMongoCollection<TRole> roles)
+            where TRole : IdentityRole
+        {
+            roles.Indexes.CreateAsync(new IndexDefinitionBuilder<TRole>().Ascending(r => r.Name),
+                                      new CreateIndexOptions {Background = true, Unique = true});
+
+            //var roleName = new IndexKeysBuilder<IdentityRole>().Ascending(t => t.Name);
+            //var unique = new IndexOptionsBuilder().SetUnique(true);
+            //roles.CreateIndex(roleName, unique);
+        }
+
+        public static void EnsureUniqueIndexOnEmail<TUser>(this IMongoCollection<TUser> users)
+            where TUser : IdentityUser
+        {
+            users.Indexes.CreateAsync(new IndexDefinitionBuilder<TUser>().Ascending(u => u.Email),
+                                      new CreateIndexOptions { Background = true, Unique = true });
+
+            //var email = new IndexKeysBuilder<IdentityUser>().Ascending(t => t.Email);
+            //var unique = new IndexOptionsBuilder().SetUnique(true);
+            //users.CreateIndex(email, unique);
+        }
+    }
 }

src/AspNet.Identity.MongoDB/RoleStore.cs

@@ -1,63 +1,74 @@
 namespace AspNet.Identity.MongoDB
 {
-	using System.Linq;
-	using System.Threading.Tasks;
-	using global::MongoDB.Bson;
-	using global::MongoDB.Driver.Builders;
-	using global::MongoDB.Driver.Linq;
-	using Microsoft.AspNet.Identity;
-
-	/// <summary>
-	///     Note: Deleting and updating do not modify the roles stored on a user document. If you desire this dynamic
-	///     capability, override the appropriate operations on RoleStore as desired for your application. For example you could
-	///     perform a document modification on the users collection before a delete or a rename.
-	/// </summary>
-	/// <typeparam name="TRole"></typeparam>
-	public class RoleStore<TRole> : IRoleStore<TRole>, IQueryableRoleStore<TRole>
-		where TRole : IdentityRole
-	{
-		private readonly IdentityContext _Context;
-
-		public RoleStore(IdentityContext context)
-		{
-			_Context = context;
-		}
-
-		public virtual IQueryable<TRole> Roles
-		{
-			get { return _Context.Roles.AsQueryable<TRole>(); }
-		}
-
-		public virtual void Dispose()
-		{
-			// no need to dispose of anything, mongodb handles connection pooling automatically
-		}
-
-		public virtual Task CreateAsync(TRole role)
-		{
-			return Task.Run(() => _Context.Roles.Insert(role));
-		}
-
-		public virtual Task UpdateAsync(TRole role)
-		{
-			return Task.Run(() => _Context.Roles.Save(role));
-		}
-
-		public virtual Task DeleteAsync(TRole role)
-		{
-			var queryById = Query<TRole>.EQ(r => r.Id, role.Id);
-			return Task.Run(() => _Context.Roles.Remove(queryById));
-		}
-
-		public virtual Task<TRole> FindByIdAsync(string roleId)
-		{
-			return Task.Run(() => _Context.Roles.FindOneByIdAs<TRole>(ObjectId.Parse(roleId)));
-		}
-
-		public virtual Task<TRole> FindByNameAsync(string roleName)
-		{
-			var queryByName = Query<TRole>.EQ(r => r.Name, roleName);
-			return Task.Run(() => _Context.Roles.FindOneAs<TRole>(queryByName));
-		}
-	}
+    using System.Threading.Tasks;
+    using global::MongoDB.Driver;
+    using Microsoft.AspNet.Identity;
+
+    /// <summary>
+    ///     Note: Deleting and updating do not modify the roles stored on a user document. If you desire this dynamic
+    ///     capability, override the appropriate operations on RoleStore as desired for your application. For example you could
+    ///     perform a document modification on the users collection before a delete or a rename.
+    /// </summary>
+    /// <typeparam name="TRole"></typeparam>
+    public class RoleStore<TRole> : IRoleStore<TRole>
+        //IQueryableRoleStore<TRole>
+        where TRole : IdentityRole
+    {
+        private readonly RolesContext<TRole> context;
+
+        public RoleStore(RolesContext<TRole> context)
+        {
+            this.context = context;
+        }
+
+        //public virtual IQueryable<TRole> Roles
+        //{
+        //    get { return context.Roles.AsQueryable<TRole>(); }
+        //}
+
+        public virtual void Dispose()
+        {
+            // no need to dispose of anything, mongodb handles connection pooling automatically
+        }
+
+        public virtual Task CreateAsync(TRole role)
+        {
+            // TODO: Unique index on role name
+
+            return context.Roles.InsertOneAsync(role);
+
+            //return Task.Run(() => context.Roles.Insert(role));
+        }
+
+        public virtual Task UpdateAsync(TRole role)
+        {
+            // TODO: Unique index on role name
+            return context.Roles.FindOneAndUpdateAsync(r => r.Id == role.Id,
+                                                       new ObjectUpdateDefinition<TRole>(role));
+            //return Task.Run(() => context.Roles.Save(role));
+        }
+
+        public virtual Task DeleteAsync(TRole role)
+        {
+            return context.Roles.FindOneAndDeleteAsync(r => r.Id == role.Id);
+
+            //var queryById = Query<TRole>.EQ(r => r.Id, role.Id);
+            //return Task.Run(() => context.Roles.Remove(queryById));
+        }
+
+        public virtual Task<TRole> FindByIdAsync(string roleId)
+        {
+            return context.Roles.Find(r => r.Id == roleId).FirstOrDefaultAsync();
+
+            //return Task.Run(() => context.Roles.FindOneByIdAs<TRole>(ObjectId.Parse(roleId)));
+        }
+
+        public virtual Task<TRole> FindByNameAsync(string roleName)
+        {
+            return context.Roles.Find(r => r.Name == roleName).SingleOrDefaultAsync();
+
+            //var queryByName = Query<TRole>.EQ(r => r.Name, roleName);
+            //return Task.Run(() => context.Roles.FindOneAs<TRole>(queryByName));
+        }
+    }
 }

src/AspNet.Identity.MongoDB/RolesContext.cs

@@ -0,0 +1,14 @@
+namespace AspNet.Identity.MongoDB
+{
+    using global::MongoDB.Driver;
+
+    public class RolesContext<TRole>
+    {
+        public RolesContext(IMongoCollection<TRole> roles)
+        {
+            Roles = roles;
+        }
+
+        public IMongoCollection<TRole> Roles { get; private set; }
+    }
+}