Skip to content

Commit

Permalink
Merge pull request #13 from NBull92/dev
Browse files Browse the repository at this point in the history 
Added LastLogin date to user account
  • Loading branch information
@NBull92
NBull92 authored May 2, 2020
2 parents 02059f5 + c00921f commit 581ed52
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 89 deletions.
166 changes: 83 additions & 83 deletions ImprezGarage.nuspec
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>ImprezGarage</id>
<version>1.0.26</version>
<title>ImprezGarage</title>
<authors>Nicholas Bull</authors>
<owners>Nicholas Bull</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectUrl>https://github.com/NBull92/ImprezGarage</projectUrl>
<iconUrl>https://github.com/NBull92/ImprezGarage/Src/ImprezGarage/iconv3.ico</iconUrl>
<description>An application that is used to help guide you in the maintenance of you vehicles.</description>
<copyright>NickBull-Computing 2020</copyright>
</metadata>
<files>
<file src="lib\net461\CommonServiceLocator.dll" target="lib\net461\CommonServiceLocator.dll" />
<file src="lib\net461\ControlzEx.dll" target="lib\net461\ControlzEx.dll" />
<file src="lib\net461\DeltaCompressionDotNet.dll" target="lib\net461\DeltaCompressionDotNet.dll" />
<file src="lib\net461\DeltaCompressionDotNet.MsDelta.dll" target="lib\net461\DeltaCompressionDotNet.MsDelta.dll" />
<file src="lib\net461\DeltaCompressionDotNet.PatchApi.dll" target="lib\net461\DeltaCompressionDotNet.PatchApi.dll" />
<file src="lib\net461\EntityFramework.dll" target="lib\net461\EntityFramework.dll" />
<file src="lib\net461\EntityFramework.SqlServer.dll" target="lib\net461\EntityFramework.SqlServer.dll" />
<file src="lib\net461\Firebase.Auth.dll" target="lib\net461\Firebase.Auth.dll" />
<file src="lib\net461\FireSharp.dll" target="lib\net461\FireSharp.dll" />
<file src="lib\net461\ImprezGarage.exe" target="lib\net461\ImprezGarage.exe" />
<file src="lib\net461\ImprezGarage.exe.config" target="lib\net461\ImprezGarage.exe.config" />
<file src="lib\net461\ImprezGarage.exe.manifest" target="lib\net461\ImprezGarage.exe.manifest" />
<file src="lib\net461\ImprezGarage.Infrastructure.dll" target="lib\net461\ImprezGarage.Infrastructure.dll" />
<file src="lib\net461\ImprezGarage.Infrastructure.Services.dll" target="lib\net461\ImprezGarage.Infrastructure.Services.dll" />
<file src="lib\net461\ImprezGarage.Modules.Account.dll" target="lib\net461\ImprezGarage.Modules.Account.dll" />
<file src="lib\net461\ImprezGarage.Modules.Firebase.dll" target="lib\net461\ImprezGarage.Modules.Firebase.dll" />
<file src="lib\net461\ImprezGarage.Modules.FirebaseAuth.dll" target="lib\net461\ImprezGarage.Modules.FirebaseAuth.dll" />
<file src="lib\net461\ImprezGarage.Modules.Logger.dll" target="lib\net461\ImprezGarage.Modules.Logger.dll" />
<file src="lib\net461\ImprezGarage.Modules.MyGarage.dll" target="lib\net461\ImprezGarage.Modules.MyGarage.dll" />
<file src="lib\net461\ImprezGarage.Modules.Notifications.dll" target="lib\net461\ImprezGarage.Modules.Notifications.dll" />
<file src="lib\net461\ImprezGarage.Modules.PerformChecks.dll" target="lib\net461\ImprezGarage.Modules.PerformChecks.dll" />
<file src="lib\net461\ImprezGarage.Modules.PetrolExpenditure.dll" target="lib\net461\ImprezGarage.Modules.PetrolExpenditure.dll" />
<file src="lib\net461\ImprezGarage.Modules.Settings.dll" target="lib\net461\ImprezGarage.Modules.Settings.dll" />
<file src="lib\net461\LiveCharts.dll" target="lib\net461\LiveCharts.dll" />
<file src="lib\net461\LiveCharts.Wpf.dll" target="lib\net461\LiveCharts.Wpf.dll" />
<file src="lib\net461\MahApps.Metro.dll" target="lib\net461\MahApps.Metro.dll" />
<file src="lib\net461\Microsoft.Expression.Controls.dll" target="lib\net461\Microsoft.Expression.Controls.dll" />
<file src="lib\net461\Microsoft.Expression.Drawing.dll" target="lib\net461\Microsoft.Expression.Drawing.dll" />
<file src="lib\net461\Microsoft.Expression.Effects.dll" target="lib\net461\Microsoft.Expression.Effects.dll" />
<file src="lib\net461\Microsoft.Expression.Interactions.dll" target="lib\net461\Microsoft.Expression.Interactions.dll" />
<file src="lib\net461\Microsoft.Expression.Prototyping.Interactivity.dll" target="lib\net461\Microsoft.Expression.Prototyping.Interactivity.dll" />
<file src="lib\net461\Microsoft.Expression.Prototyping.SketchControls.dll" target="lib\net461\Microsoft.Expression.Prototyping.SketchControls.dll" />
<file src="lib\net461\Microsoft.Practices.ServiceLocation.dll" target="lib\net461\Microsoft.Practices.ServiceLocation.dll" />
<file src="lib\net461\Microsoft.Practices.Unity.dll" target="lib\net461\Microsoft.Practices.Unity.dll" />
<file src="lib\net461\Microsoft.SDK.Expression.Blend.dll" target="lib\net461\Microsoft.SDK.Expression.Blend.dll" />
<file src="lib\net461\Mono.Cecil.dll" target="lib\net461\Mono.Cecil.dll" />
<file src="lib\net461\Mono.Cecil.Mdb.dll" target="lib\net461\Mono.Cecil.Mdb.dll" />
<file src="lib\net461\Mono.Cecil.Pdb.dll" target="lib\net461\Mono.Cecil.Pdb.dll" />
<file src="lib\net461\Mono.Cecil.Rocks.dll" target="lib\net461\Mono.Cecil.Rocks.dll" />
<file src="lib\net461\Newtonsoft.Json.dll" target="lib\net461\Newtonsoft.Json.dll" />
<file src="lib\net461\NuGet.Squirrel.dll" target="lib\net461\NuGet.Squirrel.dll" />
<file src="lib\net461\Prism.dll" target="lib\net461\Prism.dll" />
<file src="lib\net461\Prism.Unity.Wpf.dll" target="lib\net461\Prism.Unity.Wpf.dll" />
<file src="lib\net461\Prism.Wpf.dll" target="lib\net461\Prism.Wpf.dll" />
<file src="lib\net461\RestSharp.dll" target="lib\net461\RestSharp.dll" />
<file src="lib\net461\SharpCompress.dll" target="lib\net461\SharpCompress.dll" />
<file src="lib\net461\Splat.dll" target="lib\net461\Splat.dll" />
<file src="lib\net461\Squirrel.dll" target="lib\net461\Squirrel.dll" />
<file src="lib\net461\System.Diagnostics.DiagnosticSource.dll" target="lib\net461\System.Diagnostics.DiagnosticSource.dll" />
<file src="lib\net461\System.Windows.Controls.DataVisualization.Toolkit.dll" target="lib\net461\System.Windows.Controls.DataVisualization.Toolkit.dll" />
<file src="lib\net461\System.Windows.Controls.Input.Toolkit.dll" target="lib\net461\System.Windows.Controls.Input.Toolkit.dll" />
<file src="lib\net461\System.Windows.Controls.Layout.Toolkit.dll" target="lib\net461\System.Windows.Controls.Layout.Toolkit.dll" />
<file src="lib\net461\System.Windows.Interactivity.dll" target="lib\net461\System.Windows.Interactivity.dll" />
<file src="lib\net461\Unity.Abstractions.dll" target="lib\net461\Unity.Abstractions.dll" />
<file src="lib\net461\Unity.Configuration.dll" target="lib\net461\Unity.Configuration.dll" />
<file src="lib\net461\Unity.Container.dll" target="lib\net461\Unity.Container.dll" />
<file src="lib\net461\Unity.Interception.Configuration.dll" target="lib\net461\Unity.Interception.Configuration.dll" />
<file src="lib\net461\Unity.Interception.dll" target="lib\net461\Unity.Interception.dll" />
<file src="lib\net461\Unity.RegistrationByConvention.dll" target="lib\net461\Unity.RegistrationByConvention.dll" />
<file src="lib\net461\Unity.ServiceLocation.dll" target="lib\net461\Unity.ServiceLocation.dll" />
<file src="lib\net461\WPFToolkit.dll" target="lib\net461\WPFToolkit.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.dll" target="lib\net461\Xceed.Wpf.AvalonDock.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.Themes.Aero.dll" target="lib\net461\Xceed.Wpf.AvalonDock.Themes.Aero.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.Themes.Metro.dll" target="lib\net461\Xceed.Wpf.AvalonDock.Themes.Metro.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.Themes.VS2010.dll" target="lib\net461\Xceed.Wpf.AvalonDock.Themes.VS2010.dll" />
<file src="lib\net461\Xceed.Wpf.Toolkit.dll" target="lib\net461\Xceed.Wpf.Toolkit.dll" />
</files>
</package>
<package>
<metadata>
<id>ImprezGarage</id>
<version>1.0.27</version>
<title>ImprezGarage</title>
<authors>Nicholas Bull</authors>
<owners>Nicholas Bull</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>NickBull-Computing 2020</copyright>
<tags> </tags>
<projectUrl>https://github.com/NBull92/ImprezGarage</projectUrl>
<iconUrl>https://github.com/NBull92/ImprezGarage/Src/ImprezGarage/iconv3.ico</iconUrl>
<description>An application that is used to help guide you in the maintenance of you vehicles.</description>
</metadata>
<files>
<file src="lib\net461\CommonServiceLocator.dll" target="lib\net461\CommonServiceLocator.dll" />
<file src="lib\net461\ControlzEx.dll" target="lib\net461\ControlzEx.dll" />
<file src="lib\net461\DeltaCompressionDotNet.dll" target="lib\net461\DeltaCompressionDotNet.dll" />
<file src="lib\net461\DeltaCompressionDotNet.MsDelta.dll" target="lib\net461\DeltaCompressionDotNet.MsDelta.dll" />
<file src="lib\net461\DeltaCompressionDotNet.PatchApi.dll" target="lib\net461\DeltaCompressionDotNet.PatchApi.dll" />
<file src="lib\net461\EntityFramework.dll" target="lib\net461\EntityFramework.dll" />
<file src="lib\net461\EntityFramework.SqlServer.dll" target="lib\net461\EntityFramework.SqlServer.dll" />
<file src="lib\net461\Firebase.Auth.dll" target="lib\net461\Firebase.Auth.dll" />
<file src="lib\net461\FireSharp.dll" target="lib\net461\FireSharp.dll" />
<file src="lib\net461\ImprezGarage.exe" target="lib\net461\ImprezGarage.exe" />
<file src="lib\net461\ImprezGarage.exe.config" target="lib\net461\ImprezGarage.exe.config" />
<file src="lib\net461\ImprezGarage.exe.manifest" target="lib\net461\ImprezGarage.exe.manifest" />
<file src="lib\net461\ImprezGarage.Infrastructure.dll" target="lib\net461\ImprezGarage.Infrastructure.dll" />
<file src="lib\net461\ImprezGarage.Infrastructure.Services.dll" target="lib\net461\ImprezGarage.Infrastructure.Services.dll" />
<file src="lib\net461\ImprezGarage.Modules.Account.dll" target="lib\net461\ImprezGarage.Modules.Account.dll" />
<file src="lib\net461\ImprezGarage.Modules.Firebase.dll" target="lib\net461\ImprezGarage.Modules.Firebase.dll" />
<file src="lib\net461\ImprezGarage.Modules.FirebaseAuth.dll" target="lib\net461\ImprezGarage.Modules.FirebaseAuth.dll" />
<file src="lib\net461\ImprezGarage.Modules.Logger.dll" target="lib\net461\ImprezGarage.Modules.Logger.dll" />
<file src="lib\net461\ImprezGarage.Modules.MyGarage.dll" target="lib\net461\ImprezGarage.Modules.MyGarage.dll" />
<file src="lib\net461\ImprezGarage.Modules.Notifications.dll" target="lib\net461\ImprezGarage.Modules.Notifications.dll" />
<file src="lib\net461\ImprezGarage.Modules.PerformChecks.dll" target="lib\net461\ImprezGarage.Modules.PerformChecks.dll" />
<file src="lib\net461\ImprezGarage.Modules.PetrolExpenditure.dll" target="lib\net461\ImprezGarage.Modules.PetrolExpenditure.dll" />
<file src="lib\net461\ImprezGarage.Modules.Settings.dll" target="lib\net461\ImprezGarage.Modules.Settings.dll" />
<file src="lib\net461\LiveCharts.dll" target="lib\net461\LiveCharts.dll" />
<file src="lib\net461\LiveCharts.Wpf.dll" target="lib\net461\LiveCharts.Wpf.dll" />
<file src="lib\net461\MahApps.Metro.dll" target="lib\net461\MahApps.Metro.dll" />
<file src="lib\net461\Microsoft.Expression.Controls.dll" target="lib\net461\Microsoft.Expression.Controls.dll" />
<file src="lib\net461\Microsoft.Expression.Drawing.dll" target="lib\net461\Microsoft.Expression.Drawing.dll" />
<file src="lib\net461\Microsoft.Expression.Effects.dll" target="lib\net461\Microsoft.Expression.Effects.dll" />
<file src="lib\net461\Microsoft.Expression.Interactions.dll" target="lib\net461\Microsoft.Expression.Interactions.dll" />
<file src="lib\net461\Microsoft.Expression.Prototyping.Interactivity.dll" target="lib\net461\Microsoft.Expression.Prototyping.Interactivity.dll" />
<file src="lib\net461\Microsoft.Expression.Prototyping.SketchControls.dll" target="lib\net461\Microsoft.Expression.Prototyping.SketchControls.dll" />
<file src="lib\net461\Microsoft.Practices.ServiceLocation.dll" target="lib\net461\Microsoft.Practices.ServiceLocation.dll" />
<file src="lib\net461\Microsoft.Practices.Unity.dll" target="lib\net461\Microsoft.Practices.Unity.dll" />
<file src="lib\net461\Microsoft.SDK.Expression.Blend.dll" target="lib\net461\Microsoft.SDK.Expression.Blend.dll" />
<file src="lib\net461\Mono.Cecil.dll" target="lib\net461\Mono.Cecil.dll" />
<file src="lib\net461\Mono.Cecil.Mdb.dll" target="lib\net461\Mono.Cecil.Mdb.dll" />
<file src="lib\net461\Mono.Cecil.Pdb.dll" target="lib\net461\Mono.Cecil.Pdb.dll" />
<file src="lib\net461\Mono.Cecil.Rocks.dll" target="lib\net461\Mono.Cecil.Rocks.dll" />
<file src="lib\net461\Newtonsoft.Json.dll" target="lib\net461\Newtonsoft.Json.dll" />
<file src="lib\net461\NuGet.Squirrel.dll" target="lib\net461\NuGet.Squirrel.dll" />
<file src="lib\net461\Prism.dll" target="lib\net461\Prism.dll" />
<file src="lib\net461\Prism.Unity.Wpf.dll" target="lib\net461\Prism.Unity.Wpf.dll" />
<file src="lib\net461\Prism.Wpf.dll" target="lib\net461\Prism.Wpf.dll" />
<file src="lib\net461\RestSharp.dll" target="lib\net461\RestSharp.dll" />
<file src="lib\net461\SharpCompress.dll" target="lib\net461\SharpCompress.dll" />
<file src="lib\net461\Splat.dll" target="lib\net461\Splat.dll" />
<file src="lib\net461\Squirrel.dll" target="lib\net461\Squirrel.dll" />
<file src="lib\net461\System.Diagnostics.DiagnosticSource.dll" target="lib\net461\System.Diagnostics.DiagnosticSource.dll" />
<file src="lib\net461\System.Windows.Controls.DataVisualization.Toolkit.dll" target="lib\net461\System.Windows.Controls.DataVisualization.Toolkit.dll" />
<file src="lib\net461\System.Windows.Controls.Input.Toolkit.dll" target="lib\net461\System.Windows.Controls.Input.Toolkit.dll" />
<file src="lib\net461\System.Windows.Controls.Layout.Toolkit.dll" target="lib\net461\System.Windows.Controls.Layout.Toolkit.dll" />
<file src="lib\net461\System.Windows.Interactivity.dll" target="lib\net461\System.Windows.Interactivity.dll" />
<file src="lib\net461\Unity.Abstractions.dll" target="lib\net461\Unity.Abstractions.dll" />
<file src="lib\net461\Unity.Configuration.dll" target="lib\net461\Unity.Configuration.dll" />
<file src="lib\net461\Unity.Container.dll" target="lib\net461\Unity.Container.dll" />
<file src="lib\net461\Unity.Interception.Configuration.dll" target="lib\net461\Unity.Interception.Configuration.dll" />
<file src="lib\net461\Unity.Interception.dll" target="lib\net461\Unity.Interception.dll" />
<file src="lib\net461\Unity.RegistrationByConvention.dll" target="lib\net461\Unity.RegistrationByConvention.dll" />
<file src="lib\net461\Unity.ServiceLocation.dll" target="lib\net461\Unity.ServiceLocation.dll" />
<file src="lib\net461\WPFToolkit.dll" target="lib\net461\WPFToolkit.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.dll" target="lib\net461\Xceed.Wpf.AvalonDock.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.Themes.Aero.dll" target="lib\net461\Xceed.Wpf.AvalonDock.Themes.Aero.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.Themes.Metro.dll" target="lib\net461\Xceed.Wpf.AvalonDock.Themes.Metro.dll" />
<file src="lib\net461\Xceed.Wpf.AvalonDock.Themes.VS2010.dll" target="lib\net461\Xceed.Wpf.AvalonDock.Themes.VS2010.dll" />
<file src="lib\net461\Xceed.Wpf.Toolkit.dll" target="lib\net461\Xceed.Wpf.Toolkit.dll" />
</files>
</package>
1 change: 1 addition & 0 deletions Src/Business/ImprezGarage.Infrastructure/Model/Account.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ public class Account : IDbEntity
public string UserId { get; set; }
public string Name { get; set; }
public bool IsReadonly { get; set; }
public DateTime LastLogin { get; set; }
}
}
4 changes: 2 additions & 2 deletions Src/ImprezGarage/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.27")]
[assembly: AssemblyFileVersion("1.0.27")]
[assembly: AssemblyVersion("1.0.28")]
[assembly: AssemblyFileVersion("1.0.28")]
24 changes: 20 additions & 4 deletions Src/Modules/ImprezGarage.Modules.FirebaseAuth/FirebaseAuthenticationService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,32 @@ public async Task<Account> CreateAccountAsync(string email, string password)
{
var auth = new FirebaseAuthProvider(new FirebaseConfig(FirebaseProjectConfig.ApiKey));
var response = await auth.CreateUserWithEmailAndPasswordAsync(email, password);
_currentUser = _dataService.CreateUser(response.User.LocalId, email);
UpdateCurrentUserWithCreated(email, response);
return _currentUser;
}

public async Task<Account> CreateAccountAsync(string email, SecureString password)
{
var auth = new FirebaseAuthProvider(new FirebaseConfig(FirebaseProjectConfig.ApiKey));
var response = await auth.CreateUserWithEmailAndPasswordAsync(email, SecureHelper.SecureStringToString(password));
_currentUser = _dataService.CreateUser(response.User.LocalId, email);
UpdateCurrentUserWithCreated(email, response);
return _currentUser;
}

public async Task<Account> LoginAsync(string email, string password)
{
var auth = new FirebaseAuthProvider(new FirebaseConfig(FirebaseProjectConfig.ApiKey));
var response = await auth.SignInWithEmailAndPasswordAsync(email, password);
_currentUser = _dataService.GetUser(response.User.LocalId);
UpdateCurrentUserWithSignIn(response);
return _currentUser;
}

public async Task<Account> LoginAsync(string email, SecureString password)
{
var auth = new FirebaseAuthProvider(new FirebaseConfig(FirebaseProjectConfig.ApiKey));
var response = await auth.SignInWithEmailAndPasswordAsync(email, SecureHelper.SecureStringToString(password));
_currentUser = _dataService.GetUser(response.User.LocalId);
UpdateCurrentUserWithSignIn(response);

return _currentUser;
}

Expand All @@ -68,5 +69,20 @@ public Account CurrentUser()

return _currentUser;
}

private void UpdateCurrentUserWithCreated(string email, FirebaseAuthLink response)
{
_currentUser = _dataService.CreateUser(response.User.LocalId, email);
_currentUser.LastLogin = DateTime.Now;
_dataService.UpdateUser(_currentUser);
}

private void UpdateCurrentUserWithSignIn(FirebaseAuthLink response)
{
_currentUser = _dataService.GetUser(response.User.LocalId);
_currentUser.LastLogin = DateTime.Now;
_dataService.UpdateUser(_currentUser);
}

}
}

0 comments on commit 581ed52

Please sign in to comment.