diff --git a/.gitignore b/.gitignore
index cf6f59024d..a20b3f93d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -257,4 +257,5 @@ src/AbpDesk/AbpDesk.Web.Mvc/Logs
/src/Volo.Abp.Identity.HttpApi.Host/Logs
src/MicroserviceDemo/MicroserviceDemo.Web/Logs/*.txt
src/MicroserviceDemo/MicroserviceDemo.TenantService/Logs/*.txt
-src/MicroserviceDemo/MicroserviceDemo.AuthServer/Logs/*.txt
\ No newline at end of file
+src/MicroserviceDemo/MicroserviceDemo.AuthServer/Logs/*.txt
+src/MicroserviceDemo/MicroserviceDemo.TenancyService/Logs/*.txt
diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index f414740370..f31a1fa152 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -300,6 +300,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroserviceDemo.AuthServer
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Account.Web.IdentityServer", "src\Volo.Abp.Account.Web.IdentityServer\Volo.Abp.Account.Web.IdentityServer.csproj", "{E4AB8A4F-BB59-4BDB-B915-877CE97D8113}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MicroserviceDemo.ConsoleClient", "src\MicroserviceDemo\MicroserviceDemo.ConsoleClient\MicroserviceDemo.ConsoleClient.csproj", "{CD4E755D-D47C-45B1-AFB3-3444FF2E2E39}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -790,6 +792,10 @@ Global
{E4AB8A4F-BB59-4BDB-B915-877CE97D8113}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4AB8A4F-BB59-4BDB-B915-877CE97D8113}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4AB8A4F-BB59-4BDB-B915-877CE97D8113}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CD4E755D-D47C-45B1-AFB3-3444FF2E2E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CD4E755D-D47C-45B1-AFB3-3444FF2E2E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CD4E755D-D47C-45B1-AFB3-3444FF2E2E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CD4E755D-D47C-45B1-AFB3-3444FF2E2E39}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -936,6 +942,7 @@ Global
{76D24E2C-8DB0-48B7-9FC4-02231B8B9F39} = {CA154803-3589-47B3-B7CB-B18F94FE1EB6}
{A177B8B7-ACAD-4F75-B6D4-B72F7BC2E40A} = {3510E248-DC9F-4A07-8134-02E7F5CC5783}
{E4AB8A4F-BB59-4BDB-B915-877CE97D8113} = {DB012309-74FD-4D5A-B843-DD77BF053BF4}
+ {CD4E755D-D47C-45B1-AFB3-3444FF2E2E39} = {3510E248-DC9F-4A07-8134-02E7F5CC5783}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/src/MicroserviceDemo/MicroserviceDemo.ConsoleClient/MicroserviceDemo.ConsoleClient.csproj b/src/MicroserviceDemo/MicroserviceDemo.ConsoleClient/MicroserviceDemo.ConsoleClient.csproj
new file mode 100644
index 0000000000..3d9798a90e
--- /dev/null
+++ b/src/MicroserviceDemo/MicroserviceDemo.ConsoleClient/MicroserviceDemo.ConsoleClient.csproj
@@ -0,0 +1,12 @@
+
+
+
+ Exe
+ netcoreapp2.0
+
+
+
+
+
+
+
diff --git a/src/MicroserviceDemo/MicroserviceDemo.ConsoleClient/Program.cs b/src/MicroserviceDemo/MicroserviceDemo.ConsoleClient/Program.cs
new file mode 100644
index 0000000000..d2611feda0
--- /dev/null
+++ b/src/MicroserviceDemo/MicroserviceDemo.ConsoleClient/Program.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using IdentityModel.Client;
+
+namespace MicroserviceDemo.ConsoleClient
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ RunDemo().Wait();
+ Console.ReadLine();
+ }
+
+ private static async Task RunDemo()
+ {
+ // discover endpoints from metadata
+ var disco = await DiscoveryClient.GetAsync("http://localhost:54307");
+ if (disco.IsError)
+ {
+ Console.WriteLine(disco.Error);
+ return;
+ }
+
+ // request token
+ var tokenClient = new TokenClient(disco.TokenEndpoint, "client", "secret");
+ var tokenResponse = await tokenClient.RequestClientCredentialsAsync("multi-tenancy-api");
+
+ if (tokenResponse.IsError)
+ {
+ Console.WriteLine(tokenResponse.Error);
+ return;
+ }
+
+ Console.WriteLine(tokenResponse.Json);
+
+ // call api
+ var client = new HttpClient();
+ client.SetBearerToken(tokenResponse.AccessToken);
+
+ var response = await client.GetAsync("http://localhost:63877/api/multi-tenancy/tenant?SkipCount=0&MaxResultCount=100");
+ if (!response.IsSuccessStatusCode)
+ {
+ Console.WriteLine(response.StatusCode);
+ }
+ else
+ {
+ var content = await response.Content.ReadAsStringAsync();
+ Console.WriteLine(content);
+ }
+ }
+ }
+}
diff --git a/src/MicroserviceDemo/MicroserviceDemo.Web/MicroservicesDemoWebModule.cs b/src/MicroserviceDemo/MicroserviceDemo.Web/MicroservicesDemoWebModule.cs
index e2cc2c8ca3..670ec04226 100644
--- a/src/MicroserviceDemo/MicroserviceDemo.Web/MicroservicesDemoWebModule.cs
+++ b/src/MicroserviceDemo/MicroserviceDemo.Web/MicroservicesDemoWebModule.cs
@@ -75,7 +75,29 @@ namespace MicroserviceDemo.Web
});
});
- services.AddAuthentication();
+ services.AddAuthentication(options =>
+ {
+ options.DefaultScheme = "Cookies";
+ options.DefaultChallengeScheme = "oidc";
+ })
+ .AddCookie("Cookies")
+ .AddOpenIdConnect("oidc", options =>
+ {
+ options.SignInScheme = "Cookies";
+
+ options.Authority = "http://localhost:54307";
+ options.RequireHttpsMetadata = false;
+
+ options.ClientId = "mvc";
+ options.ClientSecret = "secret";
+ options.ResponseType = "code id_token";
+
+ options.SaveTokens = true;
+ options.GetClaimsFromUserInfoEndpoint = true;
+
+ options.Scope.Add("api1");
+ options.Scope.Add("offline_access");
+ });
services.Configure(configuration);