From 1e59616d4ac992afb697d8e24404c335072e950d Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 16 Dec 2020 14:40:05 -0800 Subject: [PATCH] 1.0.1 release with minor update. --- BodyshopUploader/Properties/AssemblyInfo.cs | 4 ++-- BodyshopUploader/Releases/RELEASES | 4 +++- BodyshopUploader/Utils/Auth.cs | 10 ++++++++-- BodyshopUploader/Utils/CIECAMonitor.cs | 4 ++-- BodyshopUploader/Views/Login.xaml | 1 + BodyshopUploader/Views/Login.xaml.cs | 5 +++++ 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/BodyshopUploader/Properties/AssemblyInfo.cs b/BodyshopUploader/Properties/AssemblyInfo.cs index f60b4b7..63d888c 100644 --- a/BodyshopUploader/Properties/AssemblyInfo.cs +++ b/BodyshopUploader/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 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.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] //Setting Squirrel Aware Version. [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")] \ No newline at end of file diff --git a/BodyshopUploader/Releases/RELEASES b/BodyshopUploader/Releases/RELEASES index 2614983..39dc3b4 100644 --- a/BodyshopUploader/Releases/RELEASES +++ b/BodyshopUploader/Releases/RELEASES @@ -1 +1,3 @@ -470D3E4BA415108C1FAF95734B251733E3AF8579 ImEXOnlinePartner-1.0.0-full.nupkg 4989578 \ No newline at end of file +470D3E4BA415108C1FAF95734B251733E3AF8579 ImEXOnlinePartner-1.0.0-full.nupkg 4989578 +0AE50EA09CFA3C92087C1D75F468E62563A0A493 ImEXOnlinePartner-1.0.1-delta.nupkg 40731 +E122ED4940111C7F7D2416302FBDA4347EFF8FA9 ImEXOnlinePartner-1.0.1-full.nupkg 4989795 \ No newline at end of file diff --git a/BodyshopUploader/Utils/Auth.cs b/BodyshopUploader/Utils/Auth.cs index 1bc9396..b75f9ca 100644 --- a/BodyshopUploader/Utils/Auth.cs +++ b/BodyshopUploader/Utils/Auth.cs @@ -18,6 +18,10 @@ namespace BodyshopPartner.Utils private static string P; + public async static Task AuthTest() + { + await ap.RefreshAuthAsync( new FirebaseAuth() { }); + } public async static Task<(bool, string)> LoginAsync(string Username, string Password) { @@ -27,7 +31,9 @@ namespace BodyshopPartner.Utils { authlink = await ap.SignInWithEmailAndPasswordAsync(Username, Password); authlink.FirebaseAuthRefreshed += Authlink_FirebaseAuthRefreshed; + + logger.Trace("Firebase Auth Token {0}.", authlink.FirebaseToken); logger.Trace("Firebase Auth Token expires in {0} seconds.", authlink.ExpiresIn); tokenTimer.Interval = (authlink.ExpiresIn - 600) * 1000; //Set the token to refresh 10 minutes before it has to. @@ -65,11 +71,11 @@ namespace BodyshopPartner.Utils public static async Task Refresh() { - logger.Info("Old Token {0}", authlink.RefreshToken); + logger.Trace("Old Token {0}", authlink.RefreshToken); await authlink.GetFreshAuthAsync(); authlink = await ap.RefreshAuthAsync(authlink); - logger.Info("new Token {0}", authlink.FirebaseToken); + logger.Trace("new Token {0}", authlink.FirebaseToken); } private static void Authlink_FirebaseAuthRefreshed(object sender, FirebaseAuthEventArgs e) diff --git a/BodyshopUploader/Utils/CIECAMonitor.cs b/BodyshopUploader/Utils/CIECAMonitor.cs index 9c9cfa5..fd0629d 100644 --- a/BodyshopUploader/Utils/CIECAMonitor.cs +++ b/BodyshopUploader/Utils/CIECAMonitor.cs @@ -36,9 +36,9 @@ namespace BodyshopPartner.Utils // Eliminate duplicates when timestamp doesn't change Filter = "*.env"; // NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite; - NotifyFilter = NotifyFilters.Attributes; // The default also has NotifyFilters.LastWrite + NotifyFilter = NotifyFilters.FileName | NotifyFilters.Attributes; // The default also has NotifyFilters.LastWrite EnableRaisingEvents = true; - //Created += Watcher_Created; + Created += Watcher_Created; Changed += Watcher_Changed; //Deleted += Watcher_Deleted; //Renamed += Watcher_Renamed; diff --git a/BodyshopUploader/Views/Login.xaml b/BodyshopUploader/Views/Login.xaml index c091e38..90dd0c5 100644 --- a/BodyshopUploader/Views/Login.xaml +++ b/BodyshopUploader/Views/Login.xaml @@ -89,5 +89,6 @@ materialDesign:ButtonProgressAssist.Value="-1" materialDesign:ButtonProgressAssist.IsIndicatorVisible="True" materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Loading}" /> + diff --git a/BodyshopUploader/Views/Login.xaml.cs b/BodyshopUploader/Views/Login.xaml.cs index 685300e..68dc7f6 100644 --- a/BodyshopUploader/Views/Login.xaml.cs +++ b/BodyshopUploader/Views/Login.xaml.cs @@ -67,5 +67,10 @@ namespace BodyshopPartner.Views { Application.Current.Shutdown(0); } + + private void Button_Click(object sender, RoutedEventArgs e) + { + Utils.Auth.AuthTest(); + } } }