This commit is contained in:
@@ -401,9 +401,43 @@ namespace Sockeye.Biz
|
||||
"Count": 20
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
|
||||
"Key": {
|
||||
"LicenseFormat": "8",
|
||||
"Id": "00-1593712003",
|
||||
"RegisteredTo": "Test corporation",
|
||||
"DBID": "mRntGkdwvYCDOAOroCQpB5Elbct09iNIS7lcU7QgRCY=",
|
||||
"LicenseExpiration": "2020-08-16T17:46:43.6261717Z",
|
||||
"MaintenanceExpiration": "2020-08-16T17:46:43.6261717Z",
|
||||
"Features": [
|
||||
{
|
||||
"Name": "TrialMode"
|
||||
},
|
||||
{
|
||||
"Name": "ServiceMode"
|
||||
},
|
||||
{
|
||||
"Name": "Accounting"
|
||||
},
|
||||
{
|
||||
"Name": "ServiceTechs",
|
||||
"Count": 1000
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
*/
|
||||
string keyNoWS = System.Text.RegularExpressions.Regex.Replace(StringUtil.Extract(l.Key, "[KEY", "KEY]").Trim(), "(\"(?:[^\"\\\\]|\\\\.)*\")|\\s+", "$1");
|
||||
var jKey = JObject.Parse(keyNoWS);
|
||||
|
||||
// #if (DEBUG)
|
||||
// if (jKey["Key"]["DBID"].Value<string>() == "mRntGkdwvYCDOAOroCQpB5Elbct09iNIS7lcU7QgRCY=")
|
||||
// System.Diagnostics.Debugger.Break();
|
||||
// #endif
|
||||
|
||||
|
||||
var jaFeatures = (JArray)jKey.SelectToken("Key.Features");
|
||||
for (int x = 0; x < jaFeatures.Count; x++)
|
||||
{
|
||||
@@ -417,7 +451,7 @@ namespace Sockeye.Biz
|
||||
if (jFeature["Count"] != null)
|
||||
count = jFeature["Count"].Value<int>();
|
||||
|
||||
if (feature == "ActiveInternalUsers")
|
||||
if (feature == "ActiveInternalUsers" || feature == "ServiceTechs")//at one point early in testing was ServiceTechs kept for import from rockfish
|
||||
l.Users = count;
|
||||
|
||||
if (feature == "ActiveCustomerUsers")
|
||||
@@ -429,6 +463,10 @@ namespace Sockeye.Biz
|
||||
}
|
||||
|
||||
}
|
||||
#if (DEBUG)
|
||||
if (l.Users == 0)
|
||||
System.Diagnostics.Debugger.Break();
|
||||
#endif
|
||||
return l;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user