resolved #56

Author: ismcagdas

src/AbpCompanyName.AbpProjectName.Application/Sessions/SessionAppService.cs

@@ -1,21 +1,21 @@
 using System.Threading.Tasks;
 using Abp.Auditing;
-using Abp.Authorization;
 using Abp.AutoMapper;
 using AbpCompanyName.AbpProjectName.Sessions.Dto;
 
 namespace AbpCompanyName.AbpProjectName.Sessions
 {
-    [AbpAuthorize]
     public class SessionAppService : AbpProjectNameAppServiceBase, ISessionAppService
     {
         [DisableAuditing]
         public async Task<GetCurrentLoginInformationsOutput> GetCurrentLoginInformations()
         {
-            var output = new GetCurrentLoginInformationsOutput
+            var output = new GetCurrentLoginInformationsOutput();
+
+            if (AbpSession.UserId.HasValue)
             {
-                User = (await GetCurrentUserAsync()).MapTo<UserLoginInfoDto>()
-            };
+                output.User = (await GetCurrentUserAsync()).MapTo<UserLoginInfoDto>();
+            }
 
             if (AbpSession.TenantId.HasValue)
             {

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/layout/header.cshtml

@@ -28,12 +28,15 @@
                         <li ng-repeat="language in vm.languages" ng-hide="vm.currentLanguage.name == language.name"><a href="@(ApplicationPath)AbpLocalization/ChangeCulture?cultureName={{language.name}}"><i ng-class="language.icon"></i> {{language.displayName}}</a></li>
                     </ul>
                 </li>
-                <li class="dropdown">
+                <li class="dropdown" ng-if="vm.isUserSignedIn()">
                     <a href="" data-toggle="dropdown"><i class="fa fa-user"></i> <span>{{vm.getShownUserName()}}</span> <b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         <li><a href="@Url.Action("Logout", "Account")"><i class="fa fa-sign-out"></i> @L("Logout")</a></li>
                     </ul>
                 </li>
+                <li ng-if="!vm.isUserSignedIn()">
+                    <a href="@Url.Action("Login", "Account")"><i class="fa fa-sign-in"></i> @L("LogIn")</a>
+                </li>
             </ul>
         </div>
     </div>

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/layout/header.js

@@ -10,6 +10,7 @@
 
             vm.menu = abp.nav.menus.MainMenu;
             vm.currentMenuName = $state.current.menu;
+            vm.isUserSignedIn = function () { return !!appSession.user; };
 
             $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
                 vm.currentMenuName = toState.menu;

src/AbpCompanyName.AbpProjectName.WebSpaAngular/App_Start/AbpProjectNameNavigationProvider.cs

@@ -20,7 +20,8 @@ public override void SetNavigation(INavigationProviderContext context)
                         "Home",
                         new LocalizableString("HomePage", AbpProjectNameConsts.LocalizationSourceName),
                         url: "#/",
-                        icon: "fa fa-home"
+                        icon: "fa fa-home",
+                        requiresAuthentication: true
                         )
                 ).AddItem(
                     new MenuItemDefinition(

src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs

@@ -205,6 +205,11 @@ protected void LoginAsDefaultTenantAdmin()
             LoginAsTenant(Tenant.DefaultTenantName, User.AdminUserName);
         }
 
+        protected void LogoutAsDefaultTenant()
+        {
+            LogoutAsTenant(Tenant.DefaultTenantName);
+        }
+
         protected void LoginAsHost(string userName)
         {
             Resolve<IMultiTenancyConfig>().IsEnabled = true;
@@ -223,6 +228,14 @@ protected void LoginAsHost(string userName)
             AbpSession.UserId = user.Id;
         }
 
+        protected void LogoutAsHost()
+        {
+            Resolve<IMultiTenancyConfig>().IsEnabled = true;
+
+            AbpSession.TenantId = null;
+            AbpSession.UserId = null;
+        }
+
         protected void LoginAsTenant(string tenancyName, string userName)
         {
             var tenant = UsingDbContext(context => context.Tenants.FirstOrDefault(t => t.TenancyName == tenancyName));
@@ -245,8 +258,20 @@ protected void LoginAsTenant(string tenancyName, string userName)
             AbpSession.UserId = user.Id;
         }
 
+        protected void LogoutAsTenant(string tenancyName)
+        {
+            var tenant = UsingDbContext(context => context.Tenants.FirstOrDefault(t => t.TenancyName == tenancyName));
+            if (tenant == null)
+            {
+                throw new Exception("There is no tenant: " + tenancyName);
+            }
+
+            AbpSession.TenantId = tenant.Id;
+            AbpSession.UserId = null;
+        }
+
         #endregion
-        
+
         /// <summary>
         /// Gets current user if <see cref="IAbpSession.UserId"/> is not null.
         /// Throws exception if it's null.

src/Tests/AbpCompanyName.AbpProjectName.Tests/Sessions/SessionAppService_Tests.cs

@@ -48,5 +48,37 @@ public async Task Should_Get_Current_User_And_Tenant_When_Logged_In_As_Tenant()
             output.Tenant.ShouldNotBe(null);
             output.Tenant.Name.ShouldBe(currentTenant.Name);
         }
+
+        [Fact]
+        public async Task Should_Not_Get_User_When_Not_Logged_In_As_Host()
+        {
+            //Arrange
+            LogoutAsHost();
+
+            //Act
+            var output = await _sessionAppService.GetCurrentLoginInformations();
+
+            //Assert
+            output.User.ShouldBeNull();
+            output.Tenant.ShouldBeNull();
+        }
+
+        [Fact]
+        public async Task Should_Not_Get_User_When_Not_Logged_In_As_Tenant()
+        {
+            //Arrange
+            LogoutAsDefaultTenant();
+
+            //Act
+            var output = await _sessionAppService.GetCurrentLoginInformations();
+
+            //Assert
+            var currentTenant = await GetCurrentTenantAsync();
+
+            output.User.ShouldBeNull();
+
+            output.Tenant.ShouldNotBeNull();
+            output.Tenant.Name.ShouldBe(currentTenant.Name);
+        }
     }
 }