From d8f3d5b85c65322f84cbb3b1a93e5085fa432218 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sat, 28 Mar 2020 16:00:40 +0300
Subject: [PATCH] changed order of connections

---
 docs/en/Blog-Posts/2020-04-01/Post.md | 76 +++++++++++++--------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/docs/en/Blog-Posts/2020-04-01/Post.md b/docs/en/Blog-Posts/2020-04-01/Post.md
index b57883ac8b..9f1d3d964b 100644
--- a/docs/en/Blog-Posts/2020-04-01/Post.md
+++ b/docs/en/Blog-Posts/2020-04-01/Post.md
@@ -8,10 +8,9 @@ Adding Azure Active Directory is pretty straightforward in Abp framework. Couple
 
 There will be two samples of connections for better covarage;
 
-- **AddOpenIdConnect** (Default Microsoft.AspNetCore.Authentication.OpenIdConnect package)
 - **AddAzureAD** (Microsoft.AspNetCore.Authentication.AzureAD.UI package)
-
-
+- **AddOpenIdConnect** (Default Microsoft.AspNetCore.Authentication.OpenIdConnect package)
+- 
 
 #### **Update your `appsettings.json`**
 
@@ -29,38 +28,6 @@ In your **.Web** application, add the following section filled with your AzureAD
 
 
 
-## AddOpenIdConnect 
-
-Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
-
-````xml
-private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
-        {
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
-
-            context.Services.AddAuthentication()
-                .AddIdentityServerAuthentication(options =>
-                {
-                    options.Authority = configuration["AuthServer:Authority"];
-                    options.RequireHttpsMetadata = false;
-                    options.ApiName = "BookStore";
-                })
-                .AddOpenIdConnect("AzureOpenId", "AzureAD", options =>
-                 {
-                     options.Authority = "https://login.microsoftonline.com/" + configuration["AzureAd:TenantId"];
-                     options.ClientId = configuration["AzureAd:ClientId"];
-                     options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
-                     options.CallbackPath = configuration["AzureAd:CallbackPath"];
-                     options.RequireHttpsMetadata = false;
-                     options.SaveTokens = true;
-                     options.GetClaimsFromUserInfoEndpoint = true;
-                 });
-        }
-````
-
-
-
 ## AddAzureAD
 
 #### **Update your `appsettings.json`**
@@ -103,11 +70,43 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
 
 
+## AddOpenIdConnect 
+
+Modify `ConfigureAuthentication` method of your **BookStoreWebModule** with the following:
+
+````xml
+private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier);
+
+            context.Services.AddAuthentication()
+                .AddIdentityServerAuthentication(options =>
+                {
+                    options.Authority = configuration["AuthServer:Authority"];
+                    options.RequireHttpsMetadata = false;
+                    options.ApiName = "BookStore";
+                })
+                .AddOpenIdConnect("AzureOpenId", "AzureAD", options =>
+                 {
+                     options.Authority = "https://login.microsoftonline.com/" + configuration["AzureAd:TenantId"];
+                     options.ClientId = configuration["AzureAd:ClientId"];
+                     options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+                     options.CallbackPath = configuration["AzureAd:CallbackPath"];
+                     options.RequireHttpsMetadata = false;
+                     options.SaveTokens = true;
+                     options.GetClaimsFromUserInfoEndpoint = true;
+                 });
+        }
+````
+
+
+
 # FAQ
 
 * Help! `GetExternalLoginInfoAsync` returns `null`!
 
-  * **There** can be 2 reasons for this;
+  * There can be 2 reasons for this;
 
     1. You are trying to authenticate against wrong scheme. Check if you set **SignInScheme** to `IdentityConstants.ExternalScheme`:
 
@@ -115,7 +114,7 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
        options.SignInScheme = IdentityConstants.ExternalScheme;
        ````
 
-    2. Your `ClaimTypes.NameIdentifier` is null. Check if you added claim mapping: 
+    2. Your `ClaimTypes.NameIdentifier` is `null`. Check if you added claim mapping: 
 
        ````xml
        JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
@@ -169,5 +168,4 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 
 * Why can't I see **External Register Page** after I sign in from external provider for the first time?
 
-  * ABP framework automatically registers your user with supported email claim from your external authentication provider. You can change this behaviour by [Customizing Login Page in Abp Framework](will be link here).
-
+  * ABP framework automatically registers your user with supported email claim from your external authentication provider. You can change this behavior by [Customizing Login Page in Abp Framework](will be link here).