Social login revisions.

Author: hikalkan

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs

@@ -84,7 +84,8 @@ public ActionResult Login(string userNameOrEmailAddress = "", string returnUrl =
             {
                 ReturnUrl = returnUrl,
                 IsMultiTenancyEnabled = _multiTenancyConfig.IsEnabled,
-                IsSelfRegistrationAllowed = IsSelfRegistrationEnabled()
+                IsSelfRegistrationAllowed = IsSelfRegistrationEnabled(),
+                MultiTenancySide = AbpSession.MultiTenancySide
             });
         }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Account/LoginFormViewModel.cs

@@ -1,4 +1,6 @@
-namespace AbpCompanyName.AbpProjectName.Web.Models.Account
+using Abp.MultiTenancy;
+
+namespace AbpCompanyName.AbpProjectName.Web.Models.Account
 {
     public class LoginFormViewModel
     {
@@ -7,5 +9,7 @@ public class LoginFormViewModel
         public bool IsMultiTenancyEnabled { get; set; }
 
         public bool IsSelfRegistrationAllowed { get; set; }
+
+        public MultiTenancySides MultiTenancySide { get; set; }
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Login.cshtml

@@ -1,4 +1,6 @@
-@using Abp.Authorization.Users
+@using Abp.Extensions
+@using Abp.Authorization.Users
+@using Abp.MultiTenancy
 @model AbpCompanyName.AbpProjectName.Web.Models.Account.LoginFormViewModel
 @section Styles
 {
@@ -61,5 +63,45 @@
                 </div>
             }
         </form>
+
+        @{
+            var loginProviders = Context.Authentication
+                .GetAuthenticationSchemes()
+                .Where(s => !s.DisplayName.IsNullOrWhiteSpace())
+                .ToList();
+
+            Func<string, string> getSocialIconClass = (provider) =>
+            {
+                provider = provider.ToLowerInvariant();
+
+                if (provider == "microsoft")
+                {
+                    return "windows";
+                }
+
+                return provider;
+            };
+        }
+
+        @if (Model.MultiTenancySide == MultiTenancySides.Tenant && loginProviders.Count > 0)
+        {
+            <div class="login-options">
+                <h4>@L("OrLoginWith")</h4>
+                <ul class="social-icons">
+                    <form asp-action="ExternalLogin" method="post">
+                        <input type="hidden" name="returnUrl" value="@ViewBag.ReturnUrl" />
+                        <input type="hidden" name="provider" value="" />
+
+                        @foreach (var p in loginProviders)
+                        {
+                            <a class="btn btn-default btn-sm fa fa-@(getSocialIconClass(p.DisplayName)) social-login-link" title="@p.DisplayName"
+                               data-provider="@p.DisplayName"
+                               href="javascript:;">
+                            </a>
+                        }
+                    </form>
+                </ul>
+            </div>
+        }
     </div>
 </div>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/appsettings.json

@@ -13,16 +13,6 @@
       "ClientId": "",
       "ClientSecret": ""
     },
-    "Twitter": {
-      "IsEnabled": "false",
-      "ConsumerKey": "",
-      "ConsumerSecret": ""
-    },
-    "Microsoft": {
-      "IsEnabled": "false",
-      "ConsumerKey": "",
-      "ConsumerSecret": ""
-    },
     "JwtBearer": {
       "IsEnabled": "true",
       "SecurityKey": "AbpProjectName_C421AAEE0D114E9C",

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.css

@@ -4,4 +4,7 @@
 }
 .social-icons {
   padding-left: 0px;
+}
+.social-icons a.btn-sm {
+  margin-right: 5px;
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.less

@@ -5,4 +5,9 @@
 
 .social-icons {
     padding-left: 0px;
+
+    a.btn-sm {
+        margin-right: 5px;
+    }
 }
+

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.min.css

@@ -1,5 +1,4 @@
 (function () {
-
     $('.tenant-change-component a')
         .click(function (e) {
             e.preventDefault();
@@ -13,5 +12,4 @@
                 error: function (e) { }
             });
         });
-
 })();

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/Default.js

@@ -51,4 +51,8 @@
     });
 
     $.AdminBSB.input.activate(_$form);
+
+    $('#TenantChangeModal').on('shown.bs.modal', function () {
+        _$form.find('input[type=text]:first').focus();
+    });
 })(jQuery);