s459315/Retail_manager
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Log Off Bug

Browse Source 
fixes the bug where header was not being cleared on log off
This commit is contained in:
s459315 2022-07-30 14:21:25 +02:00
parent 2ed8e331ec
commit 5c2b914884
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RMWPFInterfaceLibrary/Api/APIHelper.cs
View File

@ -62,6 +62,11 @@ namespace RMWPFInterfaceLibrary.Api
} }
} }
public void LogOffUser()
{
_apiClient.DefaultRequestHeaders.Clear();
}
public async Task GetLogedInUserInfo(string token) public async Task GetLogedInUserInfo(string token)
{ {
_apiClient.DefaultRequestHeaders.Clear(); _apiClient.DefaultRequestHeaders.Clear();

1
RMWPFInterfaceLibrary/Api/IAPIHelper.cs
View File

@ -7,6 +7,7 @@ namespace RMWPFInterfaceLibrary.Api
public interface IAPIHelper public interface IAPIHelper
{ {
HttpClient ApiClient { get; } HttpClient ApiClient { get; }
void LogOffUser();
Task<AuthenticatedUser> Authenticate(string username, string password); Task<AuthenticatedUser> Authenticate(string username, string password);
Task GetLogedInUserInfo(string token); Task GetLogedInUserInfo(string token);
} }

2
RMWPFInterfaceLibrary/Models/ILoggedInUserModel.cs
View File

@ -10,6 +10,6 @@ namespace RMWPFInterfaceLibrary.Models
string Id { get; set; } string Id { get; set; }
string LastName { get; set; } string LastName { get; set; }
string Token { get; set; } string Token { get; set; }
void LogOffUser(); void ResetUserModel();
} }
} }

2
RMWPFInterfaceLibrary/Models/LoggedInUserModel.cs
View File

@ -15,7 +15,7 @@ namespace RMWPFInterfaceLibrary.Models
public string EmailAddress { get; set; } public string EmailAddress { get; set; }
public DateTime CreatedDate { get; set; } public DateTime CreatedDate { get; set; }
public void LogOffUser() public void ResetUserModel()
{ {
Token = ""; Token = "";
Id = ""; Id = "";

9
RMWPFUserInterface/ViewModels/ShellViewModel.cs
View File

@ -5,6 +5,7 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Caliburn.Micro; using Caliburn.Micro;
using RMWPFInterfaceLibrary.Api;
using RMWPFInterfaceLibrary.Models; using RMWPFInterfaceLibrary.Models;
using RMWPFUserInterface.EventModels; using RMWPFUserInterface.EventModels;
@ -15,12 +16,15 @@ namespace RMWPFUserInterface.ViewModels
private IEventAggregator _events; private IEventAggregator _events;
private SalesViewModel _salesVM; private SalesViewModel _salesVM;
private ILoggedInUserModel _user; private ILoggedInUserModel _user;
private IAPIHelper _apiHelper;
public ShellViewModel(IEventAggregator events, SalesViewModel salesVM, public ShellViewModel(IEventAggregator events, SalesViewModel salesVM,
SimpleContainer container, ILoggedInUserModel user) SimpleContainer container, ILoggedInUserModel user, IAPIHelper apiHelper)
{ {
_salesVM = salesVM; _salesVM = salesVM;
_events = events; _events = events;
_user = user; _user = user;
_apiHelper = apiHelper;
_events.SubscribeOnUIThread(this); _events.SubscribeOnUIThread(this);
@ -48,7 +52,8 @@ namespace RMWPFUserInterface.ViewModels
public void LogOut() public void LogOut()
{ {
_user.LogOffUser(); _user.ResetUserModel();
_apiHelper.LogOffUser();
NotifyOfPropertyChange(() => IsLoggedIn); NotifyOfPropertyChange(() => IsLoggedIn);
ActivateItemAsync(IoC.Get<LoginViewModel>()); ActivateItemAsync(IoC.Get<LoginViewModel>());