social logins and register page implemented.

Author: ismcagdas

src/AbpCompanyName.AbpProjectName.Web/Controllers/AccountController.cs

@@ -150,18 +150,9 @@ private ActionResult RegisterView(RegisterViewModel model)
         [UnitOfWork]
         public virtual async Task<ActionResult> Register(RegisterViewModel model)
         {
-            #region MyRegion
-
-            /*
-              try
+            try
             {
-                CheckSelfRegistrationIsEnabled();
-
-                if (!model.IsExternalLogin && UseCaptchaOnRegistration())
-                {
-                    await CheckCaptchaResponseAsync(_recaptchaValidationService);
-                }
-
+                //Get tenancy name and tenant
                 if (!_multiTenancyConfig.IsEnabled)
                 {
                     model.TenancyName = Tenant.DefaultTenantName;
@@ -177,140 +168,6 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
 
                 CurrentUnitOfWork.SetTenantId(tenant.Id);
 
-                if (!await SettingManager.GetSettingValueForTenantAsync<bool>(AppSettings.UserManagement.AllowSelfRegistration, tenant.Id))
-                {
-                    throw new UserFriendlyException(L("SelfUserRegistrationIsDisabledMessage_Detail"));
-                }
-
-                //Getting tenant-specific settings
-                var isNewRegisteredUserActiveByDefault = await SettingManager.GetSettingValueForTenantAsync<bool>(AppSettings.UserManagement.IsNewRegisteredUserActiveByDefault, tenant.Id);
-                var isEmailConfirmationRequiredForLogin = await SettingManager.GetSettingValueForTenantAsync<bool>(AbpZeroSettingNames.UserManagement.IsEmailConfirmationRequiredForLogin, tenant.Id);
-
-                var user = new User
-                {
-                    TenantId = tenant.Id,
-                    Name = model.Name,
-                    Surname = model.Surname,
-                    EmailAddress = model.EmailAddress,
-                    IsActive = isNewRegisteredUserActiveByDefault
-                };
-
-                ExternalLoginUserInfo externalLoginInfo = null;
-                if (model.IsExternalLogin)
-                {
-                    externalLoginInfo = await HttpContext.Authentication.GetExternalLoginUserInfo(model.ExternalLoginAuthSchema);
-                    if (externalLoginInfo == null)
-                    {
-                        throw new ApplicationException("Can not external login!");
-                    }
-
-                    user.Logins = new List<UserLogin>
-                    {
-                        new UserLogin
-                        {
-                            LoginProvider = externalLoginInfo.LoginInfo.LoginProvider,
-                            ProviderKey = externalLoginInfo.LoginInfo.ProviderKey,
-                            TenantId = tenant.Id
-                        }
-                    };
-
-                    model.UserName = model.EmailAddress;
-                    model.Password = Authorization.Users.User.CreateRandomPassword();
-
-                    if (string.Equals(externalLoginInfo.EmailAddress, model.EmailAddress, StringComparison.InvariantCultureIgnoreCase))
-                    {
-                        user.IsEmailConfirmed = true;
-                    }
-                }
-                else
-                {
-                    if (model.UserName.IsNullOrEmpty() || model.Password.IsNullOrEmpty())
-                    {
-                        throw new UserFriendlyException(L("FormIsNotValidMessage"));
-                    }
-                }
-
-                user.UserName = model.UserName;
-                user.Password = new PasswordHasher().HashPassword(model.Password);
-
-                user.Roles = new List<UserRole>();
-                foreach (var defaultRole in await _roleManager.Roles.Where(r => r.IsDefault).ToListAsync())
-                {
-                    user.Roles.Add(new UserRole(tenant.Id, user.Id, defaultRole.Id));
-                }
-
-                CheckErrors(await _userManager.CreateAsync(user));
-                await _unitOfWorkManager.Current.SaveChangesAsync();
-
-                if (!user.IsEmailConfirmed)
-                {
-                    user.SetNewEmailConfirmationCode();
-                    await _userEmailer.SendEmailActivationLinkAsync(user);
-                }
-
-                //Notifications
-                await _notificationSubscriptionManager.SubscribeToAllAvailableNotificationsAsync(user.ToUserIdentifier());
-                await _appNotifier.WelcomeToTheApplicationAsync(user);
-                await _appNotifier.NewUserRegisteredAsync(user);
-
-                //Directly login if possible
-                if (user.IsActive && (user.IsEmailConfirmed || !isEmailConfirmationRequiredForLogin))
-                {
-                    AbpUserManager<Tenant, Role, User>.AbpLoginResult loginResult;
-                    if (externalLoginInfo != null)
-                    {
-                        loginResult = await _userManager.LoginAsync(externalLoginInfo.LoginInfo, tenant.TenancyName);
-                    }
-                    else
-                    {
-                        loginResult = await GetLoginResultAsync(user.UserName, model.Password, tenant.TenancyName);
-                    }
-
-                    if (loginResult.Result == AbpLoginResultType.Success)
-                    {
-                        await SignInAsync(loginResult.User, loginResult.Identity);
-                        return Redirect(GetAppHomeUrl());
-                    }
-
-                    Logger.Warn("New registered user could not be login. This should not be normally. login result: " + loginResult.Result);
-                }
-
-                return View("RegisterResult", new RegisterResultViewModel
-                {
-                    TenancyName = tenant.TenancyName,
-                    NameAndSurname = user.Name + " " + user.Surname,
-                    UserName = user.UserName,
-                    EmailAddress = user.EmailAddress,
-                    IsActive = user.IsActive,
-                    IsEmailConfirmationRequired = isEmailConfirmationRequiredForLogin
-                });
-            }
-            catch (UserFriendlyException ex)
-            {
-                ViewBag.IsMultiTenancyEnabled = _multiTenancyConfig.IsEnabled;
-                ViewBag.UseCaptcha = !model.IsExternalLogin && UseCaptchaOnRegistration();
-                ViewBag.ErrorMessage = ex.Message;
-
-                return View("Register", model);
-            }             
-             */
-
-            #endregion
-
-            try
-            {
-                //Get tenancy name and tenant
-                if (!_multiTenancyConfig.IsEnabled)
-                {
-                    model.TenancyName = Tenant.DefaultTenantName;
-                }
-                else if (model.TenancyName.IsNullOrEmpty())
-                {
-                    throw new UserFriendlyException(L("TenantNameCanNotBeEmpty"));
-                }
-
-                var tenant = await GetActiveTenantAsync(model.TenancyName);
-
                 //Create user
                 var user = new User
                 {
@@ -341,7 +198,7 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
                         }
                     };
 
-                    model.UserName = model.EmailAddress;
+                    model.UserName = model.UserName;
                     model.Password = Users.User.CreateRandomPassword();
 
                     if (string.Equals(externalLoginInfo.EmailAddress, model.EmailAddress, StringComparison.InvariantCultureIgnoreCase))
@@ -360,10 +217,6 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
                 user.UserName = model.UserName;
                 user.Password = new PasswordHasher().HashPassword(model.Password);
 
-                //Switch to the tenant
-                _unitOfWorkManager.Current.EnableFilter(AbpDataFilters.MayHaveTenant); //TODO: Needed?
-                _unitOfWorkManager.Current.SetTenantId(tenant.Id);
-
                 //Add default roles
                 user.Roles = new List<UserRole>();
                 foreach (var defaultRole in await _roleManager.Roles.Where(r => r.IsDefault).ToListAsync())

src/AbpCompanyName.AbpProjectName.Web/Models/Account/RegisterViewModel.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
-using Abp.Application.Services.Dto;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
 using AbpCompanyName.AbpProjectName.Users;
 using Abp.Extensions;
 
 namespace AbpCompanyName.AbpProjectName.Web.Models.Account
 {
-    public class RegisterViewModel : IInputDto, IValidatableObject
+    public class RegisterViewModel : IValidatableObject
     {
         /// <summary>
         /// Not required for single-tenant applications.

src/AbpCompanyName.AbpProjectName.Web/Views/Account/Login.cshtml

@@ -81,9 +81,9 @@
                     {
                         provider = provider.ToLower(CultureInfo.InvariantCulture);
 
-                        if (provider == "google")
+                        if (provider == "microsoft")
                         {
-                            return "googleplus";
+                            return "windows";
                         }
 
                         return provider;
@@ -100,13 +100,11 @@
                                 <input type="hidden" name="provider" value="" />
 
                                 @foreach (var p in loginProviders)
-                {
-                                    <li>
-                                        <a class="social-login-icon social-icon-color @getSocialIconClass(p.DisplayName)"
-                                           title="@p.DisplayName"
-                                           data-provider="@p.DisplayName"
-                                           href="javascript:;"></a>
-                                    </li>
+                                {
+                                    <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>

src/AbpCompanyName.AbpProjectName.Web/Views/Account/Register.cshtml

@@ -1,16 +1,31 @@
-@model AbpCompanyName.AbpProjectName.WebMpa.Models.Account.RegisterViewModel
+@model AbpCompanyName.AbpProjectName.Web.Models.Account.RegisterViewModel
+@{
+    ViewBag.DisableTopBar = true;
+}
 @section Styles
 {
-    <link href="~/Views/Account/Login.css" rel="stylesheet" />
+    <environment names="Development">
+        <link rel="stylesheet" href="~/view-resources/Views/Account/Login.css" asp-append-version="true" />
+    </environment>
+
+    <environment names="Staging,Production">
+        <link rel="stylesheet" href="~/view-resources/Views/Account/Login.min.css" asp-append-version="true" />
+    </environment>
 }
 @section Scripts{
-    <script type="text/javascript" src="~/Views/Account/Register.js"></script>
+    <environment names="Development">
+        <script src="~/view-resources/Views/Account/Register.js" asp-append-version="true"></script>
+    </environment>
+
+    <environment names="Staging,Production">
+        <script src="~/view-resources/Views/Account/Register.min.js" asp-append-version="true"></script>
+    </environment>
 }
 <div class="container">
     <div id="LoginArea" class="row">
         <div class="col-lg-12">
             <div class="well bs-component">
-                <form class="form-horizontal register-form" action="@(Url.Action("Register","Account"))" method="POST">
+                <form asp-action="Register" class="form-horizontal register-form" method="POST">
                     <fieldset>
                         <legend>@L("Register")</legend>
 
@@ -31,6 +46,7 @@
                         }
 
                         <input type="hidden" name="IsExternalLogin" value="@Model.IsExternalLogin.ToString()" />
+                        <input type="hidden" name="ExternalLoginAuthSchema" value="@Model.ExternalLoginAuthSchema"/>
 
                         <div class="form-group">
                             <div class="col-lg-12">

src/AbpCompanyName.AbpProjectName.Web/Views/Account/RegisterResult.cshtml

@@ -1,4 +1,4 @@
-@model AbpCompanyName.AbpProjectName.WebMpa.Models.Account.RegisterResultViewModel
+@model AbpCompanyName.AbpProjectName.Web.Models.Account.RegisterResultViewModel
 @{
     ViewBag.Title = "Successfully registered";
 }

src/AbpCompanyName.AbpProjectName.Web/Views/Account/TenantSelection.cshtml

@@ -1,10 +1,16 @@
-@model AbpCompanyName.AbpProjectName.WebMpa.Models.Account.TenantSelectionViewModel
+@model AbpCompanyName.AbpProjectName.Web.Models.Account.TenantSelectionViewModel
 @{
     ViewBag.Title = "Select Tenant";
 }
 @section Styles
 {
-    <link href="~/Views/Account/Login.css" rel="stylesheet" />
+    <environment names="Development">
+        <link rel="stylesheet" href="~/view-resources/Views/Account/Login.css" asp-append-version="true" />
+    </environment>
+
+    <environment names="Staging,Production">
+        <link rel="stylesheet" href="~/view-resources/Views/Account/Login.min.css" asp-append-version="true" />
+    </environment>
 }
 <div class="container">
     <div id="LoginArea" class="row">
@@ -26,18 +32,18 @@
                                     var tenant = Model.Tenants[i];
                                     <div class="md-radio">
                                         @{
-                                    string checkAttr = null;
-                                    if (i == 0)
-                                    {
-                                        checkAttr = "checked=\"checked\"";
-                                    }
+                                            string checkAttr = null;
+                                            if (i == 0)
+                                            {
+                                                checkAttr = "checked=\"checked\"";
+                                            }
                                         }
                                         <input type="radio" class="md-radiobtn" id="TenancyName_@(tenant.TenancyName)" name="TenancyName" value="@tenant.TenancyName" @checkAttr>
                                         <label for="TenancyName_@(tenant.TenancyName)">
                                             @tenant.Name (@tenant.TenancyName)
                                         </label>
                                     </div>
-                                }
+                                            }
                             </div>
                         </div>
 

src/AbpCompanyName.AbpProjectName.Web/Views/Shared/_Layout.cshtml

@@ -41,7 +41,10 @@
 
 </head>
 <body>
-    @Html.Partial("_TopBar")
+    @if (ViewBag.DisableTopBar == null || ViewBag.DisableTopBar != true)
+    {
+        Html.RenderPartial("_TopBar");
+    }
 
     <div class="container">
         @RenderBody()

src/AbpCompanyName.AbpProjectName.Web/compilerconfig.json

@@ -6,5 +6,9 @@
   {
     "outputFile": "wwwroot/view-resources/Views/Account/Login.es5.js",
     "inputFile": "wwwroot/view-resources/Views/Account/Login.js"
+  },
+  {
+    "outputFile": "wwwroot/view-resources/Views/Account/Login.css",
+    "inputFile": "wwwroot/view-resources/Views/Account/Login.less"
   }
 ]

src/AbpCompanyName.AbpProjectName.Web/project.json

@@ -41,6 +41,7 @@
   },
 
   "tools": {
+    "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview2-final",
     "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
     "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final",

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

@@ -2,3 +2,6 @@
   max-width: 400px;
   margin: 120px auto 10px auto;
 }
+.social-icons {
+  padding-left: 0px;
+}