diff --git a/BodyshopUploader/App.config b/BodyshopUploader/App.config index 6cdd7de..46c1bf9 100644 --- a/BodyshopUploader/App.config +++ b/BodyshopUploader/App.config @@ -1,61 +1,61 @@ - + -
+
- + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + False - + True - + diff --git a/BodyshopUploader/BodyshopPartner.csproj b/BodyshopUploader/BodyshopPartner.csproj index d8c0680..6609e48 100644 --- a/BodyshopUploader/BodyshopPartner.csproj +++ b/BodyshopUploader/BodyshopPartner.csproj @@ -1,6 +1,6 @@  - + Debug @@ -15,10 +15,14 @@ 4 true true + false + + + publish\ true Disk - false + true Foreground 7 Days @@ -27,12 +31,9 @@ true 0 1.0.0.%2a - false false + true true - - - AnyCPU @@ -95,20 +96,20 @@ ..\packages\FirebaseAuthentication.net.3.4.0\lib\netstandard1.1\Firebase.Auth.dll - - ..\packages\GraphQL.Client.3.1.6\lib\net461\GraphQL.Client.dll + + ..\packages\GraphQL.Client.3.2.0\lib\net461\GraphQL.Client.dll - - ..\packages\GraphQL.Client.Abstractions.3.1.6\lib\netstandard2.0\GraphQL.Client.Abstractions.dll + + ..\packages\GraphQL.Client.Abstractions.3.2.0\lib\netstandard2.0\GraphQL.Client.Abstractions.dll - - ..\packages\GraphQL.Client.Abstractions.Websocket.3.1.6\lib\netstandard2.0\GraphQL.Client.Abstractions.Websocket.dll + + ..\packages\GraphQL.Client.Abstractions.Websocket.3.2.0\lib\netstandard2.0\GraphQL.Client.Abstractions.Websocket.dll ..\packages\GraphQL.Client.Serializer.Newtonsoft.3.1.6\lib\netstandard2.0\GraphQL.Client.Serializer.Newtonsoft.dll - - ..\packages\GraphQL.Primitives.3.1.6\lib\netstandard2.0\GraphQL.Primitives.dll + + ..\packages\GraphQL.Primitives.3.2.0\lib\netstandard2.0\GraphQL.Primitives.dll ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll @@ -123,11 +124,11 @@ False ..\..\..\Program Files (x86)\Common Files\Intuit\QuickBooks\Interop.QBXMLRP2.dll - - ..\packages\MaterialDesignColors.1.2.6\lib\net45\MaterialDesignColors.dll + + ..\packages\MaterialDesignColors.1.2.7\lib\net45\MaterialDesignColors.dll - - ..\packages\MaterialDesignThemes.3.1.3\lib\net45\MaterialDesignThemes.Wpf.dll + + ..\packages\MaterialDesignThemes.3.2.0\lib\net45\MaterialDesignThemes.Wpf.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll @@ -137,17 +138,17 @@ ..\packages\MimeTypesMap.1.0.8\lib\net452\MimeTypesMap.dll - - ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll + + ..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.dll - - ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll + + ..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Mdb.dll - - ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll + + ..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Pdb.dll - - ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll + + ..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Rocks.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -156,7 +157,7 @@ ..\packages\NLog.4.7.4\lib\net45\NLog.dll - ..\packages\squirrel.windows.2.0.0\lib\Net45\NuGet.Squirrel.dll + ..\packages\squirrel.windows.2.0.1\lib\Net45\NuGet.Squirrel.dll ..\packages\Ookii.Dialogs.Wpf.1.1.0\lib\net45\Ookii.Dialogs.Wpf.dll @@ -168,7 +169,7 @@ ..\packages\Simple-HTTP.1.0.6\lib\net47\SimpleHTTP.dll - ..\packages\squirrel.windows.2.0.0\lib\Net45\Squirrel.dll + ..\packages\squirrel.windows.2.0.1\lib\Net45\Squirrel.dll @@ -499,11 +500,11 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/BodyshopUploader/Utils/Auth.cs b/BodyshopUploader/Utils/Auth.cs index a8bfb72..1bc9396 100644 --- a/BodyshopUploader/Utils/Auth.cs +++ b/BodyshopUploader/Utils/Auth.cs @@ -17,6 +17,8 @@ namespace BodyshopPartner.Utils private static string U; private static string P; + + public async static Task<(bool, string)> LoginAsync(string Username, string Password) { U = Username; @@ -65,6 +67,7 @@ namespace BodyshopPartner.Utils { logger.Info("Old Token {0}", authlink.RefreshToken); await authlink.GetFreshAuthAsync(); + authlink = await ap.RefreshAuthAsync(authlink); logger.Info("new Token {0}", authlink.FirebaseToken); } diff --git a/BodyshopUploader/packages.config b/BodyshopUploader/packages.config index bad9b1d..441e84a 100644 --- a/BodyshopUploader/packages.config +++ b/BodyshopUploader/packages.config @@ -3,19 +3,19 @@ - - - + + + - + - - + + - + @@ -25,7 +25,7 @@ - +