From 9198e2a3eae5178f6f322e5ff9d67e3730718a79 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 22 Jun 2022 18:35:26 +0000 Subject: [PATCH] --- AyaNovaQBI/AyaNovaQBI.csproj | 4 ++++ AyaNovaQBI/AyaNovaQBI.sln | 16 ++++++++++++++++ AyaNovaQBI/Timestamp.cs | 34 ++++++++++++++++++++++++++++++++++ AyaNovaQBI/util.cs | 11 ++--------- 4 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 AyaNovaQBI/Timestamp.cs diff --git a/AyaNovaQBI/AyaNovaQBI.csproj b/AyaNovaQBI/AyaNovaQBI.csproj index 547a173..007b368 100644 --- a/AyaNovaQBI/AyaNovaQBI.csproj +++ b/AyaNovaQBI/AyaNovaQBI.csproj @@ -93,6 +93,7 @@ tfa.cs + @@ -150,4 +151,7 @@ + + "C:\data\code\ravenqbi\devutil\TimeStamp\TimeStamp.exe" "$(ProjectDir)Timestamp.cs" "/N:AyaNovaQBI" + \ No newline at end of file diff --git a/AyaNovaQBI/AyaNovaQBI.sln b/AyaNovaQBI/AyaNovaQBI.sln index 9decd09..f117caf 100644 --- a/AyaNovaQBI/AyaNovaQBI.sln +++ b/AyaNovaQBI/AyaNovaQBI.sln @@ -5,16 +5,32 @@ VisualStudioVersion = 17.2.32526.322 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaNovaQBI", "AyaNovaQBI.csproj", "{82CD8E13-3297-472B-8C59-C4A50A69CB5C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeStamp", "..\devutil\TimeStamp\TimeStamp.csproj", "{CE73BA18-914D-4426-8888-1DA0F0FC4764}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Debug|x86.ActiveCfg = Debug|Any CPU + {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Debug|x86.Build.0 = Debug|Any CPU {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Release|Any CPU.Build.0 = Release|Any CPU + {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Release|x86.ActiveCfg = Release|Any CPU + {82CD8E13-3297-472B-8C59-C4A50A69CB5C}.Release|x86.Build.0 = Release|Any CPU + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|x86.ActiveCfg = Debug|x86 + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|x86.Build.0 = Debug|x86 + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Release|Any CPU.Build.0 = Release|Any CPU + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Release|x86.ActiveCfg = Release|x86 + {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AyaNovaQBI/Timestamp.cs b/AyaNovaQBI/Timestamp.cs new file mode 100644 index 0000000..e395258 --- /dev/null +++ b/AyaNovaQBI/Timestamp.cs @@ -0,0 +1,34 @@ +using System; +// The namespace can be overidden by the /N option: +// GenerateTimeStampFile file.cs /N:MyNameSpace +// Such settings will override your value here. +namespace AyaNovaQBI + { + /// + /// Static Timestamp related data. + /// + /// + /// THIS FILE IS CHANGED BY EXTERNAL PROGRAMS. + /// Do not modify the namespace, as it may be overwritten. You can + /// set the namespace with the /N option. + /// Do not modify the definition of BuildAt as your changes will be discarded. + /// Do not modify the definition of TimeStampedBy as your changes will be discarded. + /// + public static class Timestamp + { + /// + /// The time stamp + /// + /// + /// Do not modify the definition of BuildAt as your changes will be discarded. + /// + public static DateTime BuildAt { get { return new DateTime(637914944578794775); } } //--** + /// + /// The program that time stamped it. + /// + /// + /// Do not modify the definition of TimeStampedBy as your changes will be discarded. + /// + public static string TimeStampedBy { get { return @"GZTW.AyaNova.BLL.TS"; } } //--** + } + } diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index 7c91c1f..ed1a76c 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -149,18 +149,13 @@ namespace AyaNovaQBI } else { - /* - "error": { - "code": "2001", - "message": "\"E1020 - License key expired 2022-06-20 5:00 PM\r\nLogin as SuperUser to start evaluation / install license\"" -} - - */ + if (a.ObjectResponse != null && a.ObjectResponse.ContainsKey("error")) { var errCode = a.ObjectResponse["error"]["code"].Value(); if (errCode.Contains("2003")) return false;//simple authentication error + //some other error, possibly expired ayanova license etc, show it so it's clear why the login failed so they known it's not a creds issue var errMessage = a.ObjectResponse["error"]["message"].Value(); throw new Exception($"Code: {errCode} - {errMessage}"); } @@ -483,7 +478,6 @@ namespace AyaNovaQBI var r = await GetAsync("license"); ALicense = r.ObjectResponse["data"]["license"].ToObject(); - //UNEXPIRED AYANOVA LICENSE? if (ALicense.licenseWillExpire && ALicense.licenseExpiration < DateTime.UtcNow) { @@ -491,7 +485,6 @@ namespace AyaNovaQBI return false; } - //QBI LICENSED? if (ALicense.features.FirstOrDefault(z => z.Feature == "QBI") == null) {