server/AyaNova/util/License.cs

@@ -14,6 +14,7 @@ using Microsoft.EntityFrameworkCore;
 using Org.BouncyCastle.Security;
 using Org.BouncyCastle.OpenSsl;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 
 
@@ -456,7 +457,7 @@ namespace AyaNova.Core
                 if (res.IsSuccessStatusCode)
                 {
                     if (string.IsNullOrWhiteSpace(responseText))
-                        return "Accepted";
+                        return "ok";
                     else
                         return responseText;
                 }
@@ -491,10 +492,13 @@ namespace AyaNova.Core
                 if (res.IsSuccessStatusCode)
                 {
                     var responseText = await res.Content.ReadAsStringAsync();
-                    AyaNovaLicenseKey ParsedKey = Parse(responseText, log);
+                    var responseJson=JObject.Parse(responseText);
+                    var keyText=responseJson["data"]["key"].Value<string>();
+
+                    AyaNovaLicenseKey ParsedKey = Parse(keyText, log);
                     if (ParsedKey != null)
                     {
-                        await InstallAsync(responseText, ParsedKey, apiServerState, ct, log);
+                        await InstallAsync(keyText, ParsedKey, apiServerState, ct, log);
                         return "ok";
                     }
                     return $"E1020 - Error fetching license key: No key was returned";
@@ -670,7 +674,7 @@ namespace AyaNova.Core
                 CurrentInDbKeyRecord.Key = RawTextNewKey;
                 //LOOKAT: reason, resultcode etc
                 //There is similar block related to this in ayschema for db schema version 8
-                ct.SaveChanges();
+                await ct.SaveChangesAsync();
             }
             catch (Exception ex)
             {
@@ -718,6 +722,7 @@ namespace AyaNova.Core
 
                 string keyNoWS = System.Text.RegularExpressions.Regex.Replace(StringUtil.Extract(k, "[KEY", "KEY]").Trim(), "(\"(?:[^\"\\\\]|\\\\.)*\")|\\s+", "$1");
                 string keySig = StringUtil.Extract(k, "[SIGNATURE", "SIGNATURE]").Trim();
+//bugbug second time around after installing key, keysig has cr/lf characters in it after this extract method runs, not sure wtf as it isnt there the first time
 
                 #region Check Signature