From 2a045a0780ccb12dcaafd328eaae1925838c7e05 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Thu, 5 Jul 2018 13:50:47 +0300
Subject: [PATCH] Used AccountModuleToolbarContributor

---
 .../src/Volo.Abp.Account.Web/AbpAccountWebModule.cs      | 6 ++++++
 .../AccountModuleToolbarContributor.cs                   | 9 +++++----
 ...outViewComponent.cs => UserLoginLinkViewComponent.cs} | 0
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/{UserLogoutViewComponent.cs => UserLoginLinkViewComponent.cs} (100%)

diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
index 9f1533409a..3e60710401 100644
--- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
@@ -4,6 +4,7 @@ using Volo.Abp.Account.Web.Localization;
 using Volo.Abp.Account.Web.Settings;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.Identity;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
@@ -50,6 +51,11 @@ namespace Volo.Abp.Account.Web
                     .AddVirtualJson("/Localization/Resources/AbpAccount/Web")
                     .AddBaseTypes(typeof(AbpUiResource), typeof(AbpValidationResource));
             });
+            
+            services.Configure<ToolbarOptions>(options =>
+            {
+                options.Contributors.Add(new AccountModuleToolbarContributor());
+            });
 
             services.AddAssemblyOf<AbpAccountWebModule>();
         }
diff --git a/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs b/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs
index 9302b5aefd..1d85f06521 100644
--- a/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs
@@ -15,10 +15,11 @@ namespace Volo.Abp.Account.Web
                 return Task.CompletedTask;
             }
 
-            if (!context.ServiceProvider.GetRequiredService<ICurrentUser>().IsAuthenticated)
-            {
-                context.Toolbar.Items.Add(new ToolbarItem(typeof(UserLoginLinkViewComponent)));
-            }
+            //TODO: Currently disabled!
+            //if (!context.ServiceProvider.GetRequiredService<ICurrentUser>().IsAuthenticated)
+            //{
+            //    context.Toolbar.Items.Add(new ToolbarItem(typeof(UserLoginLinkViewComponent)));
+            //}
 
             return Task.CompletedTask;
         }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLogoutViewComponent.cs b/modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLoginLinkViewComponent.cs
similarity index 100%
rename from modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLogoutViewComponent.cs
rename to modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLoginLinkViewComponent.cs