Merge pull request #27 from SorenZ/master

configurable user collection
tugberkugurlu · Dec 21, 2016 · 0657852 · 0657852
2 parents 3c440f5 + bb3e050
commit 0657852
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,42 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceRoot}\\samples\\IdentitySample.Mvc\\bin\\Debug\\netcoreapp1.0\\IdentitySample.Mvc.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}\\samples\\IdentitySample.Mvc",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart",
+            "launchBrowser": {
+                "enabled": true,
+                "args": "${auto-detect-url}",
+                "windows": {
+                    "command": "cmd.exe",
+                    "args": "/C start ${auto-detect-url}"
+                },
+                "osx": {
+                    "command": "open"
+                },
+                "linux": {
+                    "command": "xdg-open"
+                }
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceRoot}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command.pickProcess}"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,16 @@
+{
+    "version": "0.1.0",
+    "command": "dotnet",
+    "isShellCommand": true,
+    "args": [],
+    "tasks": [
+        {
+            "taskName": "build",
+            "args": [
+                "${workspaceRoot}\\samples\\IdentitySample.Mvc\\project.json"
+            ],
+            "isBuildCommand": true,
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs
@@ -32,14 +32,14 @@ public Startup(IHostingEnvironment env)
         {
             // Set up configuration sources.
             var builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
+                .SetBasePath(env.ContentRootPath)
                 .AddJsonFile("appsettings.json")
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
 
-            if (env.IsDevelopment())
+            if (env.IsDevelopment() )
             {
                 // For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
-                builder.AddUserSecrets();
+                builder.AddUserSecrets("userSecretsId"); // https://github.com/aspnet/UserSecrets/issues/62
             }
 
             builder.AddEnvironmentVariables();

diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json
@@ -28,7 +28,8 @@
   },
   "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+    "debugType": "portable"
   },
   "frameworks": {
     "netcoreapp1.0": {

diff --git a/src/AspNetCore.Identity.MongoDB/MongoUserStore.cs b/src/AspNetCore.Identity.MongoDB/MongoUserStore.cs
@@ -35,7 +35,11 @@ static MongoUserStore()
             MongoConfig.EnsureConfigured();
         }
 
-        public MongoUserStore(IMongoDatabase database, ILoggerFactory loggerFactory)
+        public MongoUserStore(IMongoDatabase database, ILoggerFactory loggerFactory) 
+            : this (database, loggerFactory, "users")
+        { }
+
+        public MongoUserStore(IMongoDatabase database, ILoggerFactory loggerFactory, string userCollectionName)
         {
             if(database == null)
             {
@@ -47,7 +51,7 @@ public MongoUserStore(IMongoDatabase database, ILoggerFactory loggerFactory)
                 throw new ArgumentNullException(nameof(loggerFactory));
             }
 
-            _usersCollection = database.GetCollection<TUser>("users");
+            _usersCollection = database.GetCollection<TUser>(userCollectionName);
             _logger = loggerFactory.CreateLogger(GetType().Name);
 
             EnsureIndicesCreatedAsync().GetAwaiter().GetResult();

diff --git a/src/AspNetCore.Identity.MongoDB/project.json b/src/AspNetCore.Identity.MongoDB/project.json
@@ -17,5 +17,8 @@
     "frameworks": {
         "net451": { },
         "netstandard1.5": { "imports": "dnxcore50" }
+    },
+    "buildOptions": {
+        "debugType": "portable"
     }
 }