From 5cb34cf61995cd53a73c508bad232ea899121a5e Mon Sep 17 00:00:00 2001
From: Dirk-jan Mollema <dirkjan@outsidersecurity.nl>
Date: Wed, 23 Nov 2022 19:50:00 +0100
Subject: [PATCH] roadrecon: fix userType not being sent by server to frontend

---
 .../app/appmain/users/usersdialog/usersdialog.component.html   | 3 ++-
 roadrecon/roadtools/roadrecon/server.py                        | 2 +-
 roadrecon/setup.py                                             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roadrecon/frontend/src/app/appmain/users/usersdialog/usersdialog.component.html b/roadrecon/frontend/src/app/appmain/users/usersdialog/usersdialog.component.html
index 02c9adb..e5882b8 100644
--- a/roadrecon/frontend/src/app/appmain/users/usersdialog/usersdialog.component.html
+++ b/roadrecon/frontend/src/app/appmain/users/usersdialog/usersdialog.component.html
@@ -12,7 +12,8 @@
         <tr *ngIf="user.lastPasswordChangeDateTime != null"><th>Last password change</th><td>{{ user.lastPasswordChangeDateTime }}</td></tr>
         <tr *ngIf="user.jobTitle != null"><th>Job Title</th><td>{{ user.jobTitle }}</td></tr>
         <tr *ngIf="user.mobile != null"><th>Mobile</th><td>{{ user.mobile }}</td></tr>
-        <tr><th>Account type</th><td>{{ user.dirSyncEnabled? 'Synced with AD':'Cloud-only' }}</td></tr>
+        <tr><th>Account source</th><td>{{ user.dirSyncEnabled? 'Synced with AD':'Cloud-only' }}</td></tr>
+        <tr><th>Account type</th><td>{{ user.userType }}</td></tr>
         <tr><th>Status</th><td>{{ user.accountEnabled? 'Enabled':'Disabled' }}</td></tr>
       </table>
     </mat-card>
diff --git a/roadrecon/roadtools/roadrecon/server.py b/roadrecon/roadtools/roadrecon/server.py
index 40bb940..f0ca96c 100644
--- a/roadrecon/roadtools/roadrecon/server.py
+++ b/roadrecon/roadtools/roadrecon/server.py
@@ -41,7 +41,7 @@ class RTModelSchema(ma.SQLAlchemyAutoSchema):
 class UsersSchema(ma.Schema):
     class Meta:
         model = User
-        fields = ('objectId', 'objectType', 'userPrincipalName', 'displayName', 'mail', 'lastDirSyncTime', 'accountEnabled', 'department', 'lastPasswordChangeDateTime', 'jobTitle', 'mobile', 'dirSyncEnabled', 'strongAuthenticationDetail')
+        fields = ('objectId', 'objectType', 'userPrincipalName', 'displayName', 'mail', 'lastDirSyncTime', 'accountEnabled', 'department', 'lastPasswordChangeDateTime', 'jobTitle', 'mobile', 'dirSyncEnabled', 'strongAuthenticationDetail', 'userType')
 
 class DevicesSchema(ma.Schema):
     class Meta:
diff --git a/roadrecon/setup.py b/roadrecon/setup.py
index 33ba160..0218f64 100644
--- a/roadrecon/setup.py
+++ b/roadrecon/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 setup(name='roadrecon',
-      version='1.0.0',
+      version='1.0.1',
       description='Azure AD recon for red/blue',
       author='Dirk-jan Mollema',
       author_email='dirkjan@dirkjanm.io',