From 5b2f190bbf832a8e869854f035650a334d13a5fc Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 20 Jun 2022 23:54:52 +0000 Subject: [PATCH] --- AyaNovaQBI/auth.cs | 1 - AyaNovaQBI/util.cs | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/AyaNovaQBI/auth.cs b/AyaNovaQBI/auth.cs index 22a2a79..f587f9a 100644 --- a/AyaNovaQBI/auth.cs +++ b/AyaNovaQBI/auth.cs @@ -91,7 +91,6 @@ namespace AyaNovaQBI AyaNovaUserName: {util.AyaNovaUserName}\r\n JWT: {util.JWT}\r\n AyaNovaUserId: {util.AyaNovaUserId}\r\n -AyaNovaUserTranslationId: {util.AyaNovaUserTranslationId}\r\n AyaNovaUserRoles: {util.AyaNovaUserRoles}\r\n AyaNovaUserType: {util.AyaNovaUserType}"); diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index 617e56e..3285289 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -25,8 +25,8 @@ namespace AyaNovaQBI internal static string GuessClientUrl { get; set; } internal static string JWT { get; set; } - internal static long AyaNovaUserId { get; set; } - internal static long AyaNovaUserTranslationId { get; set; } + + // internal static long AyaNovaUserId { get; set; } //probably don't need this, if I do then some code will need to be added to decode the JWT or at the server to get my currently logged in USER ID internal static string AyaNovaUserName { get; set; } internal static AuthorizationRoles AyaNovaUserRoles { get; set; } internal static UserType AyaNovaUserType { get; set; } @@ -162,9 +162,8 @@ namespace AyaNovaQBI throw new Exception("Server login from QBI is disabled due to AyaNova license issue"); } - JWT = a.ObjectResponse["data"]["token"].Value(); - // AyaNovaUserId= a.ObjectResponse["data"]["id"].Value();//nbot here maybe in jwt - //AyaNovaUserTranslationId = a.ObjectResponse["data"]["tid"].Value(); + JWT = a.ObjectResponse["data"]["token"].Value(); + AyaNovaUserName = a.ObjectResponse["data"]["name"].Value(); AyaNovaUserRoles = (AuthorizationRoles)(int.Parse(a.ObjectResponse["data"]["roles"].Value())); AyaNovaUserType = (UserType)(int.Parse(a.ObjectResponse["data"]["usertype"].Value()));