From 41b4fb300cfb6e41504f3d935121bd83e4b3db9d Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 24 Jan 2024 09:50:18 -0800
Subject: [PATCH 01/69] Adds first-draft of directory

---
 .../Controllers/DirectoryController.cs        | 131 +++++++++++++++
 .../Models/IndividualSearchResult.cs          |  75 +++++++++
 web/Areas/Directory/Views/Index.cshtml        | 151 ++++++++++++++++++
 web/Areas/Directory/Views/UserInfo.cshtml     |   5 +
 4 files changed, 362 insertions(+)
 create mode 100644 web/Areas/Directory/Controllers/DirectoryController.cs
 create mode 100644 web/Areas/Directory/Models/IndividualSearchResult.cs
 create mode 100644 web/Areas/Directory/Views/Index.cshtml
 create mode 100644 web/Areas/Directory/Views/UserInfo.cshtml

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
new file mode 100644
index 0000000..a39601d
--- /dev/null
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -0,0 +1,131 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Viper.Models.AAUD;
+using Viper.Models.RAPS;
+using Viper.Areas.RAPS.Services;
+using Web.Authorization;
+using Microsoft.IdentityModel.Tokens;
+using Viper.Classes;
+using Polly;
+using Viper.Classes.SQLContext;
+using Viper.Areas.RAPS.Models;
+using Viper.Areas.Directory.Models;
+using System;
+
+namespace Viper.Areas.Directory.Controllers
+{
+    //TODO: Create the Directory Delegate Users role and add anyone with access to delegate roles
+    [Area("Directory")]
+    [Authorize(Roles = "VMDO SVM-IT,RAPS Delegate Users", Policy = "2faAuthentication")]
+    public class DirectoryController : AreaController
+    {
+        private readonly Classes.SQLContext.RAPSContext _RAPSContext;
+        private RAPSSecurityService _securityService;
+        public Classes.SQLContext.AAUDContext _aaud;
+        public IUserHelper UserHelper;
+
+        public DirectoryController(Classes.SQLContext.RAPSContext context)
+        {
+            _RAPSContext = context;
+            _securityService = new RAPSSecurityService(context);
+            _aaud = new AAUDContext();
+        }
+
+        /// <summary>
+        /// Directory home page
+        /// </summary>
+        [Route("/[area]/")]
+        public async Task<ActionResult> Index()
+        {
+            return await Task.Run(() => View("~/Areas/Directory/Views/Index.cshtml"));
+        }
+
+        [Route("/[area]/[action]")]
+        public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav(int? roleId, int? permissionId, string? memberId, string instance = "VIPER")
+        {
+            var nav = new List<NavMenuItem>();
+            return nav;
+        }
+
+        /// <summary>
+        /// Directory list
+        /// </summary>
+        /// <param name="search">search string</param>
+        /// <returns></returns>
+        [Route("/[area]/search/{search}")]
+        public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
+        {
+            var individuals = await _aaud.AaudUsers
+                     .Where(u => (u.DisplayFirstName + " " + u.DisplayLastName).Contains(search)
+                         || (u.MailId != null && u.MailId.Contains(search))
+                         || (u.LoginId != null && u.LoginId.Contains(search))
+            )
+            .Where(u => u.Current != 0)
+            .OrderBy(u => u.DisplayLastName)
+            .ThenBy(u => u.DisplayFirstName)
+                     .ToListAsync();
+            List<IndividualSearchResult> results = new();
+            individuals.ForEach(m =>
+            {
+                results.Add(new IndividualSearchResult()
+                {
+                    ClientId = m.ClientId,
+                    MothraId = m.MothraId,
+                    LoginId = m.LoginId,
+                    MailId = m.MailId,
+                    SpridenId = m.SpridenId,
+                    Pidm = m.Pidm,
+                    EmployeeId = m.EmployeeId,
+                    VmacsId = m.VmacsId,
+                    VmcasId = m.VmcasId,
+                    UnexId = m.UnexId,
+                    MivId = m.MivId,
+                    LastName = m.LastName,
+                    FirstName = m.FirstName,
+                    MiddleName = m.MiddleName,
+                    DisplayLastName = m.DisplayLastName,
+                    DisplayFirstName = m.DisplayFirstName,
+                    DisplayMiddleName = m.DisplayMiddleName,
+                    DisplayFullName = m.DisplayFullName,
+                    Name = m.DisplayFullName,
+                    CurrentStudent = m.CurrentStudent,
+                    FutureStudent = m.FutureStudent,
+                    CurrentEmployee = m.CurrentEmployee,
+                    FutureEmployee = m.FutureEmployee,
+                    StudentTerm = m.StudentTerm,
+                    EmployeeTerm = m.EmployeeTerm,
+                    PpsId = m.PpsId,
+                    StudentPKey = m.StudentPKey,
+                    EmployeePKey = m.EmployeePKey,
+                    Current = m.Current,
+                    Future = m.Future,
+                    IamId = m.IamId,
+                    Ross = m.Ross,
+                    Added = m.Added
+                });
+            });
+            results.ForEach(r =>
+            {
+                LdapUser l = new LdapService().GetUser(r.LoginId);
+                r.Title = l.Title;
+                r.Department = l.Department;
+            });
+
+            return results;
+        }
+
+
+        /// <summary>
+        /// Directory results
+        /// </summary>
+        /// <param name="uid">User ID</param>
+        /// <returns></returns>
+        [Route("/[area]/userInfo/{mothraID}")]
+        public async Task<IActionResult> DirectoryResult(string mothraID)
+        {
+            // pull in the user based on uid
+            return await Task.Run(() => View("~/Areas/Directory/Views/UserInfo.cshtml"));
+        }
+    }
+}
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
new file mode 100644
index 0000000..7f47826
--- /dev/null
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -0,0 +1,75 @@
+namespace Viper.Areas.Directory.Models
+{
+    public class IndividualSearchResult
+    {
+        public string ClientId { get; set; } = string.Empty;
+
+        public string MothraId { get; set; } = string.Empty;
+
+        public string? LoginId { get; set; } = string.Empty;
+
+        public string? MailId { get; set; } = string.Empty;
+
+        public string? SpridenId { get; set; } = string.Empty;
+
+        public string? Pidm { get; set; } = string.Empty;
+
+        public string? EmployeeId { get; set; } = string.Empty;
+
+        public int? VmacsId { get; set; } = null!;
+
+        public string? VmcasId { get; set; } = string.Empty;
+
+        public string? UnexId { get; set; } = string.Empty;
+
+        public int? MivId { get; set; } = null!;
+
+        public string LastName { get; set; } = string.Empty;
+
+        public string FirstName { get; set; } = string.Empty;
+
+        public string? MiddleName { get; set; } = string.Empty;
+
+        public string DisplayLastName { get; set; } = string.Empty;
+
+        public string DisplayFirstName { get; set; } = string.Empty;
+
+        public string? DisplayMiddleName { get; set; } = string.Empty;
+
+        public string DisplayFullName { get; set; } = string.Empty;
+        public string Name { get; set; } = string.Empty;
+        public bool CurrentStudent { get; set; } = false;
+
+        public bool FutureStudent { get; set; } = false;
+
+        public bool CurrentEmployee { get; set; } = false;
+
+        public bool FutureEmployee { get; set; } = false;
+
+        public int? StudentTerm { get; set; } = null!;
+
+        public int? EmployeeTerm { get; set; } = null!;
+
+        public string? PpsId { get; set; } = string.Empty;
+
+        public string? StudentPKey { get; set; } = string.Empty;
+
+        public string? EmployeePKey { get; set; } = string.Empty;
+        public string? Title { get; set; } = string.Empty;
+        public string? Department { get; set; } = string.Empty;
+
+        public int Current { get; set; } = -1;
+
+        public int Future { get; set; } = -1;
+
+        public string? IamId { get; set; } = string.Empty;
+
+        public bool? Ross { get; set; } = null!;
+
+        public DateTime? Added { get; set; } = null!;
+
+        public bool Can_See_IDs { get; set; } = false;
+        public bool Can_Spoof { get; set; } = false;
+        public bool Can_See_UserInfo { get; set; } = false;
+    }
+}
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
new file mode 100644
index 0000000..79a1d04
--- /dev/null
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -0,0 +1,151 @@
+@using Viper.Classes.SQLContext;
+@model Viper.Models.AAUD.AaudUser
+@{
+    RAPSContext? rapsContext = (RAPSContext?)Context.RequestServices.GetService(typeof(RAPSContext));
+    IUserHelper UserHelper = new UserHelper();
+}
+@{
+    ViewData["Title"] = "Directory";
+}
+<h2>Directory</h2>
+<q-form @@submit="return false;">
+    <q-input class="q-ml-xs q-mr-xs"
+             dense
+             clearable
+             clear-icon="close"
+             outlined
+             debounce="300"
+             placeholder="Search for users"
+             v-model="userSearch"
+             autofocus>
+    </q-input>
+</q-form>
+
+<q-table title="Search Results"
+         dense
+         row-key="mothraId"
+         :loading="users.loading"
+         :rows="users.rows"
+         :columns="users.columns"
+         :pagination="users.pagination"
+         no-data-label="Search by first or last name"
+         no-results-label="No results found">
+    <template v-slot:body-cell-photo="props">
+        <q-td :props="props">
+            <q-img :props="props" :src="'https://viper.vetmed.ucdavis.edu/public/utilities/getbase64image.cfm?mothraID=' + props.row.mothraId + '&altphoto=1'" style="width:87px; height:111px" :id="'photo_' + props.row.mothraId"></q-img>
+            <q-tooltip :target="true">
+                {{props.row.displayFirstName}} {{props.row.displayLastName}}
+            </q-tooltip>
+        </q-td>
+    </template>
+    <template v-slot:body-cell-name="props">
+        <q-td :props="props">
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.userinfo"))
+            {
+                @: <a :href="'userInfo/' + props.row.mothraId">{{ props.row.name }}</a>
+            } else {
+                @: {{ props.row.name }}
+            }
+        </q-td>
+    </template>
+    <template v-slot:body-cell-email="props">
+        <q-td :props="props" v-if="props.row.mailId != ''">
+            <a :href="'mailto:' + props.row.mailId + '@@ucdavis.edu'">{{ props.row.mailId }}</a>
+        </q-td>
+    </template>
+    <template v-slot:body-cell-ids="props">
+        <q-td :props="props">
+            <div>BannerID:
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+            {
+                   @: <a :href="'https://viper.vetmed.ucdavis.edu/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + props.row.spridenId + '&JumpPage=Home'">{{ props.row.spridenId }}</a>
+            } else {
+                   @: {{ props.row.spridenId }}
+            }
+            </div>
+            <div>PIDM: {{ props.row.pidm }}</div>
+            <div>EmployeeID: {{ props.row.employeeId}}</div>
+            <div>IAMID: {{ props.row.iamId }}</div>
+            <div>MothraID: {{ props.row.mothraId }}</div>
+            <div v-if="props.row.mivId > 0">MIVID: {{ props.row.mivId }}</div>
+        </q-td>
+    </template>
+    <template v-slot:body-cell-detail="props">
+        <q-td :props="props">
+            <div><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=AAUDCheck&mothraID=' + props.row.mothraId + '&loginID=' + props.row.loginId">AAUD Check</a></div>
+            <div><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=IDCardCheck&LoginID=' + props.row.loginId">ID Check</a></div>
+            <div><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=UnitHeads&MailID=' + props.row.mailId">MSO/CAO Lookup</a></div>
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
+            {
+                @: <div v-if="props.row.employeeId != ''"><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=UCPathInfo&emplid=' + props.row.employeeId">UCPath Info</a></div>
+            }
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
+            {
+                @: <div v-if="props.row.currentAffiliate == true"><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=alternatePhoto&iamID' + props.row.iamId + '&mailID=' + props.row.mailId + '&empName=' + props.row.name">Alt. Photo</a></div>
+            }
+        </q-td>
+    </template>
+    <template v-slot:body-cell-links="props">
+        <q-td :props="props">
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.userinfo"))
+            {
+                @: <q-btn :props="props" size="sm" padding="xs" color="primary" square flat icon="person" :href="'userInfo/' + props.row.mothraId"></q-btn>
+            }
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SU"))
+            {
+                @: <q-btn :props="props" size="sm" padding="xs" color="primary" square flat icon="face" :href="'/EmulateUser/' + props.row.loginId"></q-btn>
+            }
+        </q-td>
+    </template>
+</q-table>
+@section Scripts {
+    <script src="~/js/qtable.js"></script>
+    <script asp-add-nonce="true">
+        createVueApp({
+            data() {
+                return {
+                    userSearch: getItemFromStorage("searchField") ?? "",
+                    users: new quasarTable({
+                        keys: ["mothraId"],
+                        urlBase: "users",
+                        columns: [
+                            { name: "photo", label: "", field: "", align: "center", style: "width:87px; height:111px;" },
+                            { name: "name", label: "Individual", field: "name", align: "left", style: "max-width:10em; text-wrap:wrap;", sortable: true },
+                            { name: "title", label: "Title", field: "title", align: "left", style: "max-width:10em; text-wrap:wrap;", sortable: true },
+                            { name: "department", label: "Department", field: "department", style: "max-width:10em; text-wrap:wrap;", align: "left", sortable: true },
+                            { name: "ids", label: "", field: "", align: "left" },
+                            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryDetail")) {
+                                @: { name: "detail", label: "", field: "", align: "left" },
+                            }
+                            { name: "loginid", label: "Login ID", field: "loginId", align: "left", sortable: true },
+                            { name: "email", label: "Email", field: "mailId", align: "left", sortable: true },
+                            { name: "links", label: "", field: "", align: "left", style: "width:50px;" }
+                        ],
+                        pagination: { rowsPerPage: 0 }
+                    })
+                }
+            },
+            methods: {
+                findUsers: async function () {
+                    this.users.urlBase = "search/" + this.userSearch
+                    if (this.userSearch.length >= 3) {
+                        this.users.load(this)
+                    }
+                }
+            },
+            mounted() {
+                this.users.loading = false;
+                if (this.userSearch.length >= 3) {
+                    this.users.urlBase = "search/" + this.userSearch;
+                    this.users.load(this);
+                }
+            },
+            watch: {
+                userSearch: function () {
+                    putItemInStorage("searchField", this.userSearch)
+                    this.findUsers()
+                }
+            }
+        })
+    </script>
+}
\ No newline at end of file
diff --git a/web/Areas/Directory/Views/UserInfo.cshtml b/web/Areas/Directory/Views/UserInfo.cshtml
new file mode 100644
index 0000000..87f162d
--- /dev/null
+++ b/web/Areas/Directory/Views/UserInfo.cshtml
@@ -0,0 +1,5 @@
+@{
+    ViewData["Title"] = "User Info Page";
+}
+<article class="userinfo">
+</article>

From be69e19c758f19eb946136b93f0690930fc0648f Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 31 Jan 2024 08:24:17 -0800
Subject: [PATCH 02/69] Addresses Brandon's first round of recommendations

I'm sure there will be additional back-and-forth, but here's the next round of changes:

--- [Permission(Allow = "SVMSecure")] is probably a sufficient permission check. As it is now, this restricts the page to a much smaller set of users.
Done

--- Make sure to remove copy/pasted variables that are not needed in this class
Sorry about that; I had left in some of my early code (as I was trying to figure out how all this works!). I removed the variables, but I added back in what seemed necessary to do the permission check.

--- We might need a permission check here for the IDs. Since this data is sent to the browser via AJAX, it's visible to the user, even if not included in the page. One way to handle this would be the IndividualSearchResult class only containing data visible to everyone, and then an IndividualSearchResultWithIds child class containing the restricted data.

Maybe you can help me think about a better way of doing this. I couldn't quite figure out how to use a generic to be able to switch between the two possible resulting objects.

--- There's a static function GetOldViperRootURL() in HttpHelper that could be used to get the url for Viper on the current server, instead of hard coding viper.vetmed.

Good tip. Thanks! Its seems like vue isn't very happy with localhost, but maybe adding a local certificate will help with some of the problems I am now getting.

--- The key for the storage has to be unique across all of VIPER, so consider prefixing searchField with, e.g. directory or some other prefix.
Fixed. I am now using directory_search

--- I know I used 3 as the min length for RAPS, but it's been suggested to me that 2 might be better.
Good suggestion. Fixed.

--- Consider allowing additional ID searches - pidm, spriden id, mothra id, employee id, iam id
Done

--- I'm glad you were able to use this class!
I added phone number to the LDAP lookup. If that is getting too unwieldy, we could pull it out of RAPS and create a generic LDAPlookup class.
---
 .../Controllers/DirectoryController.cs        | 58 ++++++++------
 .../Models/IndividualSearchResult.cs          |  6 +-
 web/Areas/Directory/Views/Index.cshtml        | 40 ++++++----
 web/Areas/RAPS/Models/LdapUserContact.cs      | 76 +++++++++++++++++++
 web/Areas/RAPS/Services/LdapService.cs        | 33 +++++++-
 5 files changed, 170 insertions(+), 43 deletions(-)
 create mode 100644 web/Areas/RAPS/Models/LdapUserContact.cs

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index a39601d..563de7e 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -12,24 +12,24 @@
 using Viper.Areas.RAPS.Models;
 using Viper.Areas.Directory.Models;
 using System;
+using Viper;
 
 namespace Viper.Areas.Directory.Controllers
 {
-    //TODO: Create the Directory Delegate Users role and add anyone with access to delegate roles
     [Area("Directory")]
-    [Authorize(Roles = "VMDO SVM-IT,RAPS Delegate Users", Policy = "2faAuthentication")]
+    [Authorize(Roles = "VMDO SVM-IT", Policy = "2faAuthentication")]
+    [Permission(Allow = "SVMSecure")]
     public class DirectoryController : AreaController
     {
-        private readonly Classes.SQLContext.RAPSContext _RAPSContext;
-        private RAPSSecurityService _securityService;
         public Classes.SQLContext.AAUDContext _aaud;
+        private readonly RAPSContext? _rapsContext;
         public IUserHelper UserHelper;
 
         public DirectoryController(Classes.SQLContext.RAPSContext context)
         {
-            _RAPSContext = context;
-            _securityService = new RAPSSecurityService(context);
             _aaud = new AAUDContext();
+            this._rapsContext = (RAPSContext?)HttpHelper.HttpContext?.RequestServices.GetService(typeof(RAPSContext));
+            UserHelper = new UserHelper();
         }
 
         /// <summary>
@@ -41,13 +41,6 @@ public async Task<ActionResult> Index()
             return await Task.Run(() => View("~/Areas/Directory/Views/Index.cshtml"));
         }
 
-        [Route("/[area]/[action]")]
-        public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav(int? roleId, int? permissionId, string? memberId, string instance = "VIPER")
-        {
-            var nav = new List<NavMenuItem>();
-            return nav;
-        }
-
         /// <summary>
         /// Directory list
         /// </summary>
@@ -60,6 +53,11 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                      .Where(u => (u.DisplayFirstName + " " + u.DisplayLastName).Contains(search)
                          || (u.MailId != null && u.MailId.Contains(search))
                          || (u.LoginId != null && u.LoginId.Contains(search))
+                         || (u.SpridenId != null && u.SpridenId.Contains(search))
+                         || (u.Pidm != null && u.Pidm.Contains(search))
+                         || (u.MothraId != null && u.MothraId.Contains(search))
+                         || (u.EmployeeId != null && u.EmployeeId.Contains(search))
+                         || (u.IamId != null && u.IamId.Contains(search))
             )
             .Where(u => u.Current != 0)
             .OrderBy(u => u.DisplayLastName)
@@ -70,17 +68,9 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             {
                 results.Add(new IndividualSearchResult()
                 {
-                    ClientId = m.ClientId,
                     MothraId = m.MothraId,
                     LoginId = m.LoginId,
                     MailId = m.MailId,
-                    SpridenId = m.SpridenId,
-                    Pidm = m.Pidm,
-                    EmployeeId = m.EmployeeId,
-                    VmacsId = m.VmacsId,
-                    VmcasId = m.VmcasId,
-                    UnexId = m.UnexId,
-                    MivId = m.MivId,
                     LastName = m.LastName,
                     FirstName = m.FirstName,
                     MiddleName = m.MiddleName,
@@ -102,14 +92,36 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                     Future = m.Future,
                     IamId = m.IamId,
                     Ross = m.Ross,
-                    Added = m.Added
+                    Added = m.Added,
+                    SpridenId = m.SpridenId,
+                    Pidm = m.Pidm,
+                    EmployeeId = m.EmployeeId,
+                    VmacsId = m.VmacsId,
+                    UnexId = m.UnexId,
+                    MivId = m.MivId,
                 });
             });
+            AaudUser? currentUser = UserHelper.GetCurrentUser();
+            if (!UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
+            {
+                results.ForEach(r =>
+                {
+                    r.SpridenId = null;
+                    r.Pidm = null;
+                    r.EmployeeId = null;
+                    r.VmacsId = null;
+                    r.UnexId = null;
+                });
+            }
+
             results.ForEach(r =>
             {
-                LdapUser l = new LdapService().GetUser(r.LoginId);
+                LdapUserContact l = new LdapService().GetUserContact(r.LoginId);
                 r.Title = l.Title;
                 r.Department = l.Department;
+                r.Phone = l.Phone;
+                r.Mobile = l.Mobile;
+                r.UserName = l.UserName;
             });
 
             return results;
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 7f47826..423df22 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -68,8 +68,8 @@ public class IndividualSearchResult
 
         public DateTime? Added { get; set; } = null!;
 
-        public bool Can_See_IDs { get; set; } = false;
-        public bool Can_Spoof { get; set; } = false;
-        public bool Can_See_UserInfo { get; set; } = false;
+        public string? Phone { get; set; } = null!;
+        public string? Mobile { get; set; } = null!;
+        public string? UserName { get; set; } = null!;
     }
 }
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
index 79a1d04..51cc42c 100644
--- a/web/Areas/Directory/Views/Index.cshtml
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -3,8 +3,6 @@
 @{
     RAPSContext? rapsContext = (RAPSContext?)Context.RequestServices.GetService(typeof(RAPSContext));
     IUserHelper UserHelper = new UserHelper();
-}
-@{
     ViewData["Title"] = "Directory";
 }
 <h2>Directory</h2>
@@ -32,7 +30,7 @@
          no-results-label="No results found">
     <template v-slot:body-cell-photo="props">
         <q-td :props="props">
-            <q-img :props="props" :src="'https://viper.vetmed.ucdavis.edu/public/utilities/getbase64image.cfm?mothraID=' + props.row.mothraId + '&altphoto=1'" style="width:87px; height:111px" :id="'photo_' + props.row.mothraId"></q-img>
+            <q-img :props="props" :src="'@HttpHelper.GetOldViperRootURL()' + '/public/utilities/getbase64image.cfm?mothraID=' + props.row.mothraId + '&altphoto=1'" style="width:87px; height:111px" :id="'photo_' + props.row.mothraId"></q-img>
             <q-tooltip :target="true">
                 {{props.row.displayFirstName}} {{props.row.displayLastName}}
             </q-tooltip>
@@ -48,6 +46,12 @@
             }
         </q-td>
     </template>
+    <template v-slot:body-cell-title="props">
+        <q-td :props="props">
+            <div v-if="props.row.title">{{ props.row.title }}</div>
+            <div v-if="props.row.department">{{ props.row.department }}</div>
+        </q-td>
+    </template>
     <template v-slot:body-cell-email="props">
         <q-td :props="props" v-if="props.row.mailId != ''">
             <a :href="'mailto:' + props.row.mailId + '@@ucdavis.edu'">{{ props.row.mailId }}</a>
@@ -58,7 +62,7 @@
             <div>BannerID:
             @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
             {
-                   @: <a :href="'https://viper.vetmed.ucdavis.edu/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + props.row.spridenId + '&JumpPage=Home'">{{ props.row.spridenId }}</a>
+                    @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + props.row.spridenId + '&JumpPage=Home'">{{ props.row.spridenId }}</a>
             } else {
                    @: {{ props.row.spridenId }}
             }
@@ -72,19 +76,25 @@
     </template>
     <template v-slot:body-cell-detail="props">
         <q-td :props="props">
-            <div><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=AAUDCheck&mothraID=' + props.row.mothraId + '&loginID=' + props.row.loginId">AAUD Check</a></div>
-            <div><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=IDCardCheck&LoginID=' + props.row.loginId">ID Check</a></div>
-            <div><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=UnitHeads&MailID=' + props.row.mailId">MSO/CAO Lookup</a></div>
+            <div><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + props.row.mothraId + '&loginID=' + props.row.loginId">AAUD Check</a></div>
+            <div><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + props.row.loginId">ID Check</a></div>
+            <div><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + props.row.mailId">MSO/CAO Lookup</a></div>
             @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
             {
-                @: <div v-if="props.row.employeeId != ''"><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=UCPathInfo&emplid=' + props.row.employeeId">UCPath Info</a></div>
+                @: <div v-if="props.row.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + props.row.employeeId">UCPath Info</a></div>
             }
             @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
             {
-                @: <div v-if="props.row.currentAffiliate == true"><a :href="'https://viper.vetmed.ucdavis.edu/default.cfm?Page=alternatePhoto&iamID' + props.row.iamId + '&mailID=' + props.row.mailId + '&empName=' + props.row.name">Alt. Photo</a></div>
+                @: <div v-if="props.row.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + props.row.iamId + '&mailID=' + props.row.mailId + '&empName=' + props.row.name">Alt. Photo</a></div>
             }
         </q-td>
     </template>
+    <template v-slot:body-cell-phone="props">
+        <q-td :props="props">
+            <div v-if="props.row.phone">Phone: {{ props.row.phone }}</div>
+            <div v-if="props.row.mobile">Mobile: {{ props.row.mobile }}</div>
+        </q-td>
+    </template>
     <template v-slot:body-cell-links="props">
         <q-td :props="props">
             @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.userinfo"))
@@ -104,21 +114,21 @@
         createVueApp({
             data() {
                 return {
-                    userSearch: getItemFromStorage("searchField") ?? "",
+                    userSearch: getItemFromStorage("directory_search") ?? "",
                     users: new quasarTable({
                         keys: ["mothraId"],
                         urlBase: "users",
                         columns: [
                             { name: "photo", label: "", field: "", align: "center", style: "width:87px; height:111px;" },
                             { name: "name", label: "Individual", field: "name", align: "left", style: "max-width:10em; text-wrap:wrap;", sortable: true },
-                            { name: "title", label: "Title", field: "title", align: "left", style: "max-width:10em; text-wrap:wrap;", sortable: true },
-                            { name: "department", label: "Department", field: "department", style: "max-width:10em; text-wrap:wrap;", align: "left", sortable: true },
+                            { name: "title", label: "Title/Department", field: "", align: "left", style: "max-width:10em; text-wrap:wrap;" },
                             { name: "ids", label: "", field: "", align: "left" },
                             @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryDetail")) {
                                 @: { name: "detail", label: "", field: "", align: "left" },
                             }
                             { name: "loginid", label: "Login ID", field: "loginId", align: "left", sortable: true },
                             { name: "email", label: "Email", field: "mailId", align: "left", sortable: true },
+                            { name: "phone", label: "Phone", field: "", align: "left" },
                             { name: "links", label: "", field: "", align: "left", style: "width:50px;" }
                         ],
                         pagination: { rowsPerPage: 0 }
@@ -128,21 +138,21 @@
             methods: {
                 findUsers: async function () {
                     this.users.urlBase = "search/" + this.userSearch
-                    if (this.userSearch.length >= 3) {
+                    if (this.userSearch.length >= 2) {
                         this.users.load(this)
                     }
                 }
             },
             mounted() {
                 this.users.loading = false;
-                if (this.userSearch.length >= 3) {
+                if (this.userSearch.length >= 2) {
                     this.users.urlBase = "search/" + this.userSearch;
                     this.users.load(this);
                 }
             },
             watch: {
                 userSearch: function () {
-                    putItemInStorage("searchField", this.userSearch)
+                    putItemInStorage("directory_search", this.userSearch)
                     this.findUsers()
                 }
             }
diff --git a/web/Areas/RAPS/Models/LdapUserContact.cs b/web/Areas/RAPS/Models/LdapUserContact.cs
new file mode 100644
index 0000000..8689980
--- /dev/null
+++ b/web/Areas/RAPS/Models/LdapUserContact.cs
@@ -0,0 +1,76 @@
+using Newtonsoft.Json;
+using System.DirectoryServices;
+using System.Linq.Dynamic.Core;
+using System.Runtime.Versioning;
+
+namespace Viper.Areas.RAPS.Models
+{
+    [SupportedOSPlatform("windows")]
+    public class LdapUserContact
+    {
+        public string SamAccountName { get; set; } = null!;
+        public byte[] ObjectGuid { get; set; } = null!;
+        public string Cn { get; set; } = null!;
+        public string CanonicalName { get; set; } = null!;
+        public string Dn { get; set; } = null!;
+        public string DistinguishedName { get; set; } = null!;
+        public string GivenName { get; set; } = null!;
+        public string Sn { get; set; } = null!;
+        public string DisplayName { get; set; } = null!;
+        public string Description { get; set; } = "";
+        public string UserPrincipalName { get; set; } = null!;
+        public string Title { get; set; } = null!;
+        public string Department { get; set; } = null!; 
+        public string UidNumber { get; set; } = null!;
+        public string MemberOf { get; set; } = null!;
+        public string Phone { get; set; } = null!;
+        public string Mobile { get; set; } = null!;
+        public string Mail { get; set; } = null!;
+        public string UserName { get; set; } = null!;
+
+        public LdapUserContact() { }
+        public LdapUserContact(SearchResult? ldapSearchResult)
+        {
+            if (ldapSearchResult != null)
+            {
+                foreach (System.Collections.DictionaryEntry prop in ldapSearchResult.Properties)
+                {
+                    if (prop.Value != null)
+                    {
+                        var v = ((ResultPropertyValueCollection)prop.Value);
+                        switch (prop.Key.ToString())
+                        {
+                            case "samaccountname": SamAccountName = v[0].ToString(); break;
+                            case "objectguid": ObjectGuid = (byte[])v[0]; break;
+                            case "cn": Cn = v[0].ToString(); break;
+                            case "canonicalname": CanonicalName = v[0].ToString(); break;
+                            case "dn": Dn = v[0].ToString(); break;
+                            case "distinguishedname": DistinguishedName = v[0].ToString(); break;
+                            case "givenname": GivenName = v[0].ToString(); break;
+                            case "sn": Sn = v[0].ToString(); break;
+                            case "displayname": DisplayName = v[0].ToString(); break;
+                            case "description": Description = v[0].ToString(); break;
+                            case "userprincipalname": UserPrincipalName = v[0].ToString(); break;
+                            case "title": Title = v[0].ToString(); break;
+                            case "department": Department = v[0].ToString(); break;
+                            case "uidNumber": UidNumber = v[0].ToString(); break;
+                            case "telephonenumber": Phone = v[0].ToString(); break;
+                            case "mobile": Mobile = v[0].ToString(); break;
+                            case "uid": UserName = v[0].ToString(); break;
+                            case "mail": Mail = v[0].ToString(); break;
+                            case "memberof":
+                                List<string> groups = new();
+                                foreach (string group in v)
+                                {
+                                    groups.Add(group);
+                                }
+                                MemberOf = string.Join(",", groups); break;
+                            default: break;
+                        }
+
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 2f2bf09..6faaf20 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -50,8 +50,22 @@ public class LdapService
             "department",
             "company",
             "uidNumber",
-            "memberOf"
-        };
+            "memberOf",
+            "telephoneNumber",
+            "mobile",
+            "uid",
+            "employeeNumber",
+            "labeledUri",
+            "middlename",
+            "ou",
+            "postalAddress",
+            "ucdPersonAffiliation",
+            "ucdPersonIAMID",
+            "ucdPersonPIDM",
+            "ucdPersonUUID",
+            "ucdStudentLevel",
+            "ucdStudentSID"
+    };
         
         public LdapService() { }
         
@@ -147,6 +161,21 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
 
         }
 
+        /// <summary>
+        /// Gets a single user from ou or ad3
+        /// </summary>
+        /// <param name="samAccountName">samAccountName of user</param>
+        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
+        /// <returns></returns>
+        public LdapUserContact? GetUserContact(string samAccountName, bool fromOu = false)
+        {
+            return new LdapUserContact(
+                new DirectorySearcher(GetRoot(fromOu), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
+                .FindOne()
+            );
+
+        }
+
         /// <summary>
         /// Get members of a group. Group must be in ou.ad3. Members can be in either ou.ad3 or ad3
         /// </summary>

From d1041004939f74206f7087952e626d5f68c70a7f Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 7 Feb 2024 09:21:28 -0800
Subject: [PATCH 03/69] Asking for debugging help

This is all pretty messy, but I think I can unwrap the debugging stuff once we figure out the error. The current message at /directory/search/francis/ucd is "DirectoryServicesCOMException: An invalid dn syntax has been specified." I thought the invalid username message I was getting earlier was an indication that at least the username/password was correct, but I am getting the invalid dn error even with [username] and [password]. Every filter string I have tried has returned the same error.
---
 .../Controllers/DirectoryController.cs        | 155 ++++++++-----
 .../Models/IndividualSearchResult.cs          |  15 +-
 .../Models/IndividualSearchResultWithIDs.cs   |  19 ++
 web/Areas/Directory/Views/Index.cshtml        |  19 +-
 web/Areas/RAPS/Models/LdapUserContact.cs      | 206 +++++++++++++++---
 web/Areas/RAPS/Services/LdapService.cs        |  68 +++++-
 6 files changed, 369 insertions(+), 113 deletions(-)
 create mode 100644 web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 563de7e..882e3f6 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -13,6 +13,7 @@
 using Viper.Areas.Directory.Models;
 using System;
 using Viper;
+using System.Runtime.Versioning;
 
 namespace Viper.Areas.Directory.Controllers
 {
@@ -46,6 +47,7 @@ public async Task<ActionResult> Index()
         /// </summary>
         /// <param name="search">search string</param>
         /// <returns></returns>
+        [SupportedOSPlatform("windows")]
         [Route("/[area]/search/{search}")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
         {
@@ -64,70 +66,119 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             .ThenBy(u => u.DisplayFirstName)
                      .ToListAsync();
             List<IndividualSearchResult> results = new();
+            AaudUser? currentUser = UserHelper.GetCurrentUser();
             individuals.ForEach(m =>
             {
-                results.Add(new IndividualSearchResult()
+                if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
+                {
+                    results.Add(new IndividualSearchResultWithIDs()
+                    {
+                        MothraId = m.MothraId,
+                        LoginId = m.LoginId,
+                        MailId = m.MailId,
+                        LastName = m.LastName,
+                        FirstName = m.FirstName,
+                        MiddleName = m.MiddleName,
+                        DisplayLastName = m.DisplayLastName,
+                        DisplayFirstName = m.DisplayFirstName,
+                        DisplayMiddleName = m.DisplayMiddleName,
+                        DisplayFullName = m.DisplayFullName,
+                        Name = m.DisplayFullName,
+                        CurrentStudent = m.CurrentStudent,
+                        FutureStudent = m.FutureStudent,
+                        CurrentEmployee = m.CurrentEmployee,
+                        FutureEmployee = m.FutureEmployee,
+                        StudentTerm = m.StudentTerm,
+                        EmployeeTerm = m.EmployeeTerm,
+                        PpsId = m.PpsId,
+                        StudentPKey = m.StudentPKey,
+                        EmployeePKey = m.EmployeePKey,
+                        Current = m.Current,
+                        Future = m.Future,
+                        IamId = m.IamId,
+                        Ross = m.Ross,
+                        Added = m.Added,
+                        SpridenId = m.SpridenId,
+                        Pidm = m.Pidm,
+                        EmployeeId = m.EmployeeId,
+                        VmacsId = m.VmacsId,
+                        UnexId = m.UnexId,
+                        MivId = m.MivId,
+                    });
+                }
+                else
                 {
-                    MothraId = m.MothraId,
-                    LoginId = m.LoginId,
-                    MailId = m.MailId,
-                    LastName = m.LastName,
-                    FirstName = m.FirstName,
-                    MiddleName = m.MiddleName,
-                    DisplayLastName = m.DisplayLastName,
-                    DisplayFirstName = m.DisplayFirstName,
-                    DisplayMiddleName = m.DisplayMiddleName,
-                    DisplayFullName = m.DisplayFullName,
-                    Name = m.DisplayFullName,
-                    CurrentStudent = m.CurrentStudent,
-                    FutureStudent = m.FutureStudent,
-                    CurrentEmployee = m.CurrentEmployee,
-                    FutureEmployee = m.FutureEmployee,
-                    StudentTerm = m.StudentTerm,
-                    EmployeeTerm = m.EmployeeTerm,
-                    PpsId = m.PpsId,
-                    StudentPKey = m.StudentPKey,
-                    EmployeePKey = m.EmployeePKey,
-                    Current = m.Current,
-                    Future = m.Future,
-                    IamId = m.IamId,
-                    Ross = m.Ross,
-                    Added = m.Added,
-                    SpridenId = m.SpridenId,
-                    Pidm = m.Pidm,
-                    EmployeeId = m.EmployeeId,
-                    VmacsId = m.VmacsId,
-                    UnexId = m.UnexId,
-                    MivId = m.MivId,
-                });
+                    results.Add(new IndividualSearchResult()
+                    {
+                        MothraId = m.MothraId,
+                        LoginId = m.LoginId,
+                        MailId = m.MailId,
+                        LastName = m.LastName,
+                        FirstName = m.FirstName,
+                        MiddleName = m.MiddleName,
+                        DisplayLastName = m.DisplayLastName,
+                        DisplayFirstName = m.DisplayFirstName,
+                        DisplayMiddleName = m.DisplayMiddleName,
+                        DisplayFullName = m.DisplayFullName,
+                        Name = m.DisplayFullName,
+                        CurrentStudent = m.CurrentStudent,
+                        FutureStudent = m.FutureStudent,
+                        CurrentEmployee = m.CurrentEmployee,
+                        FutureEmployee = m.FutureEmployee,
+                        StudentTerm = m.StudentTerm,
+                        EmployeeTerm = m.EmployeeTerm,
+                        PpsId = m.PpsId,
+                        StudentPKey = m.StudentPKey,
+                        EmployeePKey = m.EmployeePKey,
+                        Current = m.Current,
+                        Future = m.Future,
+                        IamId = m.IamId,
+                        Ross = m.Ross,
+                        Added = m.Added
+                    });
+                }
             });
-            AaudUser? currentUser = UserHelper.GetCurrentUser();
-            if (!UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
+            results.ForEach(r =>
             {
-                results.ForEach(r =>
+                LdapUserContact? l = new LdapService().GetUserContact(r.LoginId);
+                if (l != null)
                 {
-                    r.SpridenId = null;
-                    r.Pidm = null;
-                    r.EmployeeId = null;
-                    r.VmacsId = null;
-                    r.UnexId = null;
-                });
-            }
+                    r.Title = l.title;
+                    r.Department = l.department;
+                    r.Phone = l.phone;
+                    r.Mobile = l.mobile;
+                    r.UserName = l.username;
+                }
+            });
+            return results;
+        }
 
-            results.ForEach(r =>
+        /// <summary>
+        /// Directory list
+        /// </summary>
+        /// <param name="search">search string</param>
+        /// <returns></returns>
+        [SupportedOSPlatform("windows")]
+        [Route("/[area]/search/{search}/ucd")]
+        public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(string search)
+        {
+            List<IndividualSearchResult> results = new();
+            List<LdapUserContact> ldap = new LdapService().GetUsersContact(search);
+            ldap.ForEach(l =>
             {
-                LdapUserContact l = new LdapService().GetUserContact(r.LoginId);
-                r.Title = l.Title;
-                r.Department = l.Department;
-                r.Phone = l.Phone;
-                r.Mobile = l.Mobile;
-                r.UserName = l.UserName;
+                results.Add(new IndividualSearchResult()
+                {
+                    originalObject = l.originalObject,
+                    Title = l.title,
+                    Department = l.department,
+                    Phone = l.phone,
+                    Mobile = l.mobile,
+                    UserName = l.username
+                }); 
             });
-
             return results;
         }
 
-
         /// <summary>
         /// Directory results
         /// </summary>
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 423df22..bc1cdc4 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -10,20 +10,6 @@ public class IndividualSearchResult
 
         public string? MailId { get; set; } = string.Empty;
 
-        public string? SpridenId { get; set; } = string.Empty;
-
-        public string? Pidm { get; set; } = string.Empty;
-
-        public string? EmployeeId { get; set; } = string.Empty;
-
-        public int? VmacsId { get; set; } = null!;
-
-        public string? VmcasId { get; set; } = string.Empty;
-
-        public string? UnexId { get; set; } = string.Empty;
-
-        public int? MivId { get; set; } = null!;
-
         public string LastName { get; set; } = string.Empty;
 
         public string FirstName { get; set; } = string.Empty;
@@ -71,5 +57,6 @@ public class IndividualSearchResult
         public string? Phone { get; set; } = null!;
         public string? Mobile { get; set; } = null!;
         public string? UserName { get; set; } = null!;
+        public string? originalObject { get; set; } = null!;
     }
 }
diff --git a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
new file mode 100644
index 0000000..b785183
--- /dev/null
+++ b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
@@ -0,0 +1,19 @@
+namespace Viper.Areas.Directory.Models
+{
+    public class IndividualSearchResultWithIDs: IndividualSearchResult
+    {
+        public string? SpridenId { get; set; } = string.Empty;
+
+        public string? Pidm { get; set; } = string.Empty;
+
+        public string? EmployeeId { get; set; } = string.Empty;
+
+        public int? VmacsId { get; set; } = null!;
+
+        public string? VmcasId { get; set; } = string.Empty;
+
+        public string? UnexId { get; set; } = string.Empty;
+
+        public int? MivId { get; set; } = null!;
+    }
+}
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
index 51cc42c..96707fb 100644
--- a/web/Areas/Directory/Views/Index.cshtml
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -17,6 +17,10 @@
              v-model="userSearch"
              autofocus>
     </q-input>
+    <q-toggle v-model="ucd"
+              color="green"
+              label="Search all of UCD">
+    </q-toggle>
 </q-form>
 
 <q-table title="Search Results"
@@ -115,6 +119,7 @@
             data() {
                 return {
                     userSearch: getItemFromStorage("directory_search") ?? "",
+                    ucd: getItemFromStorage("directory_ucd") ?? false,
                     users: new quasarTable({
                         keys: ["mothraId"],
                         urlBase: "users",
@@ -137,7 +142,8 @@
             },
             methods: {
                 findUsers: async function () {
-                    this.users.urlBase = "search/" + this.userSearch
+                    this.users.urlBase = "search/" + this.userSearch;
+                    if (this.ucd) this.users.urlBase = "search/" + this.userSearch + "/ucd";
                     if (this.userSearch.length >= 2) {
                         this.users.load(this)
                     }
@@ -147,13 +153,20 @@
                 this.users.loading = false;
                 if (this.userSearch.length >= 2) {
                     this.users.urlBase = "search/" + this.userSearch;
+                    if (this.ucd) this.users.urlBase = "search/" + this.userSearch + "/ucd";
                     this.users.load(this);
                 }
             },
             watch: {
                 userSearch: function () {
-                    putItemInStorage("directory_search", this.userSearch)
-                    this.findUsers()
+                    putItemInStorage("directory_search", this.userSearch);
+                    putItemInStorage("directory_ucd", this.ucd);
+                    this.findUsers();
+                },
+                ucd: function () {
+                    putItemInStorage("directory_search", this.userSearch);
+                    putItemInStorage("directory_ucd", this.ucd);
+                    this.findUsers();
                 }
             }
         })
diff --git a/web/Areas/RAPS/Models/LdapUserContact.cs b/web/Areas/RAPS/Models/LdapUserContact.cs
index 8689980..24c1fa1 100644
--- a/web/Areas/RAPS/Models/LdapUserContact.cs
+++ b/web/Areas/RAPS/Models/LdapUserContact.cs
@@ -2,37 +2,110 @@
 using System.DirectoryServices;
 using System.Linq.Dynamic.Core;
 using System.Runtime.Versioning;
+using System.Text.Json;
 
 namespace Viper.Areas.RAPS.Models
 {
     [SupportedOSPlatform("windows")]
     public class LdapUserContact
     {
+        public string accountexpires { get; set; } = null!;
+        public string adspath { get; set; } = null!;
+        public string badpasswordtime { get; set; } = null!;
+        public string badpwdcount { get; set; } = null!;
+        public string cn { get; set; } = null!;
+        public string codepage { get; set; } = null!;
+        public string company { get; set; } = null!;
+        public string countrycode { get; set; } = null!;
+        public string deliverandredirect { get; set; } = null!;
+        public string department { get; set; } = null!;
+        public string departmentnumber { get; set; } = null!;
+        public string Description { get; set; } = null!;
+        public string displayname { get; set; } = null!;
+        public string distinguishedname { get; set; } = null!;
+        public string dscorepropagationdata { get; set; } = null!;
+        public string extensionattribute10 { get; set; } = null!;
+        public string extensionattribute11 { get; set; } = null!;
+        public string extensionattribute12 { get; set; } = null!;
+        public string extensionattribute13 { get; set; } = null!;
+        public string extensionattribute14 { get; set; } = null!;
+        public string extensionattribute15 { get; set; } = null!;
+        public string extensionattribute5 { get; set; } = null!;
+        public string extensionattribute6 { get; set; } = null!;
+        public string extensionattribute7 { get; set; } = null!;
+        public string extensionattribute8 { get; set; } = null!;
+        public string extensionattribute9 { get; set; } = null!;
+        public string gidnumber { get; set; } = null!;
+        public string givenname { get; set; } = null!;
+        public string instancetype { get; set; } = null!;
+        public string lastlogoff { get; set; } = null!;
+        public string lastlogon { get; set; } = null!;
+        public string lastlogontimestamp { get; set; } = null!;
+        public string legacyexchangedn { get; set; } = null!;
+        public string lockouttime { get; set; } = null!;
+        public string logoncount { get; set; } = null!;
+        public string mail { get; set; } = null!;
+        public string mailnickname { get; set; } = null!;
+        public string memberof { get; set; } = null!;
+        public string msexcharchiveguid { get; set; } = null!;
+        public string msexcharchivename { get; set; } = null!;
+        public string msexcharchivestatus { get; set; } = null!;
+        public string msexchcomanagedobjectsbl { get; set; } = null!;
+        public string msexchextensionattribute16 { get; set; } = null!;
+        public string msexchextensionattribute17 { get; set; } = null!;
+        public string msexchmailboxguid { get; set; } = null!;
+        public string msexchpoliciesexcluded { get; set; } = null!;
+        public string msexchrecipientdisplaytype { get; set; } = null!;
+        public string msexchrecipienttypedetails { get; set; } = null!;
+        public string msexchremoterecipienttype { get; set; } = null!;
+        public string msexchsafesendershash { get; set; } = null!;
+        public string msexchtextmessagingstate { get; set; } = null!;
+        public string msexchumdtmfmap { get; set; } = null!;
+        public string msexchuseraccountcontrol { get; set; } = null!;
+        public string msexchversion { get; set; } = null!;
+        public string msexchwhenmailboxcreated { get; set; } = null!;
+        public string name { get; set; } = null!;
+        public string objectcategory { get; set; } = null!;
+        public string objectclass { get; set; } = null!;
+        public string objectguid { get; set; } = null!;
+        public string objectsid { get; set; } = null!;
+        public string physicaldeliveryofficename { get; set; } = null!;
+        public string primarygroupid { get; set; } = null!;
+        public string proxyaddresses { get; set; } = null!;
+        public string pwdlastset { get; set; } = null!;
         public string SamAccountName { get; set; } = null!;
-        public byte[] ObjectGuid { get; set; } = null!;
-        public string Cn { get; set; } = null!;
-        public string CanonicalName { get; set; } = null!;
-        public string Dn { get; set; } = null!;
-        public string DistinguishedName { get; set; } = null!;
-        public string GivenName { get; set; } = null!;
-        public string Sn { get; set; } = null!;
-        public string DisplayName { get; set; } = null!;
-        public string Description { get; set; } = "";
-        public string UserPrincipalName { get; set; } = null!;
-        public string Title { get; set; } = null!;
-        public string Department { get; set; } = null!; 
-        public string UidNumber { get; set; } = null!;
-        public string MemberOf { get; set; } = null!;
-        public string Phone { get; set; } = null!;
-        public string Mobile { get; set; } = null!;
-        public string Mail { get; set; } = null!;
-        public string UserName { get; set; } = null!;
+        public string samaccounttype { get; set; } = null!;
+        public string showinaddressbook { get; set; } = null!;
+        public string sn { get; set; } = null!;
+        public string targetaddress { get; set; } = null!;
+        public string title { get; set; } = null!;
+        public string uid { get; set; } = null!;
+        public string uidnumber { get; set; } = null!;
+        public string useraccountcontrol { get; set; } = null!;
+        public string userprincipalname { get; set; } = null!;
+        public string usnchanged { get; set; } = null!;
+        public string usncreated { get; set; } = null!;
+        public string whenchanged { get; set; } = null!;
+        public string whencreated { get; set; } = null!;
 
+        public string phone { get; set; } = null!;
+        public string mobile { get; set; } = null!;
+        public string username { get; set; } = null!;
+        public string? description { get; set; } = null!;
+        public string? internetencoding { get; set; } = null!;
+        public string? mapirecipient { get; set; } = null!;
+        public string? msexchblockedsendershash { get; set; } = null!;
+        public string? samaccountname { get; set; } = null!;
+        public string? streetaddress { get; set; } = null!;
+        public string? telephonenumber { get; set; } = null!;
+        public string? textencodedoraddress { get; set; } = null!;
+        public string originalObject { get; set; } = null!;
         public LdapUserContact() { }
         public LdapUserContact(SearchResult? ldapSearchResult)
         {
             if (ldapSearchResult != null)
             {
+                originalObject = System.Text.Json.JsonSerializer.Serialize(ldapSearchResult.Properties);
                 foreach (System.Collections.DictionaryEntry prop in ldapSearchResult.Properties)
                 {
                     if (prop.Value != null)
@@ -40,31 +113,92 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                         var v = ((ResultPropertyValueCollection)prop.Value);
                         switch (prop.Key.ToString())
                         {
-                            case "samaccountname": SamAccountName = v[0].ToString(); break;
-                            case "objectguid": ObjectGuid = (byte[])v[0]; break;
-                            case "cn": Cn = v[0].ToString(); break;
-                            case "canonicalname": CanonicalName = v[0].ToString(); break;
-                            case "dn": Dn = v[0].ToString(); break;
-                            case "distinguishedname": DistinguishedName = v[0].ToString(); break;
-                            case "givenname": GivenName = v[0].ToString(); break;
-                            case "sn": Sn = v[0].ToString(); break;
-                            case "displayname": DisplayName = v[0].ToString(); break;
+                            case "accountexpires": accountexpires = v[0].ToString(); break;
+                            case "adspath": adspath = v[0].ToString(); break;
+                            case "badpasswordtime": badpasswordtime = v[0].ToString(); break;
+                            case "badpwdcount": badpwdcount = v[0].ToString(); break;
+                            case "cn": cn = v[0].ToString(); break;
+                            case "codepage": codepage = v[0].ToString(); break;
+                            case "company": company = v[0].ToString(); break;
+                            case "countrycode": countrycode = v[0].ToString(); break;
+                            case "deliverandredirect": deliverandredirect = v[0].ToString(); break;
+                            case "department": department = v[0].ToString(); break;
+                            case "departmentnumber": departmentnumber = v[0].ToString(); break;
                             case "description": Description = v[0].ToString(); break;
-                            case "userprincipalname": UserPrincipalName = v[0].ToString(); break;
-                            case "title": Title = v[0].ToString(); break;
-                            case "department": Department = v[0].ToString(); break;
-                            case "uidNumber": UidNumber = v[0].ToString(); break;
-                            case "telephonenumber": Phone = v[0].ToString(); break;
-                            case "mobile": Mobile = v[0].ToString(); break;
-                            case "uid": UserName = v[0].ToString(); break;
-                            case "mail": Mail = v[0].ToString(); break;
+                            case "displayname": displayname = v[0].ToString(); break;
+                            case "distinguishedname": distinguishedname = v[0].ToString(); break;
+                            case "dscorepropagationdata": dscorepropagationdata = v[0].ToString(); break;
+                            case "extensionattribute10": extensionattribute10 = v[0].ToString(); break;
+                            case "extensionattribute11": extensionattribute11 = v[0].ToString(); break;
+                            case "extensionattribute12": extensionattribute12 = v[0].ToString(); break;
+                            case "extensionattribute13": extensionattribute13 = v[0].ToString(); break;
+                            case "extensionattribute14": extensionattribute14 = v[0].ToString(); break;
+                            case "extensionattribute15": extensionattribute15 = v[0].ToString(); break;
+                            case "extensionattribute5": extensionattribute5 = v[0].ToString(); break;
+                            case "extensionattribute6": extensionattribute6 = v[0].ToString(); break;
+                            case "extensionattribute7": extensionattribute7 = v[0].ToString(); break;
+                            case "extensionattribute8": extensionattribute8 = v[0].ToString(); break;
+                            case "extensionattribute9": extensionattribute9 = v[0].ToString(); break;
+                            case "gidnumber": gidnumber = v[0].ToString(); break;
+                            case "givenname": givenname = v[0].ToString(); break;
+                            case "instancetype": instancetype = v[0].ToString(); break;
+                            case "lastlogoff": lastlogoff = v[0].ToString(); break;
+                            case "lastlogon": lastlogon = v[0].ToString(); break;
+                            case "lastlogontimestamp": lastlogontimestamp = v[0].ToString(); break;
+                            case "legacyexchangedn": legacyexchangedn = v[0].ToString(); break;
+                            case "lockouttime": lockouttime = v[0].ToString(); break;
+                            case "logoncount": logoncount = v[0].ToString(); break;
+                            case "mail": mail = v[0].ToString(); break;
+                            case "mailnickname": mailnickname = v[0].ToString(); break;
+                            case "msexcharchiveguid": msexcharchiveguid = v[0].ToString(); break;
+                            case "msexcharchivename": msexcharchivename = v[0].ToString(); break;
+                            case "msexcharchivestatus": msexcharchivestatus = v[0].ToString(); break;
+                            case "msexchcomanagedobjectsbl": msexchcomanagedobjectsbl = v[0].ToString(); break;
+                            case "msexchextensionattribute16": msexchextensionattribute16 = v[0].ToString(); break;
+                            case "msexchextensionattribute17": msexchextensionattribute17 = v[0].ToString(); break;
+                            case "msexchmailboxguid": msexchmailboxguid = v[0].ToString(); break;
+                            case "msexchpoliciesexcluded": msexchpoliciesexcluded = v[0].ToString(); break;
+                            case "msexchrecipientdisplaytype": msexchrecipientdisplaytype = v[0].ToString(); break;
+                            case "msexchrecipienttypedetails": msexchrecipienttypedetails = v[0].ToString(); break;
+                            case "msexchremoterecipienttype": msexchremoterecipienttype = v[0].ToString(); break;
+                            case "msexchsafesendershash": msexchsafesendershash = v[0].ToString(); break;
+                            case "msexchtextmessagingstate": msexchtextmessagingstate = v[0].ToString(); break;
+                            case "msexchumdtmfmap": msexchumdtmfmap = v[0].ToString(); break;
+                            case "msexchuseraccountcontrol": msexchuseraccountcontrol = v[0].ToString(); break;
+                            case "msexchversion": msexchversion = v[0].ToString(); break;
+                            case "msexchwhenmailboxcreated": msexchwhenmailboxcreated = v[0].ToString(); break;
+                            case "name": name = v[0].ToString(); break;
+                            case "objectcategory": objectcategory = v[0].ToString(); break;
+                            case "objectclass": objectclass = v[0].ToString(); break;
+                            case "objectguid": objectguid = v[0].ToString(); break;
+                            case "objectsid": objectsid = v[0].ToString(); break;
+                            case "physicaldeliveryofficename": physicaldeliveryofficename = v[0].ToString(); break;
+                            case "primarygroupid": primarygroupid = v[0].ToString(); break;
+                            case "proxyaddresses": proxyaddresses = v[0].ToString(); break;
+                            case "pwdlastset": pwdlastset = v[0].ToString(); break;
+                            case "samaccountname": SamAccountName = v[0].ToString(); break;
+                            case "samaccounttype": samaccounttype = v[0].ToString(); break;
+                            case "showinaddressbook": showinaddressbook = v[0].ToString(); break;
+                            case "sn": sn = v[0].ToString(); break;
+                            case "targetaddress": targetaddress = v[0].ToString(); break;
+                            case "title": title = v[0].ToString(); break;
+                            case "uid": uid = v[0].ToString(); break;
+                            case "uidnumber": uidnumber = v[0].ToString(); break;
+                            case "useraccountcontrol": useraccountcontrol = v[0].ToString(); break;
+                            case "userprincipalname": userprincipalname = v[0].ToString(); break;
+                            case "usnchanged": usnchanged = v[0].ToString(); break;
+                            case "usncreated": usncreated = v[0].ToString(); break;
+                            case "whenchanged": whenchanged = v[0].ToString(); break;
+                            case "whencreated": whencreated = v[0].ToString(); break;
+                            case "phone": phone = v[0].ToString(); break;
+                            case "mobile": mobile = v[0].ToString(); break;
                             case "memberof":
                                 List<string> groups = new();
                                 foreach (string group in v)
                                 {
                                     groups.Add(group);
                                 }
-                                MemberOf = string.Join(",", groups); break;
+                                memberof = string.Join(",", groups); break;
                             default: break;
                         }
 
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 6faaf20..d8476de 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -13,6 +13,7 @@ public class LdapService
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
         private const string _ouStart = "OU=SVM,OU=Departments,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _ldapUsers = "OU=People,DC=ldap,DC=ucdavis,DC=edu";
 
         //ldap attributes/properties to return for each object type
         private readonly string[] _groupProperties =
@@ -66,6 +67,10 @@ public class LdapService
             "ucdStudentLevel",
             "ucdStudentSID"
     };
+        private readonly string[] CFParams =
+        {
+            "givenName","sn","middlename","ou","mail","telephoneNumber","mobile","postalAddress","ucdStudentLevel","labeledUri","title","uid","ucdPersonPIDM","ucdPersonIAMID","employeeNumber","ucdStudentSID","ucdPersonUUID","eduPersonNickname","ucdPersonAffiliation","displayname"
+        };
         
         public LdapService() { }
         
@@ -119,33 +124,62 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
         {
             string filter = "(objectClass=user)";
             string additionalFilters = "";
-            if(name != null)
+            if (name != null)
             {
                 additionalFilters += string.Format("(displayName=*{0}*)", name);
             }
-            if(cn != null)
+            if (cn != null)
             {
                 additionalFilters += string.Format("(cn=*{0}*", cn);
             }
-            if(samAccountName != null)
+            if (samAccountName != null)
             {
                 additionalFilters += string.Format("(samAccountName=*{0}*", samAccountName);
             }
-            if(additionalFilters.Length > 0)
+            if (additionalFilters.Length > 0)
             {
                 filter = string.Format("(&{0}{1})", filter, additionalFilters);
             }
             SearchResultCollection results = new DirectorySearcher(GetRoot(fromOu), filter, _personProperties, SearchScope.Subtree)
-                { PageSize = 1000 }
+            { PageSize = 1000 }
                 .FindAll();
             List<LdapUser> users = new();
-            foreach(SearchResult result in results)
+            foreach (SearchResult result in results)
             {
                 users.Add(new LdapUser(result));
             }
             return SortUsers(users);
         }
 
+        /// <summary>
+        /// Get users for display, optionally searching ou.ad3, searching by name, cn, or samAccountName
+        /// </summary>
+        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
+        /// <param name="name">display name to search for</param>
+        /// <param name="cn">canonical name to search for</param>
+        /// <param name="samAccountName">samAccountName to search for</param>
+        /// <returns>List of users</returns>
+        public List<LdapUserContact> GetUsersContact(string search)
+        {
+            string filter = "(objectClass=user)";
+            string additionalFilters = "";
+            additionalFilters += string.Format("(displayName=*{0}*)", search);
+            if (additionalFilters.Length > 0)
+            {
+                filter = string.Format("(&{0}{1})", filter, additionalFilters);
+            }
+            DirectoryEntry de = GetRootContact();
+            SearchResultCollection results = new DirectorySearcher(de, "(|(telephoneNumber=*francis)(sn=francis*)(givenName=francis*)(uid=francis*)(cn=francis)(mail=francis*))", CFParams, SearchScope.Subtree)
+            { PageSize = 1000 }
+                .FindAll();
+            List<LdapUserContact> users = new();
+            foreach (SearchResult result in results)
+            {
+                users.Add(new LdapUserContact(result));
+            }
+            return SortUsersContact(users);
+        }
+
         /// <summary>
         /// Gets a single user from ou or ad3
         /// </summary>
@@ -167,10 +201,10 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
         /// <param name="samAccountName">samAccountName of user</param>
         /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
         /// <returns></returns>
-        public LdapUserContact? GetUserContact(string samAccountName, bool fromOu = false)
+        public LdapUserContact? GetUserContact(string? samAccountName, bool fromOu = false)
         {
             return new LdapUserContact(
-                new DirectorySearcher(GetRoot(fromOu), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
+                new DirectorySearcher(GetRootContact(), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
                 .FindOne()
             );
 
@@ -266,6 +300,15 @@ private static List<LdapUser> SortUsers(List<LdapUser> users)
             return users;
         }
 
+        //Sort users by description first, or sam account name
+        private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> users)
+        {
+            users.Sort((a, b) => a.Description == b.Description
+                ? a.SamAccountName.CompareTo(b.SamAccountName)
+                : a.Description.CompareTo(b.Description));
+            return users;
+        }
+
         //Get the root to start our ldap query - either the SVM OU in ou.ad3.ucdavis.edu for traditional security groups and SVM managed service accounts or 
         //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
         private DirectoryEntry GetRoot(bool fromOu = false)
@@ -274,6 +317,15 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
             return new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
         }
+        //Get the root to start our ldap query - either the SVM OU in ou.ad3.ucdavis.edu for traditional security groups and SVM managed service accounts or 
+        //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
+        private DirectoryEntry GetRootContact()
+        {
+            //string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            DirectoryEntry de = new DirectoryEntry("LDAP://ldap.ucdavis.edu", "[username]", "[password]", AuthenticationTypes.Secure);
+            return de;
+        }
+
 
     }
 }

From 351174562b2be7dd60ea38279ad2d74bad3b887b Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 7 Feb 2024 11:04:56 -0800
Subject: [PATCH 04/69] Getting ldap.ucdavis.edu directory search working

---
 web/Areas/Directory/Views/Index.cshtml |  8 ++++----
 web/Areas/RAPS/Services/LdapService.cs | 21 +++++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
index 96707fb..7ea1bae 100644
--- a/web/Areas/Directory/Views/Index.cshtml
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -142,8 +142,8 @@
             },
             methods: {
                 findUsers: async function () {
-                    this.users.urlBase = "search/" + this.userSearch;
-                    if (this.ucd) this.users.urlBase = "search/" + this.userSearch + "/ucd";
+                    this.users.urlBase = "/Directory/search/" + this.userSearch;
+                    if (this.ucd) this.users.urlBase = "/Directory/search/" + this.userSearch + "/ucd";
                     if (this.userSearch.length >= 2) {
                         this.users.load(this)
                     }
@@ -152,8 +152,8 @@
             mounted() {
                 this.users.loading = false;
                 if (this.userSearch.length >= 2) {
-                    this.users.urlBase = "search/" + this.userSearch;
-                    if (this.ucd) this.users.urlBase = "search/" + this.userSearch + "/ucd";
+                    this.users.urlBase = "/Directory/search/" + this.userSearch;
+                    if (this.ucd) this.users.urlBase = "/Directory/search/" + this.userSearch + "/ucd";
                     this.users.load(this);
                 }
             },
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index d8476de..ad9c227 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -8,12 +8,18 @@ namespace Viper.Areas.RAPS.Services
     [SupportedOSPlatform("windows")]
     public class LdapService
     {
+        //username for campus active directory servers (ou.ad3 and ad3)
         private const string _username = "ou\\svc-accounts";
+        //username for ldap.ucdavis.edu
+        private const string _ldapUsername = "uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu";
 
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
         private const string _ouStart = "OU=SVM,OU=Departments,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ldapUsers = "OU=People,DC=ldap,DC=ucdavis,DC=edu";
+        //server and start for ldap.ucdavis.edu
+        private const string _ldapServer = "ldap.ucdavis.edu";
+        private const string _ldapStart = "ou=People,dc=ucdavis,dc=edu";
 
         //ldap attributes/properties to return for each object type
         private readonly string[] _groupProperties =
@@ -170,7 +176,6 @@ public List<LdapUserContact> GetUsersContact(string search)
             }
             DirectoryEntry de = GetRootContact();
             SearchResultCollection results = new DirectorySearcher(de, "(|(telephoneNumber=*francis)(sn=francis*)(givenName=francis*)(uid=francis*)(cn=francis)(mail=francis*))", CFParams, SearchScope.Subtree)
-            { PageSize = 1000 }
                 .FindAll();
             List<LdapUserContact> users = new();
             foreach (SearchResult result in results)
@@ -304,7 +309,7 @@ private static List<LdapUser> SortUsers(List<LdapUser> users)
         private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> users)
         {
             users.Sort((a, b) => a.Description == b.Description
-                ? a.SamAccountName.CompareTo(b.SamAccountName)
+                ? a.sn.CompareTo(b.sn)
                 : a.Description.CompareTo(b.Description));
             return users;
         }
@@ -317,12 +322,16 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
             return new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
         }
-        //Get the root to start our ldap query - either the SVM OU in ou.ad3.ucdavis.edu for traditional security groups and SVM managed service accounts or 
-        //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
+        //Get the root to start our ldap.ucdavis.edu query
         private DirectoryEntry GetRootContact()
         {
-            //string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry("LDAP://ldap.ucdavis.edu", "[username]", "[password]", AuthenticationTypes.Secure);
+            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
+            string serverAndStart = string.Format("LDAP://{0}/{1}", _ldapServer, _ldapStart);
+            //We have to initialize the DirectoryEntry object using just the server, and then change the path to the server + start OU
+            DirectoryEntry de = new(_ldapServer, _ldapUsername, creds, AuthenticationTypes.SecureSocketsLayer)
+            {
+                Path = serverAndStart
+            };
             return de;
         }
 

From 31bc4c7eba14aa2f6576a285bd7af1eef3265bd7 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Mon, 26 Feb 2024 08:49:10 -0800
Subject: [PATCH 05/69] Updates the directory data model

Next step is exploring cards for display instead of the table. I will focus more on making sure all the relevant data is displayed with the next update.
---
 .../Controllers/DirectoryController.cs        | 208 ++++++++++-------
 web/Areas/RAPS/Models/LdapUserContact.cs      | 216 +++++++++++-------
 web/Areas/RAPS/Services/LdapService.cs        | 124 +++++++---
 3 files changed, 349 insertions(+), 199 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 882e3f6..fe57ffc 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -42,6 +42,20 @@ public async Task<ActionResult> Index()
             return await Task.Run(() => View("~/Areas/Directory/Views/Index.cshtml"));
         }
 
+        /// <summary>
+        /// Directory home page
+        /// </summary>
+        [Route("/[area]/nav")]
+        public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
+        {
+            var nav = new List<NavMenuItem>
+            {
+                new NavMenuItem() { MenuItemText = "Instances", IsHeader = true }
+            };
+            return nav;
+        }
+
+
         /// <summary>
         /// Directory list
         /// </summary>
@@ -69,86 +83,52 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             AaudUser? currentUser = UserHelper.GetCurrentUser();
             individuals.ForEach(m =>
             {
+                dynamic indiv = new IndividualSearchResult();
                 if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
                 {
-                    results.Add(new IndividualSearchResultWithIDs()
-                    {
-                        MothraId = m.MothraId,
-                        LoginId = m.LoginId,
-                        MailId = m.MailId,
-                        LastName = m.LastName,
-                        FirstName = m.FirstName,
-                        MiddleName = m.MiddleName,
-                        DisplayLastName = m.DisplayLastName,
-                        DisplayFirstName = m.DisplayFirstName,
-                        DisplayMiddleName = m.DisplayMiddleName,
-                        DisplayFullName = m.DisplayFullName,
-                        Name = m.DisplayFullName,
-                        CurrentStudent = m.CurrentStudent,
-                        FutureStudent = m.FutureStudent,
-                        CurrentEmployee = m.CurrentEmployee,
-                        FutureEmployee = m.FutureEmployee,
-                        StudentTerm = m.StudentTerm,
-                        EmployeeTerm = m.EmployeeTerm,
-                        PpsId = m.PpsId,
-                        StudentPKey = m.StudentPKey,
-                        EmployeePKey = m.EmployeePKey,
-                        Current = m.Current,
-                        Future = m.Future,
-                        IamId = m.IamId,
-                        Ross = m.Ross,
-                        Added = m.Added,
-                        SpridenId = m.SpridenId,
-                        Pidm = m.Pidm,
-                        EmployeeId = m.EmployeeId,
-                        VmacsId = m.VmacsId,
-                        UnexId = m.UnexId,
-                        MivId = m.MivId,
-                    });
+                    indiv = new IndividualSearchResultWithIDs();
+                    indiv.SpridenId = m.SpridenId;
+                    indiv.Pidm = m.Pidm;
+                    indiv.EmployeeId = m.EmployeeId;
+                    indiv.VmacsId = m.VmacsId;
+                    indiv.UnexId = m.UnexId;
+                    indiv.MivId = m.MivId;
                 }
-                else
-                {
-                    results.Add(new IndividualSearchResult()
-                    {
-                        MothraId = m.MothraId,
-                        LoginId = m.LoginId,
-                        MailId = m.MailId,
-                        LastName = m.LastName,
-                        FirstName = m.FirstName,
-                        MiddleName = m.MiddleName,
-                        DisplayLastName = m.DisplayLastName,
-                        DisplayFirstName = m.DisplayFirstName,
-                        DisplayMiddleName = m.DisplayMiddleName,
-                        DisplayFullName = m.DisplayFullName,
-                        Name = m.DisplayFullName,
-                        CurrentStudent = m.CurrentStudent,
-                        FutureStudent = m.FutureStudent,
-                        CurrentEmployee = m.CurrentEmployee,
-                        FutureEmployee = m.FutureEmployee,
-                        StudentTerm = m.StudentTerm,
-                        EmployeeTerm = m.EmployeeTerm,
-                        PpsId = m.PpsId,
-                        StudentPKey = m.StudentPKey,
-                        EmployeePKey = m.EmployeePKey,
-                        Current = m.Current,
-                        Future = m.Future,
-                        IamId = m.IamId,
-                        Ross = m.Ross,
-                        Added = m.Added
-                    });
-                }
-            });
-            results.ForEach(r =>
-            {
-                LdapUserContact? l = new LdapService().GetUserContact(r.LoginId);
+                indiv.MothraId = m.MothraId;
+                indiv.LoginId = m.LoginId;
+                indiv.MailId = m.MailId;
+                indiv.LastName = m.LastName;
+                indiv.FirstName = m.FirstName;
+                indiv.MiddleName = m.MiddleName;
+                indiv.DisplayLastName = m.DisplayLastName;
+                indiv.DisplayFirstName = m.DisplayFirstName;
+                indiv.DisplayMiddleName = m.DisplayMiddleName;
+                indiv.DisplayFullName = m.DisplayFullName;
+                indiv.Name = m.DisplayFullName;
+                indiv.CurrentStudent = m.CurrentStudent;
+                indiv.FutureStudent = m.FutureStudent;
+                indiv.CurrentEmployee = m.CurrentEmployee;
+                indiv.FutureEmployee = m.FutureEmployee;
+                indiv.StudentTerm = m.StudentTerm;
+                indiv.EmployeeTerm = m.EmployeeTerm;
+                indiv.PpsId = m.PpsId;
+                indiv.StudentPKey = m.StudentPKey;
+                indiv.EmployeePKey = m.EmployeePKey;
+                indiv.Current = m.Current;
+                indiv.Future = m.Future;
+                indiv.IamId = m.IamId;
+                indiv.Ross = m.Ross;
+                indiv.Added = m.Added;
+                LdapUserContact? l = new LdapService().GetUserContact(m.LoginId);
                 if (l != null)
                 {
-                    r.Title = l.title;
-                    r.Department = l.department;
-                    r.Phone = l.phone;
-                    r.Mobile = l.mobile;
-                    r.UserName = l.username;
+                    indiv.Title = l.title;
+                    indiv.Department = l.department;
+                    indiv.Phone = l.phone;
+                    indiv.Mobile = l.mobile;
+                    indiv.UserName = l.username;
                 }
+                results.Add(indiv);
             });
             return results;
         }
@@ -164,18 +144,78 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
         {
             List<IndividualSearchResult> results = new();
             List<LdapUserContact> ldap = new LdapService().GetUsersContact(search);
-            ldap.ForEach(l =>
+            var individuals = await _aaud.AaudUsers
+                    .Where(u => (u.DisplayFirstName + " " + u.DisplayLastName).Contains(search)
+                        || (u.MailId != null && u.MailId.Contains(search))
+                        || (u.LoginId != null && u.LoginId.Contains(search))
+                        || (u.SpridenId != null && u.SpridenId.Contains(search))
+                        || (u.Pidm != null && u.Pidm.Contains(search))
+                        || (u.MothraId != null && u.MothraId.Contains(search))
+                        || (u.EmployeeId != null && u.EmployeeId.Contains(search))
+                        || (u.IamId != null && u.IamId.Contains(search))
+           )
+           .Where(u => u.Current != 0)
+           .OrderBy(u => u.DisplayLastName)
+           .ThenBy(u => u.DisplayFirstName)
+                    .ToListAsync();
+            AaudUser? currentUser = UserHelper.GetCurrentUser();
+            foreach (var l in ldap)
             {
-                results.Add(new IndividualSearchResult()
+                dynamic indiv = new IndividualSearchResult();
+                if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
                 {
-                    originalObject = l.originalObject,
-                    Title = l.title,
-                    Department = l.department,
-                    Phone = l.phone,
-                    Mobile = l.mobile,
-                    UserName = l.username
-                }); 
-            });
+                    indiv = new IndividualSearchResultWithIDs();
+                }
+                indiv.Title = l.title;
+                indiv.Department = l.department;
+                indiv.Phone = l.phone;
+                indiv.Mobile = l.mobile;
+                indiv.UserName = l.username;
+                indiv.DisplayFullName = l.displayname;
+                indiv.Name = l.displayname;
+                individuals.ForEach(m =>
+                {
+                    if (m.MothraId == l.ucdpersonuuid)
+                    {
+                        if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
+                        {
+                            indiv = new IndividualSearchResultWithIDs();
+                            indiv.SpridenId = m.SpridenId;
+                            indiv.Pidm = m.Pidm;
+                            indiv.EmployeeId = m.EmployeeId;
+                            indiv.VmacsId = m.VmacsId;
+                            indiv.UnexId = m.UnexId;
+                            indiv.MivId = m.MivId;
+                        }
+                        indiv.MothraId = m.MothraId;
+                        indiv.LoginId = m.LoginId;
+                        indiv.MailId = m.MailId;
+                        indiv.LastName = m.LastName;
+                        indiv.FirstName = m.FirstName;
+                        indiv.MiddleName = m.MiddleName;
+                        indiv.DisplayLastName = m.DisplayLastName;
+                        indiv.DisplayFirstName = m.DisplayFirstName;
+                        indiv.DisplayMiddleName = m.DisplayMiddleName;
+                        indiv.DisplayFullName = m.DisplayFullName;
+                        indiv.Name = m.DisplayFullName;
+                        indiv.CurrentStudent = m.CurrentStudent;
+                        indiv.FutureStudent = m.FutureStudent;
+                        indiv.CurrentEmployee = m.CurrentEmployee;
+                        indiv.FutureEmployee = m.FutureEmployee;
+                        indiv.StudentTerm = m.StudentTerm;
+                        indiv.EmployeeTerm = m.EmployeeTerm;
+                        indiv.PpsId = m.PpsId;
+                        indiv.StudentPKey = m.StudentPKey;
+                        indiv.EmployeePKey = m.EmployeePKey;
+                        indiv.Current = m.Current;
+                        indiv.Future = m.Future;
+                        indiv.IamId = m.IamId;
+                        indiv.Ross = m.Ross;
+                        indiv.Added = m.Added;
+                    }
+                });
+                results.Add(indiv);
+            };
             return results;
         }
 
diff --git a/web/Areas/RAPS/Models/LdapUserContact.cs b/web/Areas/RAPS/Models/LdapUserContact.cs
index 24c1fa1..356a76b 100644
--- a/web/Areas/RAPS/Models/LdapUserContact.cs
+++ b/web/Areas/RAPS/Models/LdapUserContact.cs
@@ -9,96 +9,113 @@ namespace Viper.Areas.RAPS.Models
     [SupportedOSPlatform("windows")]
     public class LdapUserContact
     {
-        public string accountexpires { get; set; } = null!;
-        public string adspath { get; set; } = null!;
-        public string badpasswordtime { get; set; } = null!;
-        public string badpwdcount { get; set; } = null!;
-        public string cn { get; set; } = null!;
-        public string codepage { get; set; } = null!;
-        public string company { get; set; } = null!;
-        public string countrycode { get; set; } = null!;
-        public string deliverandredirect { get; set; } = null!;
-        public string department { get; set; } = null!;
-        public string departmentnumber { get; set; } = null!;
+        public string? accountexpires { get; set; } = null!;
+        public string? adspath { get; set; } = null!;
+        public string? badpasswordtime { get; set; } = null!;
+        public string? badpwdcount { get; set; } = null!;
+        public string? cn { get; set; } = null!;
+        public string? codepage { get; set; } = null!;
+        public string? company { get; set; } = null!;
+        public string? countrycode { get; set; } = null!;
+        public string? deliverandredirect { get; set; } = null!;
+        public string? department { get; set; } = null!;
+        public string? departmentnumber { get; set; } = null!;
         public string Description { get; set; } = null!;
-        public string displayname { get; set; } = null!;
-        public string distinguishedname { get; set; } = null!;
-        public string dscorepropagationdata { get; set; } = null!;
-        public string extensionattribute10 { get; set; } = null!;
-        public string extensionattribute11 { get; set; } = null!;
-        public string extensionattribute12 { get; set; } = null!;
-        public string extensionattribute13 { get; set; } = null!;
-        public string extensionattribute14 { get; set; } = null!;
-        public string extensionattribute15 { get; set; } = null!;
-        public string extensionattribute5 { get; set; } = null!;
-        public string extensionattribute6 { get; set; } = null!;
-        public string extensionattribute7 { get; set; } = null!;
-        public string extensionattribute8 { get; set; } = null!;
-        public string extensionattribute9 { get; set; } = null!;
-        public string gidnumber { get; set; } = null!;
-        public string givenname { get; set; } = null!;
-        public string instancetype { get; set; } = null!;
-        public string lastlogoff { get; set; } = null!;
-        public string lastlogon { get; set; } = null!;
-        public string lastlogontimestamp { get; set; } = null!;
-        public string legacyexchangedn { get; set; } = null!;
-        public string lockouttime { get; set; } = null!;
-        public string logoncount { get; set; } = null!;
-        public string mail { get; set; } = null!;
-        public string mailnickname { get; set; } = null!;
-        public string memberof { get; set; } = null!;
-        public string msexcharchiveguid { get; set; } = null!;
-        public string msexcharchivename { get; set; } = null!;
-        public string msexcharchivestatus { get; set; } = null!;
-        public string msexchcomanagedobjectsbl { get; set; } = null!;
-        public string msexchextensionattribute16 { get; set; } = null!;
-        public string msexchextensionattribute17 { get; set; } = null!;
-        public string msexchmailboxguid { get; set; } = null!;
-        public string msexchpoliciesexcluded { get; set; } = null!;
-        public string msexchrecipientdisplaytype { get; set; } = null!;
-        public string msexchrecipienttypedetails { get; set; } = null!;
-        public string msexchremoterecipienttype { get; set; } = null!;
-        public string msexchsafesendershash { get; set; } = null!;
-        public string msexchtextmessagingstate { get; set; } = null!;
-        public string msexchumdtmfmap { get; set; } = null!;
-        public string msexchuseraccountcontrol { get; set; } = null!;
-        public string msexchversion { get; set; } = null!;
-        public string msexchwhenmailboxcreated { get; set; } = null!;
-        public string name { get; set; } = null!;
-        public string objectcategory { get; set; } = null!;
-        public string objectclass { get; set; } = null!;
-        public string objectguid { get; set; } = null!;
-        public string objectsid { get; set; } = null!;
-        public string physicaldeliveryofficename { get; set; } = null!;
-        public string primarygroupid { get; set; } = null!;
-        public string proxyaddresses { get; set; } = null!;
-        public string pwdlastset { get; set; } = null!;
-        public string SamAccountName { get; set; } = null!;
-        public string samaccounttype { get; set; } = null!;
-        public string showinaddressbook { get; set; } = null!;
-        public string sn { get; set; } = null!;
-        public string targetaddress { get; set; } = null!;
-        public string title { get; set; } = null!;
-        public string uid { get; set; } = null!;
-        public string uidnumber { get; set; } = null!;
-        public string useraccountcontrol { get; set; } = null!;
-        public string userprincipalname { get; set; } = null!;
-        public string usnchanged { get; set; } = null!;
-        public string usncreated { get; set; } = null!;
-        public string whenchanged { get; set; } = null!;
-        public string whencreated { get; set; } = null!;
-
-        public string phone { get; set; } = null!;
-        public string mobile { get; set; } = null!;
-        public string username { get; set; } = null!;
-        public string? description { get; set; } = null!;
+        public string? displayname { get; set; } = null!;
+        public string? distinguishedname { get; set; } = null!;
+        public string? dscorepropagationdata { get; set; } = null!;
+        public string? edupersonaffiliation { get; set; } = null!;
+        public string? edupersonprincipalname { get; set; } = null!;
+        public string? employeenumber { get; set; } = null!;
+        public string? extensionattribute10 { get; set; } = null!;
+        public string? extensionattribute11 { get; set; } = null!;
+        public string? extensionattribute12 { get; set; } = null!;
+        public string? extensionattribute13 { get; set; } = null!;
+        public string? extensionattribute14 { get; set; } = null!;
+        public string? extensionattribute15 { get; set; } = null!;
+        public string? extensionattribute5 { get; set; } = null!;
+        public string? extensionattribute6 { get; set; } = null!;
+        public string? extensionattribute7 { get; set; } = null!;
+        public string? extensionattribute8 { get; set; } = null!;
+        public string? extensionattribute9 { get; set; } = null!;
+        public string? gidnumber { get; set; } = null!;
+        public string? givenname { get; set; } = null!;
+        public string? instancetype { get; set; } = null!;
         public string? internetencoding { get; set; } = null!;
+        public string? l { get; set; } = null!;
+        public string? lastlogoff { get; set; } = null!;
+        public string? lastlogon { get; set; } = null!;
+        public string? lastlogontimestamp { get; set; } = null!;
+        public string? legacyexchangedn { get; set; } = null!;
+        public string? lockouttime { get; set; } = null!;
+        public string? logoncount { get; set; } = null!;
+        public string? mail { get; set; } = null!;
+        public string? mailnickname { get; set; } = null!;
         public string? mapirecipient { get; set; } = null!;
+        public string? memberof { get; set; } = null!;
+        public string? mobile { get; set; } = null!;
+        public string? msexcharchiveguid { get; set; } = null!;
+        public string? msexcharchivename { get; set; } = null!;
+        public string? msexcharchivestatus { get; set; } = null!;
         public string? msexchblockedsendershash { get; set; } = null!;
-        public string? samaccountname { get; set; } = null!;
+        public string? msexchcomanagedobjectsbl { get; set; } = null!;
+        public string? msexchextensionattribute16 { get; set; } = null!;
+        public string? msexchextensionattribute17 { get; set; } = null!;
+        public string? msexchmailboxguid { get; set; } = null!;
+        public string? msexchpoliciesexcluded { get; set; } = null!;
+        public string? msexchrecipientdisplaytype { get; set; } = null!;
+        public string? msexchrecipienttypedetails { get; set; } = null!;
+        public string? msexchremoterecipienttype { get; set; } = null!;
+        public string? msexchsafesendershash { get; set; } = null!;
+        public string? msexchtextmessagingstate { get; set; } = null!;
+        public string? msexchumdtmfmap { get; set; } = null!;
+        public string? msexchuseraccountcontrol { get; set; } = null!;
+        public string? msexchversion { get; set; } = null!;
+        public string? msexchwhenmailboxcreated { get; set; } = null!;
+        public string? name { get; set; } = null!;
+        public string? objectcategory { get; set; } = null!;
+        public string? objectclass { get; set; } = null!;
+        public string? objectguid { get; set; } = null!;
+        public string? objectsid { get; set; } = null!;
+        public string? ou { get; set; } = null!;
+        public string? pager { get; set; } = null!;
+        public string? phone { get; set; } = null!;
+        public string? physicaldeliveryofficename { get; set; } = null!;
+        public string? postaladdress { get; set; } = null!;
+        public string? postalcode { get; set; } = null!;
+        public string? primarygroupid { get; set; } = null!;
+        public string? proxyaddresses { get; set; } = null!;
+        public string? pwdlastset { get; set; } = null!;
+        public string SamAccountName { get; set; } = null!;
+        public string? samaccounttype { get; set; } = null!;
+        public string? showinaddressbook { get; set; } = null!;
+        public string sn { get; set; } = null!;
+        public string? st { get; set; } = null!;
+        public string? street { get; set; } = null!;
         public string? streetaddress { get; set; } = null!;
+        public string? targetaddress { get; set; } = null!;
         public string? telephonenumber { get; set; } = null!;
         public string? textencodedoraddress { get; set; } = null!;
+        public string? title { get; set; } = null!;
+        public string? ucdappointmentdepartmentcode { get; set; } = null!;
+        public string? ucdappointmenttitlecode { get; set; } = null!;
+        public string? ucdpersonaffiliation { get; set; } = null!;
+        public string? ucdpersoniamid { get; set; } = null!;
+        public string? ucdpersonnetid { get; set; } = null!;
+        public string? ucdpersonpidm { get; set; } = null!;
+        public string? ucdpersonppsid { get; set; } = null!;
+        public string? ucdpersonuuid { get; set; } = null!;
+        public string? ucdpublishitemflag { get; set; } = null!;
+        public string? ucdstudentsid { get; set; } = null!;
+        public string? uid { get; set; } = null!;
+        public string? uidnumber { get; set; } = null!;
+        public string? useraccountcontrol { get; set; } = null!;
+        public string? username { get; set; } = null!;
+        public string? userprincipalname { get; set; } = null!;
+        public string? usnchanged { get; set; } = null!;
+        public string? usncreated { get; set; } = null!;
+        public string? whenchanged { get; set; } = null!;
+        public string? whencreated { get; set; } = null!;
         public string originalObject { get; set; } = null!;
         public LdapUserContact() { }
         public LdapUserContact(SearchResult? ldapSearchResult)
@@ -124,10 +141,14 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                             case "deliverandredirect": deliverandredirect = v[0].ToString(); break;
                             case "department": department = v[0].ToString(); break;
                             case "departmentnumber": departmentnumber = v[0].ToString(); break;
+                            case "Description": Description = v[0].ToString(); break;
                             case "description": Description = v[0].ToString(); break;
                             case "displayname": displayname = v[0].ToString(); break;
                             case "distinguishedname": distinguishedname = v[0].ToString(); break;
                             case "dscorepropagationdata": dscorepropagationdata = v[0].ToString(); break;
+                            case "edupersonaffiliation": edupersonaffiliation = v[0].ToString(); break;
+                            case "edupersonprincipalname": edupersonprincipalname = v[0].ToString(); break;
+                            case "employeenumber": employeenumber = v[0].ToString(); break;
                             case "extensionattribute10": extensionattribute10 = v[0].ToString(); break;
                             case "extensionattribute11": extensionattribute11 = v[0].ToString(); break;
                             case "extensionattribute12": extensionattribute12 = v[0].ToString(); break;
@@ -142,6 +163,8 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                             case "gidnumber": gidnumber = v[0].ToString(); break;
                             case "givenname": givenname = v[0].ToString(); break;
                             case "instancetype": instancetype = v[0].ToString(); break;
+                            case "internetencoding": internetencoding = v[0].ToString(); break;
+                            case "l": l = v[0].ToString(); break;
                             case "lastlogoff": lastlogoff = v[0].ToString(); break;
                             case "lastlogon": lastlogon = v[0].ToString(); break;
                             case "lastlogontimestamp": lastlogontimestamp = v[0].ToString(); break;
@@ -150,9 +173,12 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                             case "logoncount": logoncount = v[0].ToString(); break;
                             case "mail": mail = v[0].ToString(); break;
                             case "mailnickname": mailnickname = v[0].ToString(); break;
+                            case "mapirecipient": mapirecipient = v[0].ToString(); break;
+                            case "mobile": mobile = v[0].ToString(); break;
                             case "msexcharchiveguid": msexcharchiveguid = v[0].ToString(); break;
                             case "msexcharchivename": msexcharchivename = v[0].ToString(); break;
                             case "msexcharchivestatus": msexcharchivestatus = v[0].ToString(); break;
+                            case "msexchblockedsendershash": msexchblockedsendershash = v[0].ToString(); break;
                             case "msexchcomanagedobjectsbl": msexchcomanagedobjectsbl = v[0].ToString(); break;
                             case "msexchextensionattribute16": msexchextensionattribute16 = v[0].ToString(); break;
                             case "msexchextensionattribute17": msexchextensionattribute17 = v[0].ToString(); break;
@@ -172,26 +198,46 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                             case "objectclass": objectclass = v[0].ToString(); break;
                             case "objectguid": objectguid = v[0].ToString(); break;
                             case "objectsid": objectsid = v[0].ToString(); break;
+                            case "ou": ou = v[0].ToString(); break;
+                            case "pager": pager = v[0].ToString(); break;
+                            case "phone": phone = v[0].ToString(); break;
                             case "physicaldeliveryofficename": physicaldeliveryofficename = v[0].ToString(); break;
+                            case "postaladdress": postaladdress = v[0].ToString(); break;
+                            case "postalcode": postalcode = v[0].ToString(); break;
                             case "primarygroupid": primarygroupid = v[0].ToString(); break;
                             case "proxyaddresses": proxyaddresses = v[0].ToString(); break;
                             case "pwdlastset": pwdlastset = v[0].ToString(); break;
+                            case "SamAccountName": SamAccountName = v[0].ToString(); break;
                             case "samaccountname": SamAccountName = v[0].ToString(); break;
                             case "samaccounttype": samaccounttype = v[0].ToString(); break;
                             case "showinaddressbook": showinaddressbook = v[0].ToString(); break;
                             case "sn": sn = v[0].ToString(); break;
+                            case "st": st = v[0].ToString(); break;
+                            case "street": street = v[0].ToString(); break;
+                            case "streetaddress": streetaddress = v[0].ToString(); break;
                             case "targetaddress": targetaddress = v[0].ToString(); break;
+                            case "telephonenumber": telephonenumber = v[0].ToString(); break;
+                            case "textencodedoraddress": textencodedoraddress = v[0].ToString(); break;
                             case "title": title = v[0].ToString(); break;
+                            case "ucdappointmentdepartmentcode": ucdappointmentdepartmentcode = v[0].ToString(); break;
+                            case "ucdappointmenttitlecode": ucdappointmenttitlecode = v[0].ToString(); break;
+                            case "ucdpersonaffiliation": ucdpersonaffiliation = v[0].ToString(); break;
+                            case "ucdpersoniamid": ucdpersoniamid = v[0].ToString(); break;
+                            case "ucdpersonnetid": ucdpersonnetid = v[0].ToString(); break;
+                            case "ucdpersonpidm": ucdpersonpidm = v[0].ToString(); break;
+                            case "ucdpersonppsid": ucdpersonppsid = v[0].ToString(); break;
+                            case "ucdpersonuuid": ucdpersonuuid = v[0].ToString(); break;
+                            case "ucdpublishitemflag": ucdpublishitemflag = v[0].ToString(); break;
+                            case "ucdstudentsid": ucdstudentsid = v[0].ToString(); break;
                             case "uid": uid = v[0].ToString(); break;
                             case "uidnumber": uidnumber = v[0].ToString(); break;
                             case "useraccountcontrol": useraccountcontrol = v[0].ToString(); break;
+                            case "username": username = v[0].ToString(); break;
                             case "userprincipalname": userprincipalname = v[0].ToString(); break;
                             case "usnchanged": usnchanged = v[0].ToString(); break;
                             case "usncreated": usncreated = v[0].ToString(); break;
                             case "whenchanged": whenchanged = v[0].ToString(); break;
                             case "whencreated": whencreated = v[0].ToString(); break;
-                            case "phone": phone = v[0].ToString(); break;
-                            case "mobile": mobile = v[0].ToString(); break;
                             case "memberof":
                                 List<string> groups = new();
                                 foreach (string group in v)
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index d8476de..8c28e78 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -2,18 +2,25 @@
 using System.Runtime.Versioning;
 using System.DirectoryServices.AccountManagement;
 using Viper.Areas.RAPS.Models;
+using Amazon.Runtime.Internal.Transform;
 
 namespace Viper.Areas.RAPS.Services
 {
     [SupportedOSPlatform("windows")]
     public class LdapService
     {
+        //username for campus active directory servers (ou.ad3 and ad3)
         private const string _username = "ou\\svc-accounts";
+        //username for ldap.ucdavis.edu
+        private const string _ldapUsername = "uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu";
 
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
         private const string _ouStart = "OU=SVM,OU=Departments,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ldapUsers = "OU=People,DC=ldap,DC=ucdavis,DC=edu";
+        //server and start for ldap.ucdavis.edu
+        private const string _ldapServer = "ldap.ucdavis.edu";
+        private const string _ldapStart = "ou=People,dc=ucdavis,dc=edu";
 
         //ldap attributes/properties to return for each object type
         private readonly string[] _groupProperties =
@@ -71,9 +78,9 @@ public class LdapService
         {
             "givenName","sn","middlename","ou","mail","telephoneNumber","mobile","postalAddress","ucdStudentLevel","labeledUri","title","uid","ucdPersonPIDM","ucdPersonIAMID","employeeNumber","ucdStudentSID","ucdPersonUUID","eduPersonNickname","ucdPersonAffiliation","displayname"
         };
-        
+
         public LdapService() { }
-        
+
         /// <summary>
         /// Get groups, optionally filtering with a wildcard match to name
         /// </summary>
@@ -87,10 +94,10 @@ public List<LdapGroup> GetGroups(string? name = null)
                 filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
             };
             SearchResultCollection results = new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
-                { PageSize = 1000 }
+            { PageSize = 1000 }
                 .FindAll();
             List<LdapGroup> groups = new();
-            foreach(SearchResult result in results)
+            foreach (SearchResult result in results)
             {
                 groups.Add(new LdapGroup(result));
             }
@@ -141,7 +148,6 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
                 filter = string.Format("(&{0}{1})", filter, additionalFilters);
             }
             SearchResultCollection results = new DirectorySearcher(GetRoot(fromOu), filter, _personProperties, SearchScope.Subtree)
-            { PageSize = 1000 }
                 .FindAll();
             List<LdapUser> users = new();
             foreach (SearchResult result in results)
@@ -152,25 +158,16 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
         }
 
         /// <summary>
-        /// Get users for display, optionally searching ou.ad3, searching by name, cn, or samAccountName
+        /// Get users for display\ searching by name, cn, or samAccountName
         /// </summary>
-        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
-        /// <param name="name">display name to search for</param>
-        /// <param name="cn">canonical name to search for</param>
-        /// <param name="samAccountName">samAccountName to search for</param>
-        /// <returns>List of users</returns>
+        /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
+        /// <returns>List of Users</returns>
         public List<LdapUserContact> GetUsersContact(string search)
         {
-            string filter = "(objectClass=user)";
-            string additionalFilters = "";
-            additionalFilters += string.Format("(displayName=*{0}*)", search);
-            if (additionalFilters.Length > 0)
-            {
-                filter = string.Format("(&{0}{1})", filter, additionalFilters);
-            }
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
             DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, "(|(telephoneNumber=*francis)(sn=francis*)(givenName=francis*)(uid=francis*)(cn=francis)(mail=francis*))", CFParams, SearchScope.Subtree)
-            { PageSize = 1000 }
+            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            { SizeLimit = 1000 }
                 .FindAll();
             List<LdapUserContact> users = new();
             foreach (SearchResult result in results)
@@ -180,6 +177,69 @@ public List<LdapUserContact> GetUsersContact(string search)
             return SortUsersContact(users);
         }
 
+        /// <summary>
+        /// Get users for display, optionally searching ou.ad3, searching by name, cn, or samAccountName
+        /// </summary>
+        /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
+        /// <returns>Dictionary of Users, indexed by mothraID</returns>
+        public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string search)
+        {
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            DirectoryEntry de = GetRootContact();
+            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            { SizeLimit = 1000 }
+                .FindAll();
+            Dictionary<string,LdapUserContact> users = new();
+            foreach (SearchResult result in results)
+            {
+                users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
+            }
+            return users;
+        }
+
+        /// <summary>
+        /// Look up User by its MothraID
+        /// </summary>
+        /// <param name="id">MothraIDs for looking up user</param>
+        /// <returns>LdapUserContact</returns>
+        public LdapUserContact? GetUsersByID(string id)
+        {
+            string filter = string.Format("(|(ucdpersonuuid = {0}))", id);
+            DirectoryEntry de = GetRootContact();
+            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            { SizeLimit = 1 }
+                .FindAll();
+            foreach (SearchResult result in results)
+            {
+                return new LdapUserContact(result);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get dictionary of Users from a list of MothraIDs
+        /// </summary>
+        /// <param name="ids">List of MothraIDs for looking up users</param>
+        /// <returns>Dictionary of Users, indexed by mothraID</returns>
+        public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
+        {
+            string filter = "(|";
+            foreach (string i in ids) {
+                filter += string.Format("(ucdpersonuuid = {0})", i);
+            }
+            filter += ")";
+            DirectoryEntry de = GetRootContact();
+            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            { SizeLimit = 1000 }
+                .FindAll();
+            Dictionary<string, LdapUserContact> users = new();
+            foreach (SearchResult result in results)
+            {
+                users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
+            }
+            return users;
+        }
+
         /// <summary>
         /// Gets a single user from ou or ad3
         /// </summary>
@@ -219,17 +279,17 @@ public List<LdapUser> GetGroupMembership(string groupDn)
         {
             List<LdapUser> users = new();
             string filter = string.Format("(&(objectClass=user)(memberOf={0}))", groupDn);
-            
+
             //Need to get users from both AD3 and OU
             SearchResultCollection ouResults = new DirectorySearcher(GetRoot(true), filter, _personProperties, SearchScope.Subtree)
                 .FindAll();
-            foreach(SearchResult result in ouResults)
+            foreach (SearchResult result in ouResults)
             {
                 users.Add(new LdapUser(result));
             }
 
             SearchResultCollection ad3Results = new DirectorySearcher(GetRoot(false), filter, _personProperties, SearchScope.Subtree)
-                { PageSize = 1000 }
+            { PageSize = 1000 }
                 .FindAll();
             foreach (SearchResult result in ad3Results)
             {
@@ -253,7 +313,7 @@ public void AddUserToGroup(string userDn, string groupDn)
                 using PrincipalContext ouPc = new(ContextType.Domain, "ou.ad3.ucdavis.edu", _username, creds);
                 GroupPrincipal? group = GroupPrincipal.FindByIdentity(ouPc, IdentityType.DistinguishedName, groupDn);
                 UserPrincipal? user = UserPrincipal.FindByIdentity(ad3Pc, IdentityType.DistinguishedName, userDn);
-                if(group != null && user != null)
+                if (group != null && user != null)
                 {
                     group.Members.Add(user);
                     group.Save();
@@ -304,7 +364,7 @@ private static List<LdapUser> SortUsers(List<LdapUser> users)
         private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> users)
         {
             users.Sort((a, b) => a.Description == b.Description
-                ? a.SamAccountName.CompareTo(b.SamAccountName)
+                ? a.sn.CompareTo(b.sn)
                 : a.Description.CompareTo(b.Description));
             return users;
         }
@@ -317,15 +377,19 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
             return new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
         }
-        //Get the root to start our ldap query - either the SVM OU in ou.ad3.ucdavis.edu for traditional security groups and SVM managed service accounts or 
-        //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
+        //Get the root to start our ldap.ucdavis.edu query
         private DirectoryEntry GetRootContact()
         {
-            //string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry("LDAP://ldap.ucdavis.edu", "[username]", "[password]", AuthenticationTypes.Secure);
+            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
+            string serverAndStart = string.Format("LDAP://{0}/{1}", _ldapServer, _ldapStart);
+            //We have to initialize the DirectoryEntry object using just the server, and then change the path to the server + start OU
+            DirectoryEntry de = new(_ldapServer, _ldapUsername, creds, AuthenticationTypes.SecureSocketsLayer)
+            {
+                Path = serverAndStart
+            };
             return de;
         }
 
 
     }
-}
+}
\ No newline at end of file

From c038715748a1029042d36e1886f9099804f95291 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 26 Feb 2024 15:50:11 -0800
Subject: [PATCH 06/69] Moving complexity of search result creation to model

---
 .../Controllers/DirectoryController.cs        | 104 +-----------------
 .../Models/IndividualSearchResultCreator.cs   |  93 ++++++++++++++++
 2 files changed, 98 insertions(+), 99 deletions(-)
 create mode 100644 web/Areas/Directory/Models/IndividualSearchResultCreator.cs

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index fe57ffc..4570072 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -81,54 +81,11 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                      .ToListAsync();
             List<IndividualSearchResult> results = new();
             AaudUser? currentUser = UserHelper.GetCurrentUser();
+            bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
             individuals.ForEach(m =>
             {
-                dynamic indiv = new IndividualSearchResult();
-                if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
-                {
-                    indiv = new IndividualSearchResultWithIDs();
-                    indiv.SpridenId = m.SpridenId;
-                    indiv.Pidm = m.Pidm;
-                    indiv.EmployeeId = m.EmployeeId;
-                    indiv.VmacsId = m.VmacsId;
-                    indiv.UnexId = m.UnexId;
-                    indiv.MivId = m.MivId;
-                }
-                indiv.MothraId = m.MothraId;
-                indiv.LoginId = m.LoginId;
-                indiv.MailId = m.MailId;
-                indiv.LastName = m.LastName;
-                indiv.FirstName = m.FirstName;
-                indiv.MiddleName = m.MiddleName;
-                indiv.DisplayLastName = m.DisplayLastName;
-                indiv.DisplayFirstName = m.DisplayFirstName;
-                indiv.DisplayMiddleName = m.DisplayMiddleName;
-                indiv.DisplayFullName = m.DisplayFullName;
-                indiv.Name = m.DisplayFullName;
-                indiv.CurrentStudent = m.CurrentStudent;
-                indiv.FutureStudent = m.FutureStudent;
-                indiv.CurrentEmployee = m.CurrentEmployee;
-                indiv.FutureEmployee = m.FutureEmployee;
-                indiv.StudentTerm = m.StudentTerm;
-                indiv.EmployeeTerm = m.EmployeeTerm;
-                indiv.PpsId = m.PpsId;
-                indiv.StudentPKey = m.StudentPKey;
-                indiv.EmployeePKey = m.EmployeePKey;
-                indiv.Current = m.Current;
-                indiv.Future = m.Future;
-                indiv.IamId = m.IamId;
-                indiv.Ross = m.Ross;
-                indiv.Added = m.Added;
                 LdapUserContact? l = new LdapService().GetUserContact(m.LoginId);
-                if (l != null)
-                {
-                    indiv.Title = l.title;
-                    indiv.Department = l.department;
-                    indiv.Phone = l.phone;
-                    indiv.Mobile = l.mobile;
-                    indiv.UserName = l.username;
-                }
-                results.Add(indiv);
+                results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(currentUser, l, hasDetailPermission));
             });
             return results;
         }
@@ -159,62 +116,11 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
            .ThenBy(u => u.DisplayFirstName)
                     .ToListAsync();
             AaudUser? currentUser = UserHelper.GetCurrentUser();
+            bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
             foreach (var l in ldap)
             {
-                dynamic indiv = new IndividualSearchResult();
-                if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
-                {
-                    indiv = new IndividualSearchResultWithIDs();
-                }
-                indiv.Title = l.title;
-                indiv.Department = l.department;
-                indiv.Phone = l.phone;
-                indiv.Mobile = l.mobile;
-                indiv.UserName = l.username;
-                indiv.DisplayFullName = l.displayname;
-                indiv.Name = l.displayname;
-                individuals.ForEach(m =>
-                {
-                    if (m.MothraId == l.ucdpersonuuid)
-                    {
-                        if (UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail"))
-                        {
-                            indiv = new IndividualSearchResultWithIDs();
-                            indiv.SpridenId = m.SpridenId;
-                            indiv.Pidm = m.Pidm;
-                            indiv.EmployeeId = m.EmployeeId;
-                            indiv.VmacsId = m.VmacsId;
-                            indiv.UnexId = m.UnexId;
-                            indiv.MivId = m.MivId;
-                        }
-                        indiv.MothraId = m.MothraId;
-                        indiv.LoginId = m.LoginId;
-                        indiv.MailId = m.MailId;
-                        indiv.LastName = m.LastName;
-                        indiv.FirstName = m.FirstName;
-                        indiv.MiddleName = m.MiddleName;
-                        indiv.DisplayLastName = m.DisplayLastName;
-                        indiv.DisplayFirstName = m.DisplayFirstName;
-                        indiv.DisplayMiddleName = m.DisplayMiddleName;
-                        indiv.DisplayFullName = m.DisplayFullName;
-                        indiv.Name = m.DisplayFullName;
-                        indiv.CurrentStudent = m.CurrentStudent;
-                        indiv.FutureStudent = m.FutureStudent;
-                        indiv.CurrentEmployee = m.CurrentEmployee;
-                        indiv.FutureEmployee = m.FutureEmployee;
-                        indiv.StudentTerm = m.StudentTerm;
-                        indiv.EmployeeTerm = m.EmployeeTerm;
-                        indiv.PpsId = m.PpsId;
-                        indiv.StudentPKey = m.StudentPKey;
-                        indiv.EmployeePKey = m.EmployeePKey;
-                        indiv.Current = m.Current;
-                        indiv.Future = m.Future;
-                        indiv.IamId = m.IamId;
-                        indiv.Ross = m.Ross;
-                        indiv.Added = m.Added;
-                    }
-                });
-                results.Add(indiv);
+                AaudUser? userInfo = individuals.Find(m => m.MothraId == l.ucdpersonuuid);
+                results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(userInfo, l, hasDetailPermission));
             };
             return results;
         }
diff --git a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
new file mode 100644
index 0000000..78ff28c
--- /dev/null
+++ b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
@@ -0,0 +1,93 @@
+using System.Runtime.Versioning;
+using Viper.Areas.RAPS.Models;
+using Viper.Models.AAUD;
+
+namespace Viper.Areas.Directory.Models
+{
+    public class IndividualSearchResultCreator
+    {
+        [SupportedOSPlatform("windows")]
+        public static IndividualSearchResult CreateIndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserContact, bool includeDetail=false)
+        {
+            if (includeDetail)
+            {
+                IndividualSearchResultWithIDs indiv = new();
+                if (aaudUser != null)
+                {
+                    AddAaudUser(indiv, aaudUser);
+                    AddIds(indiv, aaudUser);
+                }
+                if (ldapUserContact != null)
+                {
+                    AddLdapContact(indiv, ldapUserContact);
+                }
+
+                return indiv;
+            }
+            else
+            {
+                IndividualSearchResult indiv = new();
+                if (aaudUser != null)
+                {
+                    AddAaudUser(indiv, aaudUser);
+                }
+                if (ldapUserContact != null)
+                {
+                    AddLdapContact(indiv, ldapUserContact);
+                }
+                return indiv;
+            }
+        }
+
+        private static void AddAaudUser(IndividualSearchResult indiv, AaudUser aaudUser)
+        {
+            indiv.MothraId = aaudUser.MothraId;
+            indiv.LoginId = aaudUser.LoginId;
+            indiv.MailId = aaudUser.MailId;
+            indiv.LastName = aaudUser.LastName;
+            indiv.FirstName = aaudUser.FirstName;
+            indiv.MiddleName = aaudUser.MiddleName;
+            indiv.DisplayLastName = aaudUser.DisplayLastName;
+            indiv.DisplayFirstName = aaudUser.DisplayFirstName;
+            indiv.DisplayMiddleName = aaudUser.DisplayMiddleName;
+            indiv.DisplayFullName = aaudUser.DisplayFullName;
+            indiv.Name = aaudUser.DisplayFullName;
+            indiv.CurrentStudent = aaudUser.CurrentStudent;
+            indiv.FutureStudent = aaudUser.FutureStudent;
+            indiv.CurrentEmployee = aaudUser.CurrentEmployee;
+            indiv.FutureEmployee = aaudUser.FutureEmployee;
+            indiv.StudentTerm = aaudUser.StudentTerm;
+            indiv.EmployeeTerm = aaudUser.EmployeeTerm;
+            indiv.PpsId = aaudUser.PpsId;
+            indiv.StudentPKey = aaudUser.StudentPKey;
+            indiv.EmployeePKey = aaudUser.EmployeePKey;
+            indiv.Current = aaudUser.Current;
+            indiv.Future = aaudUser.Future;
+            indiv.IamId = aaudUser.IamId;
+            indiv.Ross = aaudUser.Ross;
+            indiv.Added = aaudUser.Added;
+        }
+
+        private static void AddIds(IndividualSearchResultWithIDs indiv, AaudUser aaudUser)
+        {
+            indiv.SpridenId = aaudUser.SpridenId;
+            indiv.Pidm = aaudUser.Pidm;
+            indiv.EmployeeId = aaudUser.EmployeeId;
+            indiv.VmacsId = aaudUser.VmacsId;
+            indiv.UnexId = aaudUser.UnexId;
+            indiv.MivId = aaudUser.MivId;
+        }
+
+        [SupportedOSPlatform("windows")]
+        private static void AddLdapContact(IndividualSearchResult indiv, LdapUserContact ldapUserContact)
+        {
+            indiv.Title = ldapUserContact.title;
+            indiv.Department = ldapUserContact.department;
+            indiv.Phone = ldapUserContact.phone;
+            indiv.Mobile = ldapUserContact.mobile;
+            indiv.UserName = ldapUserContact.username;
+            indiv.DisplayFullName = ldapUserContact.displayname;
+            indiv.Name = ldapUserContact.displayname;
+        }
+    }
+}

From 3873fd7054a3bdf9d6b46c0bcc4ac49e5b14ad21 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Tue, 27 Feb 2024 14:40:19 -0800
Subject: [PATCH 07/69] Another method using constructors

---
 .../Controllers/DirectoryController.cs        | 23 ++++++-
 .../Models/IndividualSearchResult.cs          | 60 ++++++++++++++++++-
 .../Models/IndividualSearchResultWithIDs.cs   | 26 +++++++-
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 4570072..fa32ce3 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -85,7 +85,17 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             individuals.ForEach(m =>
             {
                 LdapUserContact? l = new LdapService().GetUserContact(m.LoginId);
-                results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(currentUser, l, hasDetailPermission));
+
+                if(false)
+                {
+                    results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(currentUser, l, hasDetailPermission));
+                }
+                else
+                {
+                    results.Add(hasDetailPermission
+                        ? new IndividualSearchResultWithIDs(m, l)
+                        : new IndividualSearchResult(m, l));
+                }
             });
             return results;
         }
@@ -120,7 +130,16 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
             foreach (var l in ldap)
             {
                 AaudUser? userInfo = individuals.Find(m => m.MothraId == l.ucdpersonuuid);
-                results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(userInfo, l, hasDetailPermission));
+                if (false)
+                {
+                    results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(userInfo, l, hasDetailPermission));
+                }
+                else
+                {
+                    results.Add(hasDetailPermission
+                        ? new IndividualSearchResultWithIDs(userInfo, l)
+                        : new IndividualSearchResult(userInfo, l));
+                }
             };
             return results;
         }
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index bc1cdc4..e6c889f 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -1,4 +1,8 @@
-namespace Viper.Areas.Directory.Models
+using System.Runtime.Versioning;
+using Viper.Areas.RAPS.Models;
+using Viper.Models.AAUD;
+
+namespace Viper.Areas.Directory.Models
 {
     public class IndividualSearchResult
     {
@@ -58,5 +62,59 @@ public class IndividualSearchResult
         public string? Mobile { get; set; } = null!;
         public string? UserName { get; set; } = null!;
         public string? originalObject { get; set; } = null!;
+
+        public IndividualSearchResult()
+        {
+
+        }
+
+        [SupportedOSPlatform("windows")]
+        public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserContact)
+        {
+            if (aaudUser != null) { 
+                MothraId = aaudUser.MothraId;
+                LoginId = aaudUser.LoginId;
+                MailId = aaudUser.MailId;
+                LastName = aaudUser.LastName;
+                FirstName = aaudUser.FirstName;
+                MiddleName = aaudUser.MiddleName;
+                DisplayLastName = aaudUser.DisplayLastName;
+                DisplayFirstName = aaudUser.DisplayFirstName;
+                DisplayMiddleName = aaudUser.DisplayMiddleName;
+                DisplayFullName = aaudUser.DisplayFullName;
+                Name = aaudUser.DisplayFullName;
+                CurrentStudent = aaudUser.CurrentStudent;
+                FutureStudent = aaudUser.FutureStudent;
+                CurrentEmployee = aaudUser.CurrentEmployee;
+                FutureEmployee = aaudUser.FutureEmployee;
+                StudentTerm = aaudUser.StudentTerm;
+                EmployeeTerm = aaudUser.EmployeeTerm;
+                PpsId = aaudUser.PpsId;
+                StudentPKey = aaudUser.StudentPKey;
+                EmployeePKey = aaudUser.EmployeePKey;
+                Current = aaudUser.Current;
+                Future = aaudUser.Future;
+                IamId = aaudUser.IamId;
+                Ross = aaudUser.Ross;
+                Added = aaudUser.Added;
+            }
+
+            if (ldapUserContact != null)
+            {
+                Title = ldapUserContact.title;
+                Department = ldapUserContact.department;
+                Phone = ldapUserContact.phone;
+                Mobile = ldapUserContact.mobile;
+                UserName = ldapUserContact.username;
+                if (string.IsNullOrEmpty(DisplayFullName)) 
+                {
+                    DisplayFullName = ldapUserContact.displayname;
+                }
+                if (string.IsNullOrEmpty(Name))
+                {
+                    Name = ldapUserContact.displayname;
+                }
+            }
+        }
     }
 }
diff --git a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
index b785183..dee592c 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
@@ -1,4 +1,8 @@
-namespace Viper.Areas.Directory.Models
+using System.Runtime.Versioning;
+using Viper.Areas.RAPS.Models;
+using Viper.Models.AAUD;
+
+namespace Viper.Areas.Directory.Models
 {
     public class IndividualSearchResultWithIDs: IndividualSearchResult
     {
@@ -15,5 +19,25 @@ public class IndividualSearchResultWithIDs: IndividualSearchResult
         public string? UnexId { get; set; } = string.Empty;
 
         public int? MivId { get; set; } = null!;
+
+        public IndividualSearchResultWithIDs()
+        {
+
+        }
+
+        [SupportedOSPlatform("windows")]
+        public IndividualSearchResultWithIDs(AaudUser? aaudUser, LdapUserContact? ldapUserContact)
+            : base(aaudUser, ldapUserContact)
+        {
+            if (aaudUser != null)
+            {
+                SpridenId = aaudUser.SpridenId;
+                Pidm = aaudUser.Pidm;
+                EmployeeId = aaudUser.EmployeeId;
+                VmacsId = aaudUser.VmacsId;
+                UnexId = aaudUser.UnexId;
+                MivId = aaudUser.MivId;
+            }            
+        }
     }
 }

From f3d34a0084c5fb446fa7ae3b2b80e0fdf52f7bda Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Tue, 27 Feb 2024 14:43:30 -0800
Subject: [PATCH 08/69] Updating factory class with name priority

---
 .../Directory/Models/IndividualSearchResultCreator.cs  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
index 78ff28c..40a691c 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
@@ -86,8 +86,14 @@ private static void AddLdapContact(IndividualSearchResult indiv, LdapUserContact
             indiv.Phone = ldapUserContact.phone;
             indiv.Mobile = ldapUserContact.mobile;
             indiv.UserName = ldapUserContact.username;
-            indiv.DisplayFullName = ldapUserContact.displayname;
-            indiv.Name = ldapUserContact.displayname;
+            if(string.IsNullOrEmpty(indiv.DisplayFullName))
+            {
+                indiv.DisplayFullName = ldapUserContact.displayname;
+            }
+            if(string.IsNullOrEmpty(indiv.Name))
+            {
+                indiv.Name = ldapUserContact.displayname;
+            }
         }
     }
 }

From 7a3f42e39437a3085f19a3f3b2bf7538dbc9393a Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 28 Feb 2024 12:13:50 -0800
Subject: [PATCH 09/69] Card example

---
 .../Controllers/DirectoryController.cs        | 11 +--
 web/Areas/Directory/Views/CardExample.cshtml  | 83 +++++++++++++++++++
 web/Areas/Directory/Views/Index.cshtml        |  2 +-
 3 files changed, 88 insertions(+), 8 deletions(-)
 create mode 100644 web/Areas/Directory/Views/CardExample.cshtml

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index fa32ce3..b422a2b 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -2,17 +2,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Viper.Models.AAUD;
-using Viper.Models.RAPS;
 using Viper.Areas.RAPS.Services;
 using Web.Authorization;
-using Microsoft.IdentityModel.Tokens;
 using Viper.Classes;
-using Polly;
 using Viper.Classes.SQLContext;
 using Viper.Areas.RAPS.Models;
 using Viper.Areas.Directory.Models;
-using System;
-using Viper;
 using System.Runtime.Versioning;
 
 namespace Viper.Areas.Directory.Controllers
@@ -37,9 +32,11 @@ public DirectoryController(Classes.SQLContext.RAPSContext context)
         /// Directory home page
         /// </summary>
         [Route("/[area]/")]
-        public async Task<ActionResult> Index()
+        public async Task<ActionResult> Index(string? useExample)
         {
-            return await Task.Run(() => View("~/Areas/Directory/Views/Index.cshtml"));
+            return await Task.Run(() => !string.IsNullOrEmpty(useExample) 
+                ? View("~/Areas/Directory/Views/CardExample.cshtml") 
+                : View("~/Areas/Directory/Views/Index.cshtml"));
         }
 
         /// <summary>
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
new file mode 100644
index 0000000..e6ff4bf
--- /dev/null
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -0,0 +1,83 @@
+<h2>Directory</h2>
+<q-form @@submit="return false;">
+    <q-input class="q-ml-xs q-mr-xs"
+             dense
+             clearable
+             clear-icon="close"
+             outlined
+             debounce="300"
+             placeholder="Search for users"
+             v-model="userSearch"
+             autofocus>
+    </q-input>
+    <q-toggle v-model="ucd"
+              color="green"
+              label="Search all of UCD">
+    </q-toggle>
+</q-form>
+
+<div class="row q-pa-sm q-gutter-sm">
+    <q-card v-for="user in results" class="col-12 col-md-8 col-lg-4 col-xl-3">
+        <q-card-section horizontal class="row">
+            <q-card-section class="col-2 col-sm-1">
+                <q-icon name="person" size="sm" class="col"></q-icon>
+                <a :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col">
+                    <q-icon name="email" size="sm"></q-icon>
+                </a>
+                <q-btn icon="assignment_ind" size="sm" dense color="red-10" text-color="white"
+                       :href="'/EmulateUser/' + user.loginId"></q-btn>
+            </q-card-section>
+            <q-separator></q-separator>
+            <q-card-section class="col-5 col-sm-3 col-md-3 col-lg-3">
+                <q-avatar square size="87px">
+                    <img :src="'@HttpHelper.GetOldViperRootURL()/public/utilities/getbase64image.cfm?mailid=' + user.mailId + '&altphoto=1'" height="40" id="siteProfileAvatar">
+                </q-avatar>
+            </q-card-section>
+            <q-card-section class="col">
+                {{user.name}}
+                <br />
+                {{user.mailId}}@@ucdavis.edu
+            </q-card-section>
+        </q-card-section>
+    </q-card>
+</div>
+
+@section Scripts {
+    <script asp-add-nonce="true">
+        createVueApp({
+            data() {
+                return {
+                    userSearch: getItemFromStorage("directory_search") ?? "",
+                    ucd: getItemFromStorage("directory_ucd") ?? false,
+                    results: []
+                }
+            },
+            methods: {
+                findUsers: async function () {
+                    var urlBase = "/Directory/search/" + this.userSearch
+                    if (this.ucd) {
+                        urlBase += "/ucd"
+                    }
+                    if (this.userSearch.length >= 2) {
+                        this.results = (await viperFetch(this, urlBase))
+                    }
+                }
+            },
+            mounted() {
+                this.findUsers()
+            },
+            watch: {
+                userSearch: function () {
+                    putItemInStorage("directory_search", this.userSearch);
+                    putItemInStorage("directory_ucd", this.ucd);
+                    this.findUsers();
+                },
+                ucd: function () {
+                    putItemInStorage("directory_search", this.userSearch);
+                    putItemInStorage("directory_ucd", this.ucd);
+                    this.findUsers();
+                }
+            }
+        })
+    </script>
+}
\ No newline at end of file
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
index 7ea1bae..c4525ea 100644
--- a/web/Areas/Directory/Views/Index.cshtml
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -1,5 +1,5 @@
 @using Viper.Classes.SQLContext;
-@model Viper.Models.AAUD.AaudUser
+@model Viper.Models.AAUD.AaudUser;
 @{
     RAPSContext? rapsContext = (RAPSContext?)Context.RequestServices.GetService(typeof(RAPSContext));
     IUserHelper UserHelper = new UserHelper();

From bdf78c60ada081bd0565c3acc809957546ef020c Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 28 Feb 2024 12:15:33 -0800
Subject: [PATCH 10/69] Adding localhost to allowed CSP

---
 web/Program.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/Program.cs b/web/Program.cs
index ae20071..0f61fb9 100644
--- a/web/Program.cs
+++ b/web/Program.cs
@@ -199,7 +199,8 @@
             .From("viper.vetmed.ucdavis.edu")
             .From("secure.vetmed.ucdavis.edu")
             .From("secure-test.vetmed.ucdavis.edu")
-            .From("*.vetmed.ucdavis.edu");
+            .From("*.vetmed.ucdavis.edu")
+            .From("http://localhost");
 
         csp.AllowPlugins
             .FromNowhere(); // Plugins not allowed

From 74016300eff92de0bb213a47b69f8fcff06304b7 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:50:18 -0800
Subject: [PATCH 11/69] Displays content as cards

---
 .../Controllers/DirectoryController.cs        |  7 +-
 .../Models/IndividualSearchResult.cs          | 12 ++-
 web/Areas/Directory/Views/CardExample.cshtml  | 97 +++++++++++++++----
 web/Areas/RAPS/Services/LdapService.cs        | 33 +++++--
 4 files changed, 118 insertions(+), 31 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index b422a2b..939ff70 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -47,9 +47,8 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         {
             var nav = new List<NavMenuItem>
             {
-                new NavMenuItem() { MenuItemText = "Instances", IsHeader = true }
             };
-            return nav;
+            return await Task.Run(() => nav);
         }
 
 
@@ -81,7 +80,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
             individuals.ForEach(m =>
             {
-                LdapUserContact? l = new LdapService().GetUserContact(m.LoginId);
+                LdapUserContact? l = new LdapService().GetUserByID(m.IamId);
 
                 if(false)
                 {
@@ -126,7 +125,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
             bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
             foreach (var l in ldap)
             {
-                AaudUser? userInfo = individuals.Find(m => m.MothraId == l.ucdpersonuuid);
+                AaudUser? userInfo = individuals.Find(m => m.IamId == l.ucdpersoniamid);
                 if (false)
                 {
                     results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(userInfo, l, hasDetailPermission));
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index e6c889f..e9df58d 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -60,7 +60,10 @@ public class IndividualSearchResult
 
         public string? Phone { get; set; } = null!;
         public string? Mobile { get; set; } = null!;
+        public string? PostalAddress { get; set; } = null!;
+        public string? UCDAffiliation { get; set; } = null!;
         public string? UserName { get; set; } = null!;
+        public bool? SVM { get; set; } = null!;
         public string? originalObject { get; set; } = null!;
 
         public IndividualSearchResult()
@@ -71,6 +74,7 @@ public IndividualSearchResult()
         [SupportedOSPlatform("windows")]
         public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserContact)
         {
+            SVM = false;
             if (aaudUser != null) { 
                 MothraId = aaudUser.MothraId;
                 LoginId = aaudUser.LoginId;
@@ -96,16 +100,20 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 Future = aaudUser.Future;
                 IamId = aaudUser.IamId;
                 Ross = aaudUser.Ross;
+                SVM = true;
                 Added = aaudUser.Added;
             }
 
             if (ldapUserContact != null)
             {
+                originalObject = ldapUserContact.originalObject;
                 Title = ldapUserContact.title;
                 Department = ldapUserContact.department;
-                Phone = ldapUserContact.phone;
+                Phone = ldapUserContact.telephonenumber;
                 Mobile = ldapUserContact.mobile;
-                UserName = ldapUserContact.username;
+                UserName = ldapUserContact.uid;
+                PostalAddress = (ldapUserContact.postaladdress ?? "").Replace("$", '\n'.ToString());
+                UCDAffiliation = ldapUserContact.ucdpersonaffiliation;
                 if (string.IsNullOrEmpty(DisplayFullName)) 
                 {
                     DisplayFullName = ldapUserContact.displayname;
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
index e6ff4bf..58e9bc1 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -1,4 +1,11 @@
-<h2>Directory</h2>
+@using Viper.Classes.SQLContext;
+@model Viper.Models.AAUD.AaudUser;
+@{
+    RAPSContext? rapsContext = (RAPSContext?)Context.RequestServices.GetService(typeof(RAPSContext));
+    IUserHelper UserHelper = new UserHelper();
+    ViewData["Title"] = "Directory";
+}
+<h2>Directory</h2>
 <q-form @@submit="return false;">
     <q-input class="q-ml-xs q-mr-xs"
              dense
@@ -16,29 +23,81 @@
     </q-toggle>
 </q-form>
 
-<div class="row q-pa-sm q-gutter-sm">
-    <q-card v-for="user in results" class="col-12 col-md-8 col-lg-4 col-xl-3">
-        <q-card-section horizontal class="row">
-            <q-card-section class="col-2 col-sm-1">
-                <q-icon name="person" size="sm" class="col"></q-icon>
-                <a :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col">
-                    <q-icon name="email" size="sm"></q-icon>
-                </a>
-                <q-btn icon="assignment_ind" size="sm" dense color="red-10" text-color="white"
-                       :href="'/EmulateUser/' + user.loginId"></q-btn>
-            </q-card-section>
-            <q-separator></q-separator>
-            <q-card-section class="col-5 col-sm-3 col-md-3 col-lg-3">
-                <q-avatar square size="87px">
+<div class="row q-pa-sm q-gutter-sm" style="background-color: #fff">
+    <q-card v-for="user in results" class="col-4 col-sm-12 col-md-5 col-lg-4 col-xl-3 block { SVM : user.SVM}" style="background-color: #fff; border: 1px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
+        <q-card-section horizontal class="row justify-center">
+            <q-card-section class="col-4 col-sm-4 col-md-4 col-lg-4 text-right self-center q-pr-m">
+                <q-avatar square size="87px" class="text-right self-center">
                     <img :src="'@HttpHelper.GetOldViperRootURL()/public/utilities/getbase64image.cfm?mailid=' + user.mailId + '&altphoto=1'" height="40" id="siteProfileAvatar">
                 </q-avatar>
             </q-card-section>
-            <q-card-section class="col">
-                {{user.name}}
-                <br />
-                {{user.mailId}}@@ucdavis.edu
+            <q-card-section class="col q-pl-m">
+                <h3 style="font-weight: 400;">
+                    {{user.name}}
+                </h3>
+                <h4 style="font-weight: 400;" v-if="user.title">
+                    {{user.title}}
+                </h4>
+                <h5 style="font-weight: 400;" v-if="user.mailId">
+                    <a href="mailto:{{user.mailId}}@@ucdavis.edu">{{user.mailId}}@@ucdavis.edu</a>
+                </h5>
+                <h6 style="font-weight: 400;" v-if="user.userName">
+                    {{user.userName}}
+                </h6>
+                <h6 v-if="user.svm && ucd">SVM</h6>
             </q-card-section>
         </q-card-section>
+        <q-separator></q-separator>
+        <q-card-section class="row justify-around">
+            <q-icon name="person" size="sm" class="col"></q-icon>
+            <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="sm"></q-icon></a>
+            <q-btn icon="assignment_ind" size="sm" dense color="red-10" text-color="white" :href="'/EmulateUser/' + user.loginId"></q-btn>
+        </q-card-section>
+        <q-separator></q-separator>
+        <q-card-section class="row">
+            <ul>
+            <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></li>
+            <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></li>
+            <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></li>
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
+            {
+                @: <li v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></li>
+            }
+            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
+            {
+                @: <li v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></li>
+            }
+            </ul>
+        </q-card-section>
+        <q-separator v-if="user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId"></q-separator>
+        <q-card-section class="row" v-if="user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId">
+            <ul>
+            <li v-if="user.spridenId">
+                BannerID:
+                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+                {
+                    @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
+                }
+                else
+                {
+                    @: {{ user.spridenId }}
+                }
+            </li>
+            <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
+            <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
+            <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
+            <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
+            <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
+            </ul>
+        </q-card-section>
+        <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
+        <q-card-section class="row" v-if="user.phone || user.mobile || user.postalAddress">
+            <ul>
+            <li v-if="user.postalAddress">{{ user.postalAddress }}</li>
+            <li v-if="user.phone">Phone: {{ user.phone }}</li>
+            <li v-if="user.mobile">Mobile: {{ user.mobile }}</li>
+            </ul>
+        </q-card-section>
     </q-card>
 </div>
 
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 8c28e78..82bc7e6 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -76,7 +76,7 @@ public class LdapService
     };
         private readonly string[] CFParams =
         {
-            "givenName","sn","middlename","ou","mail","telephoneNumber","mobile","postalAddress","ucdStudentLevel","labeledUri","title","uid","ucdPersonPIDM","ucdPersonIAMID","employeeNumber","ucdStudentSID","ucdPersonUUID","eduPersonNickname","ucdPersonAffiliation","displayname"
+            "accountexpires","adspath","badpasswordtime","badpwdcount","cn","codepage","company","countrycode","deliverandredirect","department","deptname","departmentnumber","Description","displayname","distinguishedname","dscorepropagationdata","edupersonaffiliation","edupersonprincipalname","employeenumber","extensionattribute10","extensionattribute11","extensionattribute12","extensionattribute13","extensionattribute14","extensionattribute15","extensionattribute5","extensionattribute6","extensionattribute7","extensionattribute8","extensionattribute9","gidnumber","givenname","instancetype","internetencoding","l","lastlogoff","lastlogon","lastlogontimestamp","legacyexchangedn","lockouttime","logoncount","mail","mailnickname","mapirecipient","memberof","mobile","msexcharchiveguid","msexcharchivename","msexcharchivestatus","msexchblockedsendershash","msexchcomanagedobjectsbl","msexchextensionattribute16","msexchextensionattribute17","msexchmailboxguid","msexchpoliciesexcluded","msexchrecipientdisplaytype","msexchrecipienttypedetails","msexchremoterecipienttype","msexchsafesendershash","msexchtextmessagingstate","msexchumdtmfmap","msexchuseraccountcontrol","msexchversion","msexchwhenmailboxcreated","name","objectcategory","objectclass","objectguid","objectsid","ou","pager","phone","physicaldeliveryofficename","postaladdress","postalcode","primarygroupid","proxyaddresses","pwdlastset","SamAccountName","samaccounttype","showinaddressbook","sn","st","street","streetaddress","targetaddress","telephonenumber","textencodedoraddress","title","ucdappointmentdepartmentcode","ucdappointmenttitlecode","ucdpersonaffiliation","ucdpersoniamid","ucdpersonnetid","ucdpersonpidm","ucdpersonppsid","ucdpersonuuid","ucdpublishitemflag","ucdstudentsid","uid","uidnumber","useraccountcontrol","username","userprincipalname","usnchanged","usncreated","whenchanged","whencreated"
         };
 
         public LdapService() { }
@@ -166,7 +166,7 @@ public List<LdapUserContact> GetUsersContact(string search)
         {
             string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
             DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            SearchResultCollection results = new DirectorySearcher(de, filter)
             { SizeLimit = 1000 }
                 .FindAll();
             List<LdapUserContact> users = new();
@@ -198,13 +198,34 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         }
 
         /// <summary>
-        /// Look up User by its MothraID
+        /// Look up User by search string
+        /// </summary>
+        /// <param name="search">Search string for looking up user</param>
+        /// <returns>LdapUserContact</returns>
+        public LdapUserContact? GetUserContact(string search)
+        {
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            DirectoryEntry de = GetRootContact();
+            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            { SizeLimit = 1 }
+                .FindAll();
+            foreach (SearchResult result in results)
+            {
+                return new LdapUserContact(result);
+            }
+            return null;
+        }
+
+
+        /// <summary>
+        /// Look up User by its iamID
         /// </summary>
-        /// <param name="id">MothraIDs for looking up user</param>
+        /// <param name="id">iamID for looking up user</param>
         /// <returns>LdapUserContact</returns>
-        public LdapUserContact? GetUsersByID(string id)
+        public LdapUserContact? GetUserByID(string? id)
         {
-            string filter = string.Format("(|(ucdpersonuuid = {0}))", id);
+            if (id == null) return null;
+            string filter = string.Format("(|(ucdpersoniamid = {0}))", id);
             DirectoryEntry de = GetRootContact();
             SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
             { SizeLimit = 1 }

From 436cc9ef1ec93d28b6998005c10903fe8eb6f3f4 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Tue, 19 Mar 2024 15:09:24 -0700
Subject: [PATCH 12/69] Moving to new VM

---
 web/Areas/Directory/Services/VMACSService.cs |  9 ++
 web/Areas/Directory/Views/CardExample.cshtml | 91 +++++++++++---------
 web/Areas/Directory/Views/Index.cshtml       |  5 ++
 web/wwwroot/css/site.css                     |  6 +-
 4 files changed, 70 insertions(+), 41 deletions(-)
 create mode 100644 web/Areas/Directory/Services/VMACSService.cs

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
new file mode 100644
index 0000000..dac3f06
--- /dev/null
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Viper.Areas.Directory.Services
+{
+    public class VMACSService
+    {
+
+    }
+}
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
index 58e9bc1..64eb80b 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -21,11 +21,20 @@
               color="green"
               label="Search all of UCD">
     </q-toggle>
+    <q-toggle v-model="ids"
+              color="blue"
+              label="Display IDs">
+    </q-toggle>
 </q-form>
 
 <div class="row q-pa-sm q-gutter-sm" style="background-color: #fff">
     <q-card v-for="user in results" class="col-4 col-sm-12 col-md-5 col-lg-4 col-xl-3 block { SVM : user.SVM}" style="background-color: #fff; border: 1px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
         <q-card-section horizontal class="row justify-center">
+            <q-card-section class="col-1 self-center">
+                <q-icon name="person" size="sm" class="col"></q-icon>
+                <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="sm"></q-icon></a>
+                <q-btn icon="assignment_ind" size="sm" dense color="red-10" text-color="white" :href="'/EmulateUser/' + user.loginId"></q-btn>
+            </q-card-section>
             <q-card-section class="col-4 col-sm-4 col-md-4 col-lg-4 text-right self-center q-pr-m">
                 <q-avatar square size="87px" class="text-right self-center">
                     <img :src="'@HttpHelper.GetOldViperRootURL()/public/utilities/getbase64image.cfm?mailid=' + user.mailId + '&altphoto=1'" height="40" id="siteProfileAvatar">
@@ -47,55 +56,51 @@
                 <h6 v-if="user.svm && ucd">SVM</h6>
             </q-card-section>
         </q-card-section>
-        <q-separator></q-separator>
-        <q-card-section class="row justify-around">
-            <q-icon name="person" size="sm" class="col"></q-icon>
-            <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="sm"></q-icon></a>
-            <q-btn icon="assignment_ind" size="sm" dense color="red-10" text-color="white" :href="'/EmulateUser/' + user.loginId"></q-btn>
+        <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
+        <q-card-section class="row" v-if="user.phone || user.mobile || user.postalAddress">
+            <ul>
+            <li v-if="user.postalAddress">{{ user.postalAddress }}</li>
+            <li v-if="user.phone">Phone: {{ user.phone }}</li>
+            <li v-if="user.mobile">Mobile: {{ user.mobile }}</li>
+            </ul>
         </q-card-section>
-        <q-separator></q-separator>
-        <q-card-section class="row">
+        <q-separator v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)"></q-separator>
+        <q-card-section class="row" v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)">
             <ul>
-            <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></li>
-            <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></li>
-            <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></li>
-            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
-            {
-                @: <li v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></li>
-            }
-            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
-            {
-                @: <li v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></li>
-            }
+                <li v-if="user.spridenId">
+                    BannerID:
+                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+                    {
+                        @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
+                    }
+                    else
+                    {
+                        @: {{ user.spridenId }}
+                    }
+                </li>
+                <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
+                <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
+                <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
+                <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
+                <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
             </ul>
         </q-card-section>
-        <q-separator v-if="user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId"></q-separator>
-        <q-card-section class="row" v-if="user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId">
+        <q-separator v-if="ids"></q-separator>
+        <q-card-section v-if="ids" class="row">
             <ul>
-            <li v-if="user.spridenId">
-                BannerID:
-                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+                <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></li>
+                <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></li>
+                <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></li>
+                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
                 {
-                    @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
+                    @:
+                    <li v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></li>
                 }
-                else
+                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
                 {
-                    @: {{ user.spridenId }}
+                    @:
+                    <li v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></li>
                 }
-            </li>
-            <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
-            <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
-            <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
-            <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
-            <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
-            </ul>
-        </q-card-section>
-        <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
-        <q-card-section class="row" v-if="user.phone || user.mobile || user.postalAddress">
-            <ul>
-            <li v-if="user.postalAddress">{{ user.postalAddress }}</li>
-            <li v-if="user.phone">Phone: {{ user.phone }}</li>
-            <li v-if="user.mobile">Mobile: {{ user.mobile }}</li>
             </ul>
         </q-card-section>
     </q-card>
@@ -108,6 +113,7 @@
                 return {
                     userSearch: getItemFromStorage("directory_search") ?? "",
                     ucd: getItemFromStorage("directory_ucd") ?? false,
+                    ids: getItemFromStorage("directory_ids") ?? false,
                     results: []
                 }
             },
@@ -135,6 +141,11 @@
                     putItemInStorage("directory_search", this.userSearch);
                     putItemInStorage("directory_ucd", this.ucd);
                     this.findUsers();
+                },
+                ids: function () {
+                    putItemInStorage("directory_search", this.userSearch);
+                    putItemInStorage("directory_ids", this.ids);
+                    this.findUsers();
                 }
             }
         })
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
index c4525ea..f939a45 100644
--- a/web/Areas/Directory/Views/Index.cshtml
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -21,6 +21,10 @@
               color="green"
               label="Search all of UCD">
     </q-toggle>
+    <q-toggle v-model="ids"
+              color="blue"
+              label="Show IDs">
+    </q-toggle>
 </q-form>
 
 <q-table title="Search Results"
@@ -120,6 +124,7 @@
                 return {
                     userSearch: getItemFromStorage("directory_search") ?? "",
                     ucd: getItemFromStorage("directory_ucd") ?? false,
+                    ids: getItemFromStorage("directory_ids") ?? false,
                     users: new quasarTable({
                         keys: ["mothraId"],
                         urlBase: "users",
diff --git a/web/wwwroot/css/site.css b/web/wwwroot/css/site.css
index 5e3667c..fb0e06f 100644
--- a/web/wwwroot/css/site.css
+++ b/web/wwwroot/css/site.css
@@ -233,4 +233,8 @@ body {
     font-size: 1rem;
     line-height: 1rem;
     margin: .0rem 0rem .5rem 0rem;
-}
\ No newline at end of file
+}
+
+.q-avatar {
+    height: 111px !important; width: 87px !important;
+}

From 9f6b0cd9e9fb4d6bbde1f0fa11802663936f3cc7 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Thu, 21 Mar 2024 15:31:11 -0700
Subject: [PATCH 13/69] Adding some autofocus and some filter saving

---
 .../RAPS/Views/Permissions/ListAdmin.cshtml     | 17 +++++++++++++++++
 web/Areas/RAPS/Views/Permissions/Members.cshtml |  2 +-
 web/Areas/RAPS/Views/Roles/ListAdmin.cshtml     | 17 +++++++++++++++++
 web/Areas/RAPS/Views/Roles/Members.cshtml       |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/web/Areas/RAPS/Views/Permissions/ListAdmin.cshtml b/web/Areas/RAPS/Views/Permissions/ListAdmin.cshtml
index b9bf4c3..867d740 100644
--- a/web/Areas/RAPS/Views/Permissions/ListAdmin.cshtml
+++ b/web/Areas/RAPS/Views/Permissions/ListAdmin.cshtml
@@ -79,7 +79,24 @@
                 }
             },
             mounted() {
+                var f = getItemFromStorage("RAPS_permission_filter")
+                if (f) {
+                    this.permissionTable.filter = f
+                }
+                var p = getItemFromStorage("RAPS_permission_pagination")
+                if (p) {
+                    this.permissionTable.pagination = p
+                }
                 this.permissionTable.load(this)
+            },
+            watch: {
+                permissionTable: {
+                    handler(v) {
+                        putItemInStorage("RAPS_permission_filter", v.filter)
+                        putItemInStorage("RAPS_permission_pagination", v.pagination)
+                    },
+                    deep: true
+                }
             }
         })
     </script>
diff --git a/web/Areas/RAPS/Views/Permissions/Members.cshtml b/web/Areas/RAPS/Views/Permissions/Members.cshtml
index 0177488..ccc4805 100644
--- a/web/Areas/RAPS/Views/Permissions/Members.cshtml
+++ b/web/Areas/RAPS/Views/Permissions/Members.cshtml
@@ -23,7 +23,7 @@
 
                         <q-card-section>
                             <div class="row">
-                                <q-select outlined dense options-dense use-input input-debounce="300"
+                                <q-select outlined dense options-dense use-input input-debounce="300" autofocus
                                           label="User"
                                           v-model="membersTable.object.member"
                                           @@filter="memberSearch"
diff --git a/web/Areas/RAPS/Views/Roles/ListAdmin.cshtml b/web/Areas/RAPS/Views/Roles/ListAdmin.cshtml
index 7763e9b..0f04f33 100644
--- a/web/Areas/RAPS/Views/Roles/ListAdmin.cshtml
+++ b/web/Areas/RAPS/Views/Roles/ListAdmin.cshtml
@@ -101,8 +101,25 @@
                 }
             },
             async mounted() {
+                var f = getItemFromStorage("RAPS_roles_filter")
+                if (f) {
+                    this.rolesTable.filter = f
+                }
+                var p = getItemFromStorage("RAPS_roles_pagination")
+                if (p) {
+                    this.rolesTable.pagination = p
+                }
                 this.rolesTable.load()
                 this.views = await viperFetch(this, "Roles/Views")
+            },
+            watch: {
+                rolesTable: {
+                    handler(v) {
+                        putItemInStorage("RAPS_roles_filter", v.filter)
+                        putItemInStorage("RAPS_roles_pagination", v.pagination)
+                    },
+                    deep: true
+                }
             }
         })
     </script>
diff --git a/web/Areas/RAPS/Views/Roles/Members.cshtml b/web/Areas/RAPS/Views/Roles/Members.cshtml
index 4ccbd64..93bec09 100644
--- a/web/Areas/RAPS/Views/Roles/Members.cshtml
+++ b/web/Areas/RAPS/Views/Roles/Members.cshtml
@@ -24,7 +24,7 @@
 
                         <q-card-section>
                             <div class="row">
-                                <q-select outlined dense options-dense use-input input-debounce="300"
+                                <q-select outlined dense options-dense use-input input-debounce="300" autofocus
                                           label="User"
                                           v-model="membersTable.object.member"
                                           @@filter="memberSearch"

From ce2fb8c0770e699f0a4e96c1e6005f6c952150ab Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Tue, 16 Apr 2024 07:21:49 -0700
Subject: [PATCH 14/69] Testing VMACS API

---
 .../Models/IndividualSearchResult.cs          |  18 ++-
 web/Areas/Directory/Services/VMACSService.cs  | 120 ++++++++++++++++++
 web/Areas/Directory/Views/CardExample.cshtml  | 118 +++++++++--------
 3 files changed, 202 insertions(+), 54 deletions(-)

diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index e9df58d..fa38963 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -1,4 +1,7 @@
-using System.Runtime.Versioning;
+using Microsoft.EntityFrameworkCore;
+using System.Runtime.CompilerServices;
+using System.Runtime.Versioning;
+using Viper.Areas.Directory.Services;
 using Viper.Areas.RAPS.Models;
 using Viper.Models.AAUD;
 
@@ -9,10 +12,12 @@ public class IndividualSearchResult
         public string ClientId { get; set; } = string.Empty;
 
         public string MothraId { get; set; } = string.Empty;
+        public string UCDPersonUUID { get; set; } = string.Empty;
 
         public string? LoginId { get; set; } = string.Empty;
 
         public string? MailId { get; set; } = string.Empty;
+        public string? EmailHost { get; set; } = string.Empty;
 
         public string LastName { get; set; } = string.Empty;
 
@@ -114,6 +119,7 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 UserName = ldapUserContact.uid;
                 PostalAddress = (ldapUserContact.postaladdress ?? "").Replace("$", '\n'.ToString());
                 UCDAffiliation = ldapUserContact.ucdpersonaffiliation;
+                UCDPersonUUID = ldapUserContact.ucdpersonuuid;
                 if (string.IsNullOrEmpty(DisplayFullName)) 
                 {
                     DisplayFullName = ldapUserContact.displayname;
@@ -123,6 +129,16 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                     Name = ldapUserContact.displayname;
                 }
             }
+            using (var context = new Classes.SQLContext.AAUDContext())
+            {
+                var query = $"SELECT * FROM OPENQUERY(UCDMothra,'SELECT (USERPART || ''@'' || HOSTPART) AS USERATHOST FROM MOTHRA.MAILIDS WHERE MOTHRAID = ''{MothraId}'' AND MAILID = ''{MailId}'' AND MAILSTATUS = ''A'' AND MAILTYPE = ''P''')".ToString();
+                var results = context.Database.SqlQuery<string>(FormattableStringFactory.Create(query)).ToList();
+                foreach (var r in results)
+                {
+                    EmailHost = r;
+                }
+            }
+            VMACSService.Search(LoginId);
         }
     }
 }
diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index dac3f06..89f686a 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -1,9 +1,129 @@
 using Microsoft.AspNetCore.Mvc;
+using System.DirectoryServices.AccountManagement;
+using System.DirectoryServices;
+using Viper.Areas.RAPS.Models;
+using System.Net.Http;
+using System.Text;
+using System.Xml.Serialization;
 
 namespace Viper.Areas.Directory.Services
 {
     public class VMACSService
     {
+        //private const string _ldapUsername = "uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu";
+        private static HttpClient sharedClient = new()
+        {
+            BaseAddress = new Uri("https://vmacs-vmth.vetmed.ucdavis.edu"),
+        };
+        /*
+
+         * 
+         */
+        [XmlRoot("query/item")]
+        public class VMACS_API
+        {
+            [XmlElement("name")]
+            public string[]? Name { get; set; }
+            [XmlElement("UserID")]
+            public string[]? VMACSID { get; set; }
+            [XmlElement("Unit")]
+            public string[]? Unit { get; set; }
+            [XmlElement("Home")]
+            public string[]? Home { get; set; }
+            [XmlElement("Nextel")]
+            public string[]? Nextel { get; set; }
+            [XmlElement("Status")]
+            public string[]? Status { get; set; }
+            [XmlElement("Campus_LoginID")]
+            public string[]? Campus_LoginID { get; set; }
+            [XmlElement("Email_Forward")]
+            public string[]? Email_Forward { get; set; }
+        }
+
+        public VMACSService() { }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="loginID"></param>
+        /// <returns></returns>
+        public static async void Search (String? loginID)
+        {
+			string request = $"/trust/query.xml?dbfile=3&index=CampusLoginId&find={loginID}&format=CHRIS4&AUTH=06232005".ToString();
+            using HttpResponseMessage response = await sharedClient.GetAsync(request);
+            var s = await response.Content.ReadAsStringAsync();
+            var buffer = Encoding.UTF8.GetBytes(s);
+            using (var stream = new MemoryStream(buffer))
+            {
+                var serializer = new XmlSerializer(typeof(VMACS_API));
+                var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
+
+            }
+            var jsonResponse = await response.Content.ReadAsStringAsync();
+            Console.WriteLine($"{jsonResponse}\n");
+
+
+        }
+
+
+        /*
+         *         var result = "";
+        var contacts = {LDPager="", Nextel="", LastEdit=""};
+        cfhttp(url="https://vmacs-vmth.vetmed.ucdavis.edu/trust/query.xml?dbfile=3&index=CampusLoginId&find=#loginID#&format=CHRIS4&AUTH=06232005", 
+				method="get", timeout="2", result="result") {}
+				
+		//the number of try/catch block here could be reduced by using more xml functions to check if something exists?
+        try {
+			var data = xmlSearch(xmlParse(result.FileContent),"/query/item");
+			var exp = "";
+			var lastEdit = "";
+			//most users only have one, but in some cases, multiple accounts exist.
+			//grab the latest edited, non-expired record.
+			for(var d in data) {
+				if(d?.Campus_LoginID?.XmlText == loginID) { //mvt (Megan Rott) matches mvthomps (not Megan Rott)
+					//try to get dates - if this fails, assume the record is active and was lastedited today
+					try {
+						exp = getDateFromVmacsString(d.Deactive.XmlText);
+						lastEdit = getDateFromVmacsString(d.LastEdit.XmlText);
+					} 
+					catch(Any e) {
+						exp = dateAdd("yyyy", 1, now());
+						lastEdit = now();
+					}
+
+					if(exp > now() && (!isValid("date", contacts.LastEdit) || lastEdit > contacts.LastEdit)) {
+						contacts.lastEdit = lastEdit;
+
+						//individual tries in case these fields don't exist
+						try {
+							contacts.LDPager = d.LDPager.XmlText;
+							if(contacts.LDPager != "") {
+								contacts.LDPager = "1-530-" & contacts.LDPager;
+							}
+						}
+						catch(Any e) {}
+						
+						try {
+							contacts.Nextel = d.Nextel.XmlText;
+						}
+						catch(Any e) {}
+					}
+				}
+			} 
+        }
+        catch(Any e) {}
+        return contacts;
+
+         */
+
+        /*
+        /// <summary>
+        /// </summary>
+        /// <param name="name">Partial name of group to search for</param>
+        /// <returns>List of groups</returns>
+        public List<LdapGroup> GetGroups(string? name = null)
+        {
+        }
+        */
 
     }
 }
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
index 64eb80b..0822877 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -25,18 +25,21 @@
               color="blue"
               label="Display IDs">
     </q-toggle>
+    <q-toggle v-model="debug"
+              color="red"
+              label="Display debugging">
+    </q-toggle>
 </q-form>
 
 <div class="row q-pa-sm q-gutter-sm" style="background-color: #fff">
-    <q-card v-for="user in results" class="col-4 col-sm-12 col-md-5 col-lg-4 col-xl-3 block { SVM : user.SVM}" style="background-color: #fff; border: 1px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
-        <q-card-section horizontal class="row justify-center">
-            <q-card-section class="col-1 self-center">
-                <q-icon name="person" size="sm" class="col"></q-icon>
-                <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="sm"></q-icon></a>
-                <q-btn icon="assignment_ind" size="sm" dense color="red-10" text-color="white" :href="'/EmulateUser/' + user.loginId"></q-btn>
+    <q-card v-for="user in results" class="col-4 col-sm-12 col-md-5 col-lg-4 col-xl-3 block { SVM : user.SVM}" style="background-color: #f8f8f8; border: 2px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
+            <q-card-section class="grid row justify-between" :style="[user.svm ? {'background-color': '#1D4776'} : {'background-color': '#aaa'}]" style="padding:0; border-right: 1px solid #fff;">
+                <q-icon name="person" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon>
+                <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon></a>
+                <q-btn icon="assignment_ind" size="xs" dense :href="'/EmulateUser/' + user.loginId" style="margin: 0.4rem; background-color: ; color: #fff;"></q-btn>
             </q-card-section>
-            <q-card-section class="col-4 col-sm-4 col-md-4 col-lg-4 text-right self-center q-pr-m">
-                <q-avatar square size="87px" class="text-right self-center">
+            <q-card-section class="col-4 col-sm-4 col-md-4 col-lg-4 text-right q-pr-m">
+                <q-avatar size="87px" square style="min-width:87px;width:87px;max-width:87px;min-height:111px;height:111px;max-height:111px;border:1px solid #fff;" class="text-right">
                     <img :src="'@HttpHelper.GetOldViperRootURL()/public/utilities/getbase64image.cfm?mailid=' + user.mailId + '&altphoto=1'" height="40" id="siteProfileAvatar">
                 </q-avatar>
             </q-card-section>
@@ -48,60 +51,63 @@
                     {{user.title}}
                 </h4>
                 <h5 style="font-weight: 400;" v-if="user.mailId">
-                    <a href="mailto:{{user.mailId}}@@ucdavis.edu">{{user.mailId}}@@ucdavis.edu</a>
+                    <a href="mailto:{{user.mailId}}@@ucdavis.edu">{{user.mailId}}@@ucdavis.edu</a> [{user.emailHost}]
                 </h5>
                 <h6 style="font-weight: 400;" v-if="user.userName">
                     {{user.userName}}
                 </h6>
                 <h6 v-if="user.svm && ucd">SVM</h6>
-            </q-card-section>
-        </q-card-section>
-        <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
-        <q-card-section class="row" v-if="user.phone || user.mobile || user.postalAddress">
-            <ul>
-            <li v-if="user.postalAddress">{{ user.postalAddress }}</li>
-            <li v-if="user.phone">Phone: {{ user.phone }}</li>
-            <li v-if="user.mobile">Mobile: {{ user.mobile }}</li>
-            </ul>
-        </q-card-section>
-        <q-separator v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)"></q-separator>
-        <q-card-section class="row" v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)">
-            <ul>
-                <li v-if="user.spridenId">
-                    BannerID:
-                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+                <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
+                <q-card-section style="padding:0; padding-top: 0.5rem;" v-if="user.phone || user.mobile || user.postalAddress">
+                    <div v-if="user.postalAddress">{{ user.postalAddress }}</div>
+                    <div v-if="user.phone">{{ user.phone }}</div>
+                    <div v-if="user.mobile">{{ user.mobile }}</div>
+                </q-card-section>
+                <q-separator v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)"></q-separator>
+                <q-card-section v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)">
+                    <ul>
+                        <li v-if="user.spridenId">
+                            BannerID:
+                            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+                            {
+                                @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
+                            }
+                            else
+                            {
+                                @: {{ user.spridenId }}
+                            }
+                        </li>
+                        <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
+                        <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
+                        <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
+                        <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
+                        <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
+                    </ul>
+                </q-card-section>
+            <q-separator v-if="ids"></q-separator>
+            <q-card-section v-if="ids">
+                <ul>
+                    <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></li>
+                    <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></li>
+                    <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></li>
+                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
                     {
-                        @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
+                        @:
+                        <li v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></li>
                     }
-                    else
+                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
                     {
-                        @: {{ user.spridenId }}
+                        @:
+                        <li v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></li>
                     }
-                </li>
-                <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
-                <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
-                <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
-                <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
-                <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
-            </ul>
-        </q-card-section>
-        <q-separator v-if="ids"></q-separator>
-        <q-card-section v-if="ids" class="row">
-            <ul>
-                <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></li>
-                <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></li>
-                <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></li>
-                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
-                {
-                    @:
-                    <li v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></li>
-                }
-                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
-                {
-                    @:
-                    <li v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></li>
-                }
-            </ul>
+                </ul>
+            </q-card-section>
+            <q-separator v-if="debug"></q-separator>
+            <q-card-section v-if="debug">
+                <pre>
+                    {{ JSON.stringify(JSON.parse(user.originalObject), null, 2) }}
+                </pre>
+            </q-card-section>
         </q-card-section>
     </q-card>
 </div>
@@ -114,6 +120,7 @@
                     userSearch: getItemFromStorage("directory_search") ?? "",
                     ucd: getItemFromStorage("directory_ucd") ?? false,
                     ids: getItemFromStorage("directory_ids") ?? false,
+                    debug: getItemFromStorage("directory_debug") ?? false,
                     results: []
                 }
             },
@@ -146,6 +153,11 @@
                     putItemInStorage("directory_search", this.userSearch);
                     putItemInStorage("directory_ids", this.ids);
                     this.findUsers();
+                },
+                debug: function () {
+                    putItemInStorage("directory_search", this.userSearch);
+                    putItemInStorage("directory_debug", this.ids);
+                    this.findUsers();
                 }
             }
         })

From 13d72452913fc5c7495ac85d599da9f2632095dd Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:33:16 -0700
Subject: [PATCH 15/69] Testing API

---
 .../Controllers/DirectoryController.cs        |  1 -
 .../Models/IndividualSearchResult.cs          | 10 +-
 web/Areas/Directory/Services/VMACSService.cs  | 17 ++--
 web/Areas/Directory/Views/CardExample.cshtml  | 95 ++++++++++---------
 4 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 939ff70..d7b7347 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -13,7 +13,6 @@
 namespace Viper.Areas.Directory.Controllers
 {
     [Area("Directory")]
-    [Authorize(Roles = "VMDO SVM-IT", Policy = "2faAuthentication")]
     [Permission(Allow = "SVMSecure")]
     public class DirectoryController : AreaController
     {
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index fa38963..ae07c5f 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -64,6 +64,7 @@ public class IndividualSearchResult
         public DateTime? Added { get; set; } = null!;
 
         public string? Phone { get; set; } = null!;
+        public string? Nextel { get; set; } = null!;
         public string? Mobile { get; set; } = null!;
         public string? PostalAddress { get; set; } = null!;
         public string? UCDAffiliation { get; set; } = null!;
@@ -80,7 +81,7 @@ public IndividualSearchResult()
         public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserContact)
         {
             SVM = false;
-            if (aaudUser != null) { 
+            if (aaudUser != null) {
                 MothraId = aaudUser.MothraId;
                 LoginId = aaudUser.LoginId;
                 MailId = aaudUser.MailId;
@@ -120,7 +121,7 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 PostalAddress = (ldapUserContact.postaladdress ?? "").Replace("$", '\n'.ToString());
                 UCDAffiliation = ldapUserContact.ucdpersonaffiliation;
                 UCDPersonUUID = ldapUserContact.ucdpersonuuid;
-                if (string.IsNullOrEmpty(DisplayFullName)) 
+                if (string.IsNullOrEmpty(DisplayFullName))
                 {
                     DisplayFullName = ldapUserContact.displayname;
                 }
@@ -135,10 +136,11 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 var results = context.Database.SqlQuery<string>(FormattableStringFactory.Create(query)).ToList();
                 foreach (var r in results)
                 {
-                    EmailHost = r;
+                    EmailHost = r.Split("@").Last();
                 }
             }
-            VMACSService.Search(LoginId);
+            Task<string?> vmsearch = VMACSService.Search(LoginId);
+            Nextel = vmsearch.Result;
         }
     }
 }
diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index 89f686a..f1558d1 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Xml.Serialization;
+using Microsoft.CodeAnalysis.Elfie.Model.Strings;
 
 namespace Viper.Areas.Directory.Services
 {
@@ -32,6 +33,8 @@ public class VMACS_API
             public string[]? Home { get; set; }
             [XmlElement("Nextel")]
             public string[]? Nextel { get; set; }
+            [XmlElement("LDPager")]
+            public string[]? LDPager { get; set; }
             [XmlElement("Status")]
             public string[]? Status { get; set; }
             [XmlElement("Campus_LoginID")]
@@ -46,22 +49,24 @@ public VMACSService() { }
         /// </summary>
         /// <param name="loginID"></param>
         /// <returns></returns>
-        public static async void Search (String? loginID)
+        public static async Task<String?> Search (String? loginID)
         {
 			string request = $"/trust/query.xml?dbfile=3&index=CampusLoginId&find={loginID}&format=CHRIS4&AUTH=06232005".ToString();
             using HttpResponseMessage response = await sharedClient.GetAsync(request);
+            if (response.IsSuccessStatusCode == false){
+                return null;
+            }
             var s = await response.Content.ReadAsStringAsync();
             var buffer = Encoding.UTF8.GetBytes(s);
             using (var stream = new MemoryStream(buffer))
             {
                 var serializer = new XmlSerializer(typeof(VMACS_API));
                 var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
-
+                if (vmacs_api != null && vmacs_api.Nextel != null){
+                    return vmacs_api.Nextel[0];
+                }
             }
-            var jsonResponse = await response.Content.ReadAsStringAsync();
-            Console.WriteLine($"{jsonResponse}\n");
-
-
+            return null;
         }
 
 
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
index 0822877..bd19a83 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -32,58 +32,65 @@
 </q-form>
 
 <div class="row q-pa-sm q-gutter-sm" style="background-color: #fff">
-    <q-card v-for="user in results" class="col-4 col-sm-12 col-md-5 col-lg-4 col-xl-3 block { SVM : user.SVM}" style="background-color: #f8f8f8; border: 2px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
-            <q-card-section class="grid row justify-between" :style="[user.svm ? {'background-color': '#1D4776'} : {'background-color': '#aaa'}]" style="padding:0; border-right: 1px solid #fff;">
+    <q-card v-for="user in results" class="col-4 col-sm-16 col-md-4 col-lg-3 col-xl-2 block { SVM : user.SVM}" style="background-color: #f8f8f8; border: 2px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
+            <q-card-section class="grid row" :style="[user.svm ? {'background-color': '#1D4776'} : {'background-color': '#aaa'}]" style="padding:0; border-right: 1px solid #fff;">
                 <q-icon name="person" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon>
                 <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon></a>
                 <q-btn icon="assignment_ind" size="xs" dense :href="'/EmulateUser/' + user.loginId" style="margin: 0.4rem; background-color: ; color: #fff;"></q-btn>
             </q-card-section>
-            <q-card-section class="col-4 col-sm-4 col-md-4 col-lg-4 text-right q-pr-m">
-                <q-avatar size="87px" square style="min-width:87px;width:87px;max-width:87px;min-height:111px;height:111px;max-height:111px;border:1px solid #fff;" class="text-right">
-                    <img :src="'@HttpHelper.GetOldViperRootURL()/public/utilities/getbase64image.cfm?mailid=' + user.mailId + '&altphoto=1'" height="40" id="siteProfileAvatar">
-                </q-avatar>
+            <q-card-section class="row">
+                <q-card-section class="col" style="width:87px; min-width: 87px; max-width: 87px; padding: 0;margin: 0;">
+                    <q-avatar size="87px" square style="min-width:87px;width:87px;max-width:87px;min-height:111px;height:111px;max-height:111px;border:1px solid #fff;" class="text-right">
+                        <img :src="'@HttpHelper.GetOldViperRootURL()/public/utilities/getbase64image.cfm?mailid=' + user.mailId + '&altphoto=1'" height="40" id="siteProfileAvatar">
+                    </q-avatar>
+                </q-card-section>
+                <q-card-section class="col">
+                    <q-card-section class="row" style="padding:0; display: block;">
+                        <h3 style="font-weight: 600;">
+                            {{user.name}}
+                        </h3>
+                        <h4 style="font-weight: 400;" v-if="user.title">
+                            {{user.title}}
+                        </h4>
+                    </q-card-section>
+                </q-card-section>
             </q-card-section>
-            <q-card-section class="col q-pl-m">
-                <h3 style="font-weight: 400;">
-                    {{user.name}}
-                </h3>
-                <h4 style="font-weight: 400;" v-if="user.title">
-                    {{user.title}}
-                </h4>
-                <h5 style="font-weight: 400;" v-if="user.mailId">
-                    <a href="mailto:{{user.mailId}}@@ucdavis.edu">{{user.mailId}}@@ucdavis.edu</a> [{user.emailHost}]
-                </h5>
-                <h6 style="font-weight: 400;" v-if="user.userName">
+            <q-card-section class="row">
+                <h6 style="font-weight: 600;" v-if="user.userName">
                     {{user.userName}}
                 </h6>
+                <h5 style="font-weight: 400;" v-if="user.mailId">
+                    <a href="mailto:{{user.mailId}}@@ucdavis.edu">{{user.mailId}}@@ucdavis.edu</a> [{{user.emailHost}}]
+                </h5>
                 <h6 v-if="user.svm && ucd">SVM</h6>
-                <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
-                <q-card-section style="padding:0; padding-top: 0.5rem;" v-if="user.phone || user.mobile || user.postalAddress">
-                    <div v-if="user.postalAddress">{{ user.postalAddress }}</div>
-                    <div v-if="user.phone">{{ user.phone }}</div>
-                    <div v-if="user.mobile">{{ user.mobile }}</div>
-                </q-card-section>
-                <q-separator v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)"></q-separator>
-                <q-card-section v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)">
-                    <ul>
-                        <li v-if="user.spridenId">
-                            BannerID:
-                            @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
-                            {
-                                @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
-                            }
-                            else
-                            {
-                                @: {{ user.spridenId }}
-                            }
-                        </li>
-                        <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
-                        <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
-                        <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
-                        <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
-                        <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
-                    </ul>
-                </q-card-section>
+            </q-card-section>
+            <q-separator v-if="user.phone || user.mobile || user.postalAddress"></q-separator>
+            <q-card-section style="padding-top: 0.5rem;" v-if="user.phone || user.mobile || user.postalAddress">
+                <div v-if="user.postalAddress">{{ user.postalAddress }}</div>
+                <div v-if="user.phone">{{ user.phone }}</div>
+                <div v-if="user.mobile">{{ user.mobile }}</div>
+            </q-card-section>
+            <q-separator v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)"></q-separator>
+            <q-card-section v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)">
+                <ul>
+                    <li v-if="user.spridenId">
+                        BannerID:
+                        @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
+                        {
+                            @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
+                        }
+                        else
+                        {
+                            @: {{ user.spridenId }}
+                        }
+                    </li>
+                    <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
+                    <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
+                    <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
+                    <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
+                    <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
+                </ul>
+            </q-card-section>
             <q-separator v-if="ids"></q-separator>
             <q-card-section v-if="ids">
                 <ul>

From da850a462d5bcb80fd7d7670b7a2874c8e08ce08 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 17 Apr 2024 08:19:25 -0700
Subject: [PATCH 16/69] Testing

---
 web/Areas/Directory/Models/IndividualSearchResult.cs |  3 +--
 web/Areas/Directory/Services/VMACSService.cs         | 11 ++++++-----
 web/Areas/Directory/Views/CardExample.cshtml         |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index ae07c5f..1e1bf98 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -112,7 +112,6 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
 
             if (ldapUserContact != null)
             {
-                originalObject = ldapUserContact.originalObject;
                 Title = ldapUserContact.title;
                 Department = ldapUserContact.department;
                 Phone = ldapUserContact.telephonenumber;
@@ -140,7 +139,7 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 }
             }
             Task<string?> vmsearch = VMACSService.Search(LoginId);
-            Nextel = vmsearch.Result;
+            originalObject = vmsearch.Result;
         }
     }
 }
diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index f1558d1..3bebe3f 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -60,11 +60,12 @@ public VMACSService() { }
             var buffer = Encoding.UTF8.GetBytes(s);
             using (var stream = new MemoryStream(buffer))
             {
-                var serializer = new XmlSerializer(typeof(VMACS_API));
-                var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
-                if (vmacs_api != null && vmacs_api.Nextel != null){
-                    return vmacs_api.Nextel[0];
-                }
+                return stream.ToString();
+                //var serializer = new XmlSerializer(typeof(VMACS_API));
+                //var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
+                //if (vmacs_api != null && vmacs_api.Nextel != null){
+                //    return vmacs_api.Nextel[0];
+                //}
             }
             return null;
         }
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
index bd19a83..37d388a 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -112,7 +112,7 @@
             <q-separator v-if="debug"></q-separator>
             <q-card-section v-if="debug">
                 <pre>
-                    {{ JSON.stringify(JSON.parse(user.originalObject), null, 2) }}
+                    {{ user.originalObject }}
                 </pre>
             </q-card-section>
         </q-card-section>

From b9675acea730668ef06e24dd6678f052d64d2997 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 17 Apr 2024 08:42:54 -0700
Subject: [PATCH 17/69] Testing

---
 web/Areas/Directory/Models/IndividualSearchResult.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 1e1bf98..1623e6c 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -81,6 +81,7 @@ public IndividualSearchResult()
         public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserContact)
         {
             SVM = false;
+            originalObject = "";
             if (aaudUser != null) {
                 MothraId = aaudUser.MothraId;
                 LoginId = aaudUser.LoginId;
@@ -138,8 +139,8 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                     EmailHost = r.Split("@").Last();
                 }
             }
-            Task<string?> vmsearch = VMACSService.Search(LoginId);
-            originalObject = vmsearch.Result;
+            //Task<string?> vmsearch = VMACSService.Search(LoginId);
+            //originalObject = vmsearch.Result;
         }
     }
 }

From 7806f03bff18803bc3f6da08e82a9692b9075859 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 17 Apr 2024 09:00:03 -0700
Subject: [PATCH 18/69] Testing

---
 web/Areas/Directory/Models/IndividualSearchResult.cs | 8 +++++---
 web/Areas/Directory/Services/VMACSService.cs         | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 1623e6c..6d6f20c 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -110,7 +110,7 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 SVM = true;
                 Added = aaudUser.Added;
             }
-
+            /*
             if (ldapUserContact != null)
             {
                 Title = ldapUserContact.title;
@@ -130,6 +130,7 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                     Name = ldapUserContact.displayname;
                 }
             }
+
             using (var context = new Classes.SQLContext.AAUDContext())
             {
                 var query = $"SELECT * FROM OPENQUERY(UCDMothra,'SELECT (USERPART || ''@'' || HOSTPART) AS USERATHOST FROM MOTHRA.MAILIDS WHERE MOTHRAID = ''{MothraId}'' AND MAILID = ''{MailId}'' AND MAILSTATUS = ''A'' AND MAILTYPE = ''P''')".ToString();
@@ -139,8 +140,9 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                     EmailHost = r.Split("@").Last();
                 }
             }
-            //Task<string?> vmsearch = VMACSService.Search(LoginId);
-            //originalObject = vmsearch.Result;
+            Task<string?> vmsearch = VMACSService.Search(LoginId);
+            originalObject = vmsearch.Result;
+            */
         }
     }
 }
diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index 3bebe3f..fc07fd8 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -53,6 +53,7 @@ public VMACSService() { }
         {
 			string request = $"/trust/query.xml?dbfile=3&index=CampusLoginId&find={loginID}&format=CHRIS4&AUTH=06232005".ToString();
             using HttpResponseMessage response = await sharedClient.GetAsync(request);
+            return response.ToString();
             if (response.IsSuccessStatusCode == false){
                 return null;
             }

From a814bceae5052d1e8ec1c866918077e347093458 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 17 Apr 2024 09:37:43 -0700
Subject: [PATCH 19/69] Testing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 10 +++++-----
 web/Areas/Directory/Models/IndividualSearchResult.cs   |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index d7b7347..f1cb7ed 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -30,7 +30,7 @@ public DirectoryController(Classes.SQLContext.RAPSContext context)
         /// <summary>
         /// Directory home page
         /// </summary>
-        [Route("/[area]/")]
+        [Route("~/[area]/")]
         public async Task<ActionResult> Index(string? useExample)
         {
             return await Task.Run(() => !string.IsNullOrEmpty(useExample) 
@@ -41,7 +41,7 @@ public async Task<ActionResult> Index(string? useExample)
         /// <summary>
         /// Directory home page
         /// </summary>
-        [Route("/[area]/nav")]
+        [Route("~/[area]/nav")]
         public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         {
             var nav = new List<NavMenuItem>
@@ -57,7 +57,7 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         /// <param name="search">search string</param>
         /// <returns></returns>
         [SupportedOSPlatform("windows")]
-        [Route("/[area]/search/{search}")]
+        [Route("~/[area]/search/{search}")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
         {
             var individuals = await _aaud.AaudUsers
@@ -101,7 +101,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
         /// <param name="search">search string</param>
         /// <returns></returns>
         [SupportedOSPlatform("windows")]
-        [Route("/[area]/search/{search}/ucd")]
+        [Route("~/[area]/search/{search}/ucd")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(string search)
         {
             List<IndividualSearchResult> results = new();
@@ -144,7 +144,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
         /// </summary>
         /// <param name="uid">User ID</param>
         /// <returns></returns>
-        [Route("/[area]/userInfo/{mothraID}")]
+        [Route("~/[area]/userInfo/{mothraID}")]
         public async Task<IActionResult> DirectoryResult(string mothraID)
         {
             // pull in the user based on uid
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 6d6f20c..a01c0c8 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -110,7 +110,6 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 SVM = true;
                 Added = aaudUser.Added;
             }
-            /*
             if (ldapUserContact != null)
             {
                 Title = ldapUserContact.title;
@@ -142,7 +141,6 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
             }
             Task<string?> vmsearch = VMACSService.Search(LoginId);
             originalObject = vmsearch.Result;
-            */
         }
     }
 }

From def129db335f9afeb0ded7bcec32f44b4d6059a7 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Wed, 17 Apr 2024 09:47:54 -0700
Subject: [PATCH 20/69] Fixes routing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index f1cb7ed..1e0b119 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -30,7 +30,7 @@ public DirectoryController(Classes.SQLContext.RAPSContext context)
         /// <summary>
         /// Directory home page
         /// </summary>
-        [Route("~/[area]/")]
+        [Route("[area]/")]
         public async Task<ActionResult> Index(string? useExample)
         {
             return await Task.Run(() => !string.IsNullOrEmpty(useExample) 
@@ -41,7 +41,7 @@ public async Task<ActionResult> Index(string? useExample)
         /// <summary>
         /// Directory home page
         /// </summary>
-        [Route("~/[area]/nav")]
+        [Route("[area]/nav")]
         public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         {
             var nav = new List<NavMenuItem>
@@ -57,7 +57,7 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         /// <param name="search">search string</param>
         /// <returns></returns>
         [SupportedOSPlatform("windows")]
-        [Route("~/[area]/search/{search}")]
+        [Route("[area]/search/{search}")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
         {
             var individuals = await _aaud.AaudUsers
@@ -101,7 +101,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
         /// <param name="search">search string</param>
         /// <returns></returns>
         [SupportedOSPlatform("windows")]
-        [Route("~/[area]/search/{search}/ucd")]
+        [Route("[area]/search/{search}/ucd")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(string search)
         {
             List<IndividualSearchResult> results = new();
@@ -144,7 +144,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
         /// </summary>
         /// <param name="uid">User ID</param>
         /// <returns></returns>
-        [Route("~/[area]/userInfo/{mothraID}")]
+        [Route("[area]/userInfo/{mothraID}")]
         public async Task<IActionResult> DirectoryResult(string mothraID)
         {
             // pull in the user based on uid

From a0acdf6b65efa2652b71531113d67752cd08bd08 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 08:43:08 -0700
Subject: [PATCH 21/69] Testing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 10 +++++-----
 web/Areas/Directory/Views/CardExample.cshtml           |  2 +-
 web/Areas/Directory/Views/Index.cshtml                 |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 1e0b119..d7b7347 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -30,7 +30,7 @@ public DirectoryController(Classes.SQLContext.RAPSContext context)
         /// <summary>
         /// Directory home page
         /// </summary>
-        [Route("[area]/")]
+        [Route("/[area]/")]
         public async Task<ActionResult> Index(string? useExample)
         {
             return await Task.Run(() => !string.IsNullOrEmpty(useExample) 
@@ -41,7 +41,7 @@ public async Task<ActionResult> Index(string? useExample)
         /// <summary>
         /// Directory home page
         /// </summary>
-        [Route("[area]/nav")]
+        [Route("/[area]/nav")]
         public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         {
             var nav = new List<NavMenuItem>
@@ -57,7 +57,7 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         /// <param name="search">search string</param>
         /// <returns></returns>
         [SupportedOSPlatform("windows")]
-        [Route("[area]/search/{search}")]
+        [Route("/[area]/search/{search}")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
         {
             var individuals = await _aaud.AaudUsers
@@ -101,7 +101,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
         /// <param name="search">search string</param>
         /// <returns></returns>
         [SupportedOSPlatform("windows")]
-        [Route("[area]/search/{search}/ucd")]
+        [Route("/[area]/search/{search}/ucd")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(string search)
         {
             List<IndividualSearchResult> results = new();
@@ -144,7 +144,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
         /// </summary>
         /// <param name="uid">User ID</param>
         /// <returns></returns>
-        [Route("[area]/userInfo/{mothraID}")]
+        [Route("/[area]/userInfo/{mothraID}")]
         public async Task<IActionResult> DirectoryResult(string mothraID)
         {
             // pull in the user based on uid
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/CardExample.cshtml
index 37d388a..9bd503e 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/CardExample.cshtml
@@ -133,7 +133,7 @@
             },
             methods: {
                 findUsers: async function () {
-                    var urlBase = "/Directory/search/" + this.userSearch
+                    var urlBase = "@Url.Content("~/Directory/search/")" + this.userSearch;
                     if (this.ucd) {
                         urlBase += "/ucd"
                     }
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Index.cshtml
index f939a45..fa68030 100644
--- a/web/Areas/Directory/Views/Index.cshtml
+++ b/web/Areas/Directory/Views/Index.cshtml
@@ -147,8 +147,8 @@
             },
             methods: {
                 findUsers: async function () {
-                    this.users.urlBase = "/Directory/search/" + this.userSearch;
-                    if (this.ucd) this.users.urlBase = "/Directory/search/" + this.userSearch + "/ucd";
+                    this.users.urlBase = "@Url.Content("~/Directory/search/")" + this.userSearch;
+                    if (this.ucd) this.users.urlBase = "@Url.Content("~/Directory/search/")" + this.userSearch + "/ucd";
                     if (this.userSearch.length >= 2) {
                         this.users.load(this)
                     }
@@ -157,8 +157,8 @@
             mounted() {
                 this.users.loading = false;
                 if (this.userSearch.length >= 2) {
-                    this.users.urlBase = "/Directory/search/" + this.userSearch;
-                    if (this.ucd) this.users.urlBase = "/Directory/search/" + this.userSearch + "/ucd";
+                    this.users.urlBase = "@Url.Content("~/Directory/search/")" + this.userSearch;
+                    if (this.ucd) this.users.urlBase = "@Url.Content("~/Directory/search/")" + this.userSearch + "/ucd";
                     this.users.load(this);
                 }
             },

From efb6e8624a730ceef19c902fe2da860144ea2157 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 08:56:18 -0700
Subject: [PATCH 22/69] Testing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index d7b7347..7ebd647 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -9,6 +9,7 @@
 using Viper.Areas.RAPS.Models;
 using Viper.Areas.Directory.Models;
 using System.Runtime.Versioning;
+using System.Collections.Generic;
 
 namespace Viper.Areas.Directory.Controllers
 {
@@ -60,6 +61,9 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         [Route("/[area]/search/{search}")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
         {
+            List<IndividualSearchResult> results = new();
+            return results;
+            /*
             var individuals = await _aaud.AaudUsers
                      .Where(u => (u.DisplayFirstName + " " + u.DisplayLastName).Contains(search)
                          || (u.MailId != null && u.MailId.Contains(search))
@@ -93,6 +97,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                 }
             });
             return results;
+            */
         }
 
         /// <summary>

From 076765c832e10f4790f16bc46f27e8b76e440cf3 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 09:03:07 -0700
Subject: [PATCH 23/69] Testing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 7ebd647..17a40b4 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -61,9 +61,6 @@ public async Task<ActionResult<IEnumerable<NavMenuItem>>> Nav()
         [Route("/[area]/search/{search}")]
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string search)
         {
-            List<IndividualSearchResult> results = new();
-            return results;
-            /*
             var individuals = await _aaud.AaudUsers
                      .Where(u => (u.DisplayFirstName + " " + u.DisplayLastName).Contains(search)
                          || (u.MailId != null && u.MailId.Contains(search))
@@ -81,6 +78,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             List<IndividualSearchResult> results = new();
             AaudUser? currentUser = UserHelper.GetCurrentUser();
             bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
+            /*
             individuals.ForEach(m =>
             {
                 LdapUserContact? l = new LdapService().GetUserByID(m.IamId);
@@ -96,8 +94,8 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                         : new IndividualSearchResult(m, l));
                 }
             });
-            return results;
             */
+            return results;
         }
 
         /// <summary>

From 5e667bc6d0b01429212831c0de294a7cddd04178 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 09:35:57 -0700
Subject: [PATCH 24/69] Testing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 17a40b4..34fa99d 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -78,11 +78,10 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             List<IndividualSearchResult> results = new();
             AaudUser? currentUser = UserHelper.GetCurrentUser();
             bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
-            /*
             individuals.ForEach(m =>
             {
                 LdapUserContact? l = new LdapService().GetUserByID(m.IamId);
-
+                /*
                 if(false)
                 {
                     results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(currentUser, l, hasDetailPermission));
@@ -93,8 +92,8 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                         ? new IndividualSearchResultWithIDs(m, l)
                         : new IndividualSearchResult(m, l));
                 }
+                */
             });
-            */
             return results;
         }
 

From a988cd62f0502d60a0a01fa8bebb1f15aff73431 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:09:55 -0700
Subject: [PATCH 25/69] Testing

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 2 --
 web/Areas/RAPS/Services/LdapService.cs                 | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index 34fa99d..f14485f 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -81,7 +81,6 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             individuals.ForEach(m =>
             {
                 LdapUserContact? l = new LdapService().GetUserByID(m.IamId);
-                /*
                 if(false)
                 {
                     results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(currentUser, l, hasDetailPermission));
@@ -92,7 +91,6 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
                         ? new IndividualSearchResultWithIDs(m, l)
                         : new IndividualSearchResult(m, l));
                 }
-                */
             });
             return results;
         }
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 82bc7e6..346a2fc 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -224,6 +224,7 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         /// <returns>LdapUserContact</returns>
         public LdapUserContact? GetUserByID(string? id)
         {
+            return null;
             if (id == null) return null;
             string filter = string.Format("(|(ucdpersoniamid = {0}))", id);
             DirectoryEntry de = GetRootContact();

From 1cc49a9acf23cd3b5ed65756ca411485e8074955 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:25:59 -0700
Subject: [PATCH 26/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index fc07fd8..708004e 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -53,7 +53,6 @@ public VMACSService() { }
         {
 			string request = $"/trust/query.xml?dbfile=3&index=CampusLoginId&find={loginID}&format=CHRIS4&AUTH=06232005".ToString();
             using HttpResponseMessage response = await sharedClient.GetAsync(request);
-            return response.ToString();
             if (response.IsSuccessStatusCode == false){
                 return null;
             }
@@ -62,11 +61,11 @@ public VMACSService() { }
             using (var stream = new MemoryStream(buffer))
             {
                 return stream.ToString();
-                //var serializer = new XmlSerializer(typeof(VMACS_API));
-                //var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
-                //if (vmacs_api != null && vmacs_api.Nextel != null){
-                //    return vmacs_api.Nextel[0];
-                //}
+                var serializer = new XmlSerializer(typeof(VMACS_API));
+                var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
+                if (vmacs_api != null && vmacs_api.Nextel != null){
+                    return vmacs_api.Nextel[0];
+                }
             }
             return null;
         }

From 6645147a4724795596943a47f0fe146d71ce3db2 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:34:31 -0700
Subject: [PATCH 27/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index 708004e..f1558d1 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -60,7 +60,6 @@ public VMACSService() { }
             var buffer = Encoding.UTF8.GetBytes(s);
             using (var stream = new MemoryStream(buffer))
             {
-                return stream.ToString();
                 var serializer = new XmlSerializer(typeof(VMACS_API));
                 var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
                 if (vmacs_api != null && vmacs_api.Nextel != null){

From 3a034e9d327a52bdd161452e751b8f2405312c3e Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Fri, 19 Apr 2024 08:11:01 -0700
Subject: [PATCH 28/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index f1558d1..d4dea40 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -62,6 +62,7 @@ public VMACSService() { }
             {
                 var serializer = new XmlSerializer(typeof(VMACS_API));
                 var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
+                return vmacs_api.ToString();
                 if (vmacs_api != null && vmacs_api.Nextel != null){
                     return vmacs_api.Nextel[0];
                 }

From 47b1d080d517cc72e20736f725d3074184186f26 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Fri, 19 Apr 2024 08:18:26 -0700
Subject: [PATCH 29/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index d4dea40..6eb78e3 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -61,8 +61,8 @@ public VMACSService() { }
             using (var stream = new MemoryStream(buffer))
             {
                 var serializer = new XmlSerializer(typeof(VMACS_API));
+                return serializer.ToString();
                 var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
-                return vmacs_api.ToString();
                 if (vmacs_api != null && vmacs_api.Nextel != null){
                     return vmacs_api.Nextel[0];
                 }

From 161f4957e1b10f5f850896c08fb53968b5ab0935 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Fri, 19 Apr 2024 08:38:44 -0700
Subject: [PATCH 30/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index 6eb78e3..620b79f 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -61,7 +61,7 @@ public VMACSService() { }
             using (var stream = new MemoryStream(buffer))
             {
                 var serializer = new XmlSerializer(typeof(VMACS_API));
-                return serializer.ToString();
+                return stream.ToString();
                 var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
                 if (vmacs_api != null && vmacs_api.Nextel != null){
                     return vmacs_api.Nextel[0];

From 70bb604ce437331a7c782c68855acdc76cee9c19 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Fri, 19 Apr 2024 08:43:29 -0700
Subject: [PATCH 31/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index 620b79f..9d729fa 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -61,7 +61,7 @@ public VMACSService() { }
             using (var stream = new MemoryStream(buffer))
             {
                 var serializer = new XmlSerializer(typeof(VMACS_API));
-                return stream.ToString();
+                return Encoding.ASCII.GetString(stream.ToArray());
                 var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
                 if (vmacs_api != null && vmacs_api.Nextel != null){
                     return vmacs_api.Nextel[0];

From 1b5d198b91e34053287cc495d44dae7c65925267 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:20:14 -0700
Subject: [PATCH 32/69] Testing

---
 web/Areas/Directory/Services/VMACSService.cs | 56 +++++++++++++++++---
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index 9d729fa..d6de6aa 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -17,13 +17,34 @@ public class VMACSService
             BaseAddress = new Uri("https://vmacs-vmth.vetmed.ucdavis.edu"),
         };
         /*
+        <?xml version =\"1.0\" ?>
+            <!-- generated by M2Web 19Apr24 8:46am. VMTH, UCD VMTH,  -->
+            <query>
+                <dbfile>3</dbfile>
+                <dbfileNm>VMTH PERSON</dbfileNm>
+                <uri>/trust/query.xml?dbfile=3&amp;index=CampusLoginId&amp;find=bedwards&amp;format=CHRIS4&amp;AUTH=06232005</uri>
+                <item dbfile='3'>
+                    <Name>Brandon Edwards</Name>
+                    <UserID>10172</UserID>
+                    <Unit>Computer Services</Unit>
+                    <LastEdit>13Oct23</LastEdit>
+                    <Home>916-893-1205</Home>
+                    <Nextel>916-893-1205</Nextel>
+                    <Status>Staff</Status>
+                    <Campus_LoginID>bedwards</Campus_LoginID>
+                    <Email_Forward>bsedwards@ucdavis.edu</Email_Forward>
+                </item>
+            </query>
 
          * 
          */
-        [XmlRoot("query/item")]
-        public class VMACS_API
+        [XmlRoot("item")]
+        public class VMACS_item
         {
-            [XmlElement("name")]
+            [XmlAttribute("dbfile")]
+            public int dbfile { get; set; }
+
+            [XmlElement("Name")]
             public string[]? Name { get; set; }
             [XmlElement("UserID")]
             public string[]? VMACSID { get; set; }
@@ -41,6 +62,24 @@ public class VMACS_API
             public string[]? Campus_LoginID { get; set; }
             [XmlElement("Email_Forward")]
             public string[]? Email_Forward { get; set; }
+            [XmlElement("LastEdit")]
+            public string[]? LastEdit { get; set; }
+        }
+
+        [XmlRoot("query")]
+        public class VMACS_query
+        {
+            [XmlElement("item")]
+            public VMACS_item item { get; set; }
+
+            [XmlElement("dbfile")]
+            public string[]? dbfile { get; set; }
+
+            [XmlElement("dbfileNm")]
+            public string[]? dbfileNm { get; set; }
+
+            [XmlElement("uri")]
+            public string[]? uri { get; set; }
         }
 
         public VMACSService() { }
@@ -60,11 +99,12 @@ public VMACSService() { }
             var buffer = Encoding.UTF8.GetBytes(s);
             using (var stream = new MemoryStream(buffer))
             {
-                var serializer = new XmlSerializer(typeof(VMACS_API));
-                return Encoding.ASCII.GetString(stream.ToArray());
-                var vmacs_api = (VMACS_API?)serializer.Deserialize(stream);
-                if (vmacs_api != null && vmacs_api.Nextel != null){
-                    return vmacs_api.Nextel[0];
+                var serializer = new XmlSerializer(typeof(VMACS_query));
+                //return Encoding.ASCII.GetString(stream.ToArray());
+                var vmacs_api = (VMACS_query?)serializer.Deserialize(stream);
+                if (vmacs_api != null && vmacs_api.item != null && vmacs_api.item.Nextel != null)
+                {
+                    return vmacs_api.item.Nextel[0];
                 }
             }
             return null;

From 3d25beaed117f29576c6c6ffb5bff9e9a88e9b00 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 10:31:20 -0700
Subject: [PATCH 33/69] try/catch around ldap group retrieval

---
 web/Areas/RAPS/Services/LdapService.cs    |  2 +-
 web/Areas/RAPS/Services/OuGroupService.cs | 14 +++++++++++++-
 web/Classes/ApiExceptionFilter.cs         |  4 ++++
 web/Views/Shared/_VIPERLayout.cshtml      |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 2f2bf09..ade66e5 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -68,7 +68,7 @@ public List<LdapGroup> GetGroups(string? name = null)
                 filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
             };
             SearchResultCollection results = new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
-                { PageSize = 1000 }
+                { PageSize = 1000, ReferralChasing = ReferralChasingOption.All }
                 .FindAll();
             List<LdapGroup> groups = new();
             foreach(SearchResult result in results)
diff --git a/web/Areas/RAPS/Services/OuGroupService.cs b/web/Areas/RAPS/Services/OuGroupService.cs
index 5ebf40e..50716fc 100644
--- a/web/Areas/RAPS/Services/OuGroupService.cs
+++ b/web/Areas/RAPS/Services/OuGroupService.cs
@@ -1,6 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
+using NLog;
 using NuGet.Protocol.Plugins;
+using Polly;
 using System.Linq.Dynamic.Core;
 using System.Runtime.Versioning;
 using Viper.Areas.RAPS.Models;
@@ -44,7 +46,17 @@ public async Task<List<Group>> GetAllGroups(string? search)
                 .ThenInclude(gr => gr.Role)
                 .ThenInclude(r => r.TblRoleMembers)
                 .ToListAsync();
-            List<LdapGroup> ldapGroups = _ldapService.GetGroups();
+            List<LdapGroup> ldapGroups = new();
+            try
+            {
+                _ldapService.GetGroups();
+            }
+            catch (Exception ex)
+            {
+                Logger logger = LogManager.GetCurrentClassLogger();
+                logger.Error(ex);
+            }
+
             List<ManagedGroup> managedGroups = await _uInformService.GetManagedGroups();
 
             List<Group> groups = new();
diff --git a/web/Classes/ApiExceptionFilter.cs b/web/Classes/ApiExceptionFilter.cs
index 39ba251..f75e926 100644
--- a/web/Classes/ApiExceptionFilter.cs
+++ b/web/Classes/ApiExceptionFilter.cs
@@ -1,6 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using NLog;
 using System.Net;
+using System.Transactions;
 
 namespace Viper.Classes
 {
@@ -16,6 +18,8 @@ public override void OnException(ExceptionContext context)
                 }
             );
             context.HttpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+            Logger logger = LogManager.GetCurrentClassLogger();
+            logger.Error(context.Exception);
         }
 
         private List<string> GetErrorList(ExceptionContext context)
diff --git a/web/Views/Shared/_VIPERLayout.cshtml b/web/Views/Shared/_VIPERLayout.cshtml
index ad9bc98..1291018 100644
--- a/web/Views/Shared/_VIPERLayout.cshtml
+++ b/web/Views/Shared/_VIPERLayout.cshtml
@@ -203,7 +203,7 @@
               auto-close="true">
         <q-banner>
             <template v-slot:avatar>
-                <q-icon name="error" color="red" />
+                <q-icon name="error" color="red"></q-icon>
             </template>
             {{viperErrorMessage}}
         </q-banner>

From 0e1a8634f85d326d7d85bd889975771c7115b572 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 10:56:53 -0700
Subject: [PATCH 34/69] Adding debugging

---
 web/Areas/RAPS/Services/LdapService.cs | 29 +++++++++++++++++++-------
 web/nlog.config                        | 13 +++++++++++-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index ade66e5..0de80cf 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -2,6 +2,7 @@
 using System.Runtime.Versioning;
 using System.DirectoryServices.AccountManagement;
 using Viper.Areas.RAPS.Models;
+using NLog;
 
 namespace Viper.Areas.RAPS.Services
 {
@@ -10,6 +11,8 @@ public class LdapService
     {
         private const string _username = "ou\\svc-accounts";
 
+        private Logger _logger;
+
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
         private const string _ouStart = "OU=SVM,OU=Departments,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
@@ -53,7 +56,9 @@ public class LdapService
             "memberOf"
         };
         
-        public LdapService() { }
+        public LdapService() {
+            _logger = LogManager.GetCurrentClassLogger();
+        }
         
         /// <summary>
         /// Get groups, optionally filtering with a wildcard match to name
@@ -67,15 +72,24 @@ public List<LdapGroup> GetGroups(string? name = null)
             {
                 filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
             };
-            SearchResultCollection results = new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
-                { PageSize = 1000, ReferralChasing = ReferralChasingOption.All }
-                .FindAll();
+            _logger.Info("LdapService.GetGroups(" + (name ?? "") + ")");
+
             List<LdapGroup> groups = new();
-            foreach(SearchResult result in results)
+            try
+            {
+                SearchResultCollection results = new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
+                { PageSize = 1000, ReferralChasing = ReferralChasingOption.All }
+                    .FindAll();
+                foreach (SearchResult result in results)
+                {
+                    groups.Add(new LdapGroup(result));
+                }
+                groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
+            }
+            catch (Exception ex)
             {
-                groups.Add(new LdapGroup(result));
+                _logger.Error(ex);
             }
-            groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
             return groups;
         }
 
@@ -243,6 +257,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
         {
             string start = fromOu ? _ouStart : _ad3Users;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            _logger.Info("Root LDAP is " + string.Format("LDAP://{0}", start));
             return new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
         }
 
diff --git a/web/nlog.config b/web/nlog.config
index 8c7d23d..d6e4665 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -21,6 +21,10 @@
     <target xsi:type="File" name="warningErrorFile" fileName="${logDirectory}\viperlog-${shortdate}.log"
 						header="Date Time|Env|App|Level|Username|Request IP|Request Method|URL|QueryString|UserAgent|traceidentifier ¦ logger|Message ¦ exception"
 						layout="${longdate}|${currentEnviroment}|${appName}|${uppercase:${level}}|${aspnet-User-Identity}|${aspnet-Request-IP}|${aspnet-Request-Method}|${aspnet-Request-Url}|${aspnet-Request-QueryString}|${aspnet-Request-UserAgent}|${aspnet-traceidentifier}${newline}${logger}|${message}${newline}${exception:format=tostring,Data:maxInnerExceptionLevel=10}" />
+
+    <target xsi:type="File" name="debugFile" fileName="${logDirectory}\viperlog-debug-${shortdate}.log"
+						 header="Date Time|Env|App|Level|Username|Request IP|Request Method|URL|QueryString|UserAgent|traceidentifier ¦ logger|Message ¦ exception"
+						 layout="${longdate}|${currentEnviroment}|${appName}|${uppercase:${level}}|${aspnet-User-Identity}|${aspnet-Request-IP}|${aspnet-Request-Method}|${aspnet-Request-Url}|${aspnet-Request-QueryString}|${aspnet-Request-UserAgent}|${aspnet-traceidentifier}${newline}${logger}|${message}${newline}${exception:format=tostring,Data:maxInnerExceptionLevel=10}" />
     
     <target xsi:type="ColoredConsole" name="warningErrorConsole" layout="${MicrosoftConsoleLayout}" >
       <highlight-row condition="level == LogLevel.Debug" foregroundColor="DarkGray" />
@@ -81,12 +85,19 @@
   <rules>
     <logger name="SmtpEmailLogger" minlevel="Info" writeTo="smtpSentLog" final="true" />    
     
-    <!--Log to file only in Prod and Test-->
+    <!--Log to warning and error file only in Prod and Test-->
     <logger name="*" minlevel="${configsetting:item=Logging.LogLevel.Default}" writeTo="warningErrorFile">
       <filters defaultAction='Log'>
         <when condition="contains('${currentEnviroment}','Development')" action="Ignore" />
       </filters>
     </logger>
+
+	<!--Log to debug file in dev and test-->
+	<logger name="*" minlevel="Debug" maxlevel="Info" writeTo="debugFile">
+		<filters defaultAction='Log'>
+			<when condition="contains('${currentEnviroment}','Production')" action="Ignore" />
+		</filters>
+	</logger>
     
     <!--Log to console for debugging locally-->
     <logger name="*" minlevel="${configsetting:item=Logging.LogLevel.Default}" writeTo="warningErrorConsole">      

From 00053bc384a8f0eee6ba4cc9c14b73e1dda4e3aa Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 11:27:50 -0700
Subject: [PATCH 35/69] Logging specific exception

---
 web/Areas/RAPS/Services/LdapService.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 0de80cf..de29014 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -75,17 +75,24 @@ public List<LdapGroup> GetGroups(string? name = null)
             _logger.Info("LdapService.GetGroups(" + (name ?? "") + ")");
 
             List<LdapGroup> groups = new();
+            var de = GetRoot(true);
+            _logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
+            var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
+            { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
             try
             {
-                SearchResultCollection results = new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
-                { PageSize = 1000, ReferralChasing = ReferralChasingOption.All }
-                    .FindAll();
+                SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
                 {
                     groups.Add(new LdapGroup(result));
                 }
                 groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
             }
+            catch (DirectoryServicesCOMException cex)
+            {
+                _logger.Error(cex);
+                _logger.Error(cex.ExtendedError);
+            }
             catch (Exception ex)
             {
                 _logger.Error(ex);

From c36a40c6c816a10e8db453803092390cde94bfa1 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 11:36:15 -0700
Subject: [PATCH 36/69] Moving into try

---
 web/Areas/RAPS/Services/LdapService.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index de29014..714aed8 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -75,12 +75,13 @@ public List<LdapGroup> GetGroups(string? name = null)
             _logger.Info("LdapService.GetGroups(" + (name ?? "") + ")");
 
             List<LdapGroup> groups = new();
-            var de = GetRoot(true);
-            _logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
-            var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-            { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
             try
             {
+                var de = GetRoot(true);
+                _logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
+                var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
+                { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
+
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
                 {

From a5e33be706feb8f5ee09b2452fbba115e1ef4f61 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 12:55:44 -0700
Subject: [PATCH 37/69] Adding message

---
 web/Areas/RAPS/Services/LdapService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 714aed8..402e564 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -80,7 +80,7 @@ public List<LdapGroup> GetGroups(string? name = null)
                 var de = GetRoot(true);
                 _logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
+                    { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
 
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
@@ -92,7 +92,7 @@ public List<LdapGroup> GetGroups(string? name = null)
             catch (DirectoryServicesCOMException cex)
             {
                 _logger.Error(cex);
-                _logger.Error(cex.ExtendedError);
+                _logger.Error("Extended Error: " + cex?.ExtendedErrorMessage);
             }
             catch (Exception ex)
             {

From d7be9441edd1deda06702e4bfa58c6954a0b2a84 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 13:10:43 -0700
Subject: [PATCH 38/69] Adding server to ldap connection

---
 web/Areas/RAPS/Services/LdapService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 402e564..85223f6 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -16,6 +16,8 @@ public class LdapService
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
         private const string _ouStart = "OU=SVM,OU=Departments,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _ouServer = "ou.ad3.ucdavis.edu";
+        private const string _ad3Server = "ad3.ucdavis.edu";
 
         //ldap attributes/properties to return for each object type
         private readonly string[] _groupProperties =
@@ -264,8 +266,9 @@ private static List<LdapUser> SortUsers(List<LdapUser> users)
         private DirectoryEntry GetRoot(bool fromOu = false)
         {
             string start = fromOu ? _ouStart : _ad3Users;
+            string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            _logger.Info("Root LDAP is " + string.Format("LDAP://{0}", start));
+            _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
             return new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
         }
 

From ffd4fe368672e16d227886fc02302a23f746256e Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 13:30:27 -0700
Subject: [PATCH 39/69] capitalizing departments

---
 web/Areas/RAPS/Services/LdapService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 85223f6..b5983dd 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -14,7 +14,7 @@ public class LdapService
         private Logger _logger;
 
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
-        private const string _ouStart = "OU=SVM,OU=Departments,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _ouStart = "OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ouServer = "ou.ad3.ucdavis.edu";
         private const string _ad3Server = "ad3.ucdavis.edu";

From 1a412b059345ddd7b77927c241d2f7913ac64358 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 14:01:52 -0700
Subject: [PATCH 40/69] using server, then server and start

---
 web/Areas/RAPS/Services/LdapService.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index b5983dd..7d85f3e 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -269,7 +269,11 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
-            return new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
+            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
+            {
+                Path = string.Format("LDAP://{0}/{1}", server, start)
+            };
+            return de;
         }
 
     }

From 82ab7f6448a62aaa2967fd5d1996b17448efd7f2 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 14:09:31 -0700
Subject: [PATCH 41/69] Changing username and logging

---
 web/Areas/RAPS/Services/LdapService.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 7d85f3e..537dde3 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -9,7 +9,7 @@ namespace Viper.Areas.RAPS.Services
     [SupportedOSPlatform("windows")]
     public class LdapService
     {
-        private const string _username = "ou\\svc-accounts";
+        private const string _username = "CN=svc-accounts,OU=Service Accounts,OU=SVM-OU-LocalUsers,OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
 
         private Logger _logger;
 
@@ -268,7 +268,9 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            _logger.Info("Server is " + server);
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
+            _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no");
             DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
             {
                 Path = string.Format("LDAP://{0}/{1}", server, start)

From d520b0a2796ad6cb76e216f56577c4577bc0d153 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 14:13:08 -0700
Subject: [PATCH 42/69] Paren

---
 web/Areas/RAPS/Services/LdapService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 537dde3..fa9c3a5 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -270,7 +270,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
             _logger.Info("Server is " + server);
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
-            _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no");
+            _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
             DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
             {
                 Path = string.Format("LDAP://{0}/{1}", server, start)

From 260bb7d959911feaeeb286e26eb5812d106bea7d Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 14:29:54 -0700
Subject: [PATCH 43/69] Updating connection params

---
 web/Areas/RAPS/Services/LdapService.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index fa9c3a5..9398be4 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -9,7 +9,7 @@ namespace Viper.Areas.RAPS.Services
     [SupportedOSPlatform("windows")]
     public class LdapService
     {
-        private const string _username = "CN=svc-accounts,OU=Service Accounts,OU=SVM-OU-LocalUsers,OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _username = "ou\\svc-accounts";
 
         private Logger _logger;
 
@@ -271,9 +271,10 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             _logger.Info("Server is " + server);
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
             _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
-            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
+            DirectoryEntry de = new DirectoryEntry(_ad3Server, _username, creds, AuthenticationTypes.Secure)
             {
-                Path = string.Format("LDAP://{0}/{1}", server, start)
+                //Path = string.Format("LDAP://{0}/{1}", server, start)
+                Path = string.Format("LDAP://{0}", start)
             };
             return de;
         }

From 86070c2fb52353a4fba0730f1e64417baa4dab1b Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 14:38:38 -0700
Subject: [PATCH 44/69] hardcoding a dc

---
 web/Areas/RAPS/Services/LdapService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 9398be4..20c6854 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -271,7 +271,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             _logger.Info("Server is " + server);
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
             _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
-            DirectoryEntry de = new DirectoryEntry(_ad3Server, _username, creds, AuthenticationTypes.Secure)
+            DirectoryEntry de = new DirectoryEntry("addc12c.ad3.ucdavis.edu", _username, creds, AuthenticationTypes.Secure)
             {
                 //Path = string.Format("LDAP://{0}/{1}", server, start)
                 Path = string.Format("LDAP://{0}", start)

From 91c8a19adcfbb24e9f65a75e1edddaddb096d3f1 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 14:51:57 -0700
Subject: [PATCH 45/69] Enabling referrer chsing in the DE

---
 web/Areas/RAPS/Services/LdapService.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 20c6854..41aeb61 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -271,10 +271,14 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             _logger.Info("Server is " + server);
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
             _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
-            DirectoryEntry de = new DirectoryEntry("addc12c.ad3.ucdavis.edu", _username, creds, AuthenticationTypes.Secure)
+            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
             {
                 //Path = string.Format("LDAP://{0}/{1}", server, start)
-                Path = string.Format("LDAP://{0}", start)
+                Path = string.Format("LDAP://{0}", start),
+                Options =
+                {
+                    Referral = ReferralChasingOption.All
+                }
             };
             return de;
         }

From 6b936ae7f0347e0927de7e76d4db4064a1216013 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 15:02:33 -0700
Subject: [PATCH 46/69] Updating path again

---
 web/Areas/RAPS/Services/LdapService.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 41aeb61..4637500 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -80,9 +80,9 @@ public List<LdapGroup> GetGroups(string? name = null)
             try
             {
                 var de = GetRoot(true);
-                _logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
+                //_logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                    { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
+                    { ReferralChasing = ReferralChasingOption.All };
 
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
@@ -273,8 +273,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
             DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
             {
-                //Path = string.Format("LDAP://{0}/{1}", server, start)
-                Path = string.Format("LDAP://{0}", start),
+                Path = string.Format("LDAP://{0}/{1}", server, start),
                 Options =
                 {
                     Referral = ReferralChasingOption.All

From a55e460f49b760e14495b0b9ab2ca19999116fda Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 15:11:39 -0700
Subject: [PATCH 47/69] Updating server connection

---
 web/Areas/RAPS/Services/LdapService.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 4637500..c622d0f 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -80,9 +80,8 @@ public List<LdapGroup> GetGroups(string? name = null)
             try
             {
                 var de = GetRoot(true);
-                //_logger.Info("LDAP DE Server: " + de?.Options?.GetCurrentServerName());
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                    { ReferralChasing = ReferralChasingOption.All };
+                    { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
 
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
@@ -271,13 +270,9 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             _logger.Info("Server is " + server);
             _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
             _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
-            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
+            DirectoryEntry de = new DirectoryEntry(string.Format("LDAP://{0}/{1}", server, start), _username, creds, AuthenticationTypes.Secure)
             {
-                Path = string.Format("LDAP://{0}/{1}", server, start),
-                Options =
-                {
-                    Referral = ReferralChasingOption.All
-                }
+                Path = string.Format("LDAP://{0}/{1}", server, start)
             };
             return de;
         }

From a77d3da987c66593beddf6ce4b30cc6e6991b8ef Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 15:20:38 -0700
Subject: [PATCH 48/69] Changing location or referral chasing option

---
 web/Areas/RAPS/Services/LdapService.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index c622d0f..a9c5516 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -74,12 +74,15 @@ public List<LdapGroup> GetGroups(string? name = null)
             {
                 filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
             };
-            _logger.Info("LdapService.GetGroups(" + (name ?? "") + ")");
 
             List<LdapGroup> groups = new();
             try
             {
                 var de = GetRoot(true);
+                if(de.Options != null)
+                {
+                    de.Options.Referral = ReferralChasingOption.All;
+                }                
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
                     { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
 
@@ -265,15 +268,9 @@ private static List<LdapUser> SortUsers(List<LdapUser> users)
         private DirectoryEntry GetRoot(bool fromOu = false)
         {
             string start = fromOu ? _ouStart : _ad3Users;
-            string server = fromOu ? _ouServer : _ad3Server;
+            //string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            _logger.Info("Server is " + server);
-            _logger.Info("Root LDAP is " + string.Format("LDAP://{0}/{1}", server, start));
-            _logger.Info("Username: " + _username + " c: " + (creds.Length > 0 ? "yes" : "no"));
-            DirectoryEntry de = new DirectoryEntry(string.Format("LDAP://{0}/{1}", server, start), _username, creds, AuthenticationTypes.Secure)
-            {
-                Path = string.Format("LDAP://{0}/{1}", server, start)
-            };
+            DirectoryEntry de = new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
             return de;
         }
 

From bb7be02358a7fc5b6971e8bec114795375b1fa9f Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 16:01:11 -0700
Subject: [PATCH 49/69] Adding logging

---
 web/Areas/RAPS/Services/LdapService.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index a9c5516..80d0359 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -79,12 +79,13 @@ public List<LdapGroup> GetGroups(string? name = null)
             try
             {
                 var de = GetRoot(true);
-                if(de.Options != null)
+                if (de.Options != null)
                 {
+                    _logger.Info("Setting DE Referral");
                     de.Options.Referral = ReferralChasingOption.All;
-                }                
+                }
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                    { PageSize = 1000, ReferralChasing = ReferralChasingOption.All };
+                    { ReferralChasing = ReferralChasingOption.All };
 
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)

From eccb2ed40fe23e8369e721f83c55b282740f6fbb Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 16:07:41 -0700
Subject: [PATCH 50/69] Using SSL

---
 web/Areas/RAPS/Services/LdapService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 80d0359..4334549 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -271,7 +271,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             //string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.Secure);
+            DirectoryEntry de = new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.SecureSocketsLayer);
             return de;
         }
 

From 9ca16358c7ee3bdd6212348af41b1f74646dc545 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 22 Apr 2024 16:22:01 -0700
Subject: [PATCH 51/69] hardcoding ou dc

---
 web/Areas/RAPS/Services/LdapService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 4334549..e7a4545 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -271,7 +271,10 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             //string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry(string.Format("LDAP://{0}", start), _username, creds, AuthenticationTypes.SecureSocketsLayer);
+            DirectoryEntry de = new DirectoryEntry("oudc12c.ou.ad3.ucdavis.edu", _username, creds, AuthenticationTypes.Secure)
+            {
+                Path = string.Format("LDAP://{0}", start)
+            };
             return de;
         }
 

From cd7b88d31ce885283be0a498958b575aaac31ec4 Mon Sep 17 00:00:00 2001
From: Jason Francis <134454748+JasonRobertFrancis@users.noreply.github.com>
Date: Tue, 23 Apr 2024 08:20:12 -0700
Subject: [PATCH 52/69] Adds VMACS API lookup

---
 .../Controllers/DirectoryController.cs        | 35 ++++-----
 .../Models/IndividualSearchResult.cs          | 33 +--------
 web/Areas/Directory/Models/VMACSItem.cs       | 51 +++++++++++++
 web/Areas/Directory/Services/VMACSService.cs  | 74 ++-----------------
 .../Views/{CardExample.cshtml => Card.cshtml} | 71 +++++++++---------
 .../Views/{Index.cshtml => Table.cshtml}      |  0
 web/Areas/RAPS/Services/LdapService.cs        |  1 -
 7 files changed, 108 insertions(+), 157 deletions(-)
 create mode 100644 web/Areas/Directory/Models/VMACSItem.cs
 rename web/Areas/Directory/Views/{CardExample.cshtml => Card.cshtml} (70%)
 rename web/Areas/Directory/Views/{Index.cshtml => Table.cshtml} (100%)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index f14485f..c151081 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -10,6 +10,7 @@
 using Viper.Areas.Directory.Models;
 using System.Runtime.Versioning;
 using System.Collections.Generic;
+using Viper.Areas.Directory.Services;
 
 namespace Viper.Areas.Directory.Controllers
 {
@@ -34,9 +35,7 @@ public DirectoryController(Classes.SQLContext.RAPSContext context)
         [Route("/[area]/")]
         public async Task<ActionResult> Index(string? useExample)
         {
-            return await Task.Run(() => !string.IsNullOrEmpty(useExample) 
-                ? View("~/Areas/Directory/Views/CardExample.cshtml") 
-                : View("~/Areas/Directory/Views/Index.cshtml"));
+            return await Task.Run(() => View("~/Areas/Directory/Views/Card.cshtml"));
         }
 
         /// <summary>
@@ -81,15 +80,16 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
             individuals.ForEach(m =>
             {
                 LdapUserContact? l = new LdapService().GetUserByID(m.IamId);
-                if(false)
-                {
-                    results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(currentUser, l, hasDetailPermission));
-                }
-                else
+                results.Add(hasDetailPermission
+                    ? new IndividualSearchResultWithIDs(m, l)
+                    : new IndividualSearchResult(m, l));
+
+                var vmsearch = VMACSService.Search(results.Last().LoginId);
+                var vm = vmsearch.Result;
+                if (vm != null && vm.item != null && vm.item.Nextel != null && vm.item.LDPager != null)
                 {
-                    results.Add(hasDetailPermission
-                        ? new IndividualSearchResultWithIDs(m, l)
-                        : new IndividualSearchResult(m, l));
+                    results.Last().Nextel = vm.item.Nextel[0];
+                    results.Last().LDPager = vm.item.LDPager[0];
                 }
             });
             return results;
@@ -125,16 +125,9 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
             foreach (var l in ldap)
             {
                 AaudUser? userInfo = individuals.Find(m => m.IamId == l.ucdpersoniamid);
-                if (false)
-                {
-                    results.Add(IndividualSearchResultCreator.CreateIndividualSearchResult(userInfo, l, hasDetailPermission));
-                }
-                else
-                {
-                    results.Add(hasDetailPermission
-                        ? new IndividualSearchResultWithIDs(userInfo, l)
-                        : new IndividualSearchResult(userInfo, l));
-                }
+                results.Add(hasDetailPermission
+                    ? new IndividualSearchResultWithIDs(userInfo, l)
+                    : new IndividualSearchResult(userInfo, l));
             };
             return results;
         }
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index a01c0c8..694e5d2 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -10,61 +10,38 @@ namespace Viper.Areas.Directory.Models
     public class IndividualSearchResult
     {
         public string ClientId { get; set; } = string.Empty;
-
         public string MothraId { get; set; } = string.Empty;
         public string UCDPersonUUID { get; set; } = string.Empty;
-
         public string? LoginId { get; set; } = string.Empty;
-
         public string? MailId { get; set; } = string.Empty;
         public string? EmailHost { get; set; } = string.Empty;
-
         public string LastName { get; set; } = string.Empty;
-
         public string FirstName { get; set; } = string.Empty;
-
         public string? MiddleName { get; set; } = string.Empty;
-
         public string DisplayLastName { get; set; } = string.Empty;
-
         public string DisplayFirstName { get; set; } = string.Empty;
-
         public string? DisplayMiddleName { get; set; } = string.Empty;
-
         public string DisplayFullName { get; set; } = string.Empty;
         public string Name { get; set; } = string.Empty;
         public bool CurrentStudent { get; set; } = false;
-
         public bool FutureStudent { get; set; } = false;
-
         public bool CurrentEmployee { get; set; } = false;
-
         public bool FutureEmployee { get; set; } = false;
-
         public int? StudentTerm { get; set; } = null!;
-
         public int? EmployeeTerm { get; set; } = null!;
-
         public string? PpsId { get; set; } = string.Empty;
-
         public string? StudentPKey { get; set; } = string.Empty;
-
         public string? EmployeePKey { get; set; } = string.Empty;
         public string? Title { get; set; } = string.Empty;
         public string? Department { get; set; } = string.Empty;
-
         public int Current { get; set; } = -1;
-
         public int Future { get; set; } = -1;
-
         public string? IamId { get; set; } = string.Empty;
-
         public bool? Ross { get; set; } = null!;
-
         public DateTime? Added { get; set; } = null!;
-
         public string? Phone { get; set; } = null!;
         public string? Nextel { get; set; } = null!;
+        public string? LDPager { get; set; } = null!;
         public string? Mobile { get; set; } = null!;
         public string? PostalAddress { get; set; } = null!;
         public string? UCDAffiliation { get; set; } = null!;
@@ -72,10 +49,7 @@ public class IndividualSearchResult
         public bool? SVM { get; set; } = null!;
         public string? originalObject { get; set; } = null!;
 
-        public IndividualSearchResult()
-        {
-
-        }
+        public IndividualSearchResult() { }
 
         [SupportedOSPlatform("windows")]
         public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserContact)
@@ -109,6 +83,7 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                 Ross = aaudUser.Ross;
                 SVM = true;
                 Added = aaudUser.Added;
+                UserName = aaudUser.LoginId;
             }
             if (ldapUserContact != null)
             {
@@ -139,8 +114,6 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
                     EmailHost = r.Split("@").Last();
                 }
             }
-            Task<string?> vmsearch = VMACSService.Search(LoginId);
-            originalObject = vmsearch.Result;
         }
     }
 }
diff --git a/web/Areas/Directory/Models/VMACSItem.cs b/web/Areas/Directory/Models/VMACSItem.cs
new file mode 100644
index 0000000..30f5649
--- /dev/null
+++ b/web/Areas/Directory/Models/VMACSItem.cs
@@ -0,0 +1,51 @@
+using System.Text;
+using System.Xml.Serialization;
+using Viper.Areas.RAPS.Models;
+using Viper.Models.AAUD;
+
+namespace Viper.Areas.Directory.Models
+{
+    [XmlRoot("item")]
+    public class VMACSItem
+    {
+        [XmlAttribute("dbfile")]
+        public int dbfile { get; set; }
+
+        [XmlElement("Name")]
+        public string[]? Name { get; set; }
+        [XmlElement("UserID")]
+        public string[]? VMACSID { get; set; }
+        [XmlElement("Unit")]
+        public string[]? Unit { get; set; }
+        [XmlElement("Home")]
+        public string[]? Home { get; set; }
+        [XmlElement("Nextel")]
+        public string[]? Nextel { get; set; }
+        [XmlElement("LDPager")]
+        public string[]? LDPager { get; set; }
+        [XmlElement("Status")]
+        public string[]? Status { get; set; }
+        [XmlElement("Campus_LoginID")]
+        public string[]? Campus_LoginID { get; set; }
+        [XmlElement("Email_Forward")]
+        public string[]? Email_Forward { get; set; }
+        [XmlElement("LastEdit")]
+        public string[]? LastEdit { get; set; }
+    }
+
+    [XmlRoot("query")]
+    public class VMACSQuery
+    {
+        [XmlElement("item")]
+        public VMACSItem? item { get; set; }
+
+        [XmlElement("dbfile")]
+        public string[]? dbfile { get; set; }
+
+        [XmlElement("dbfileNm")]
+        public string[]? dbfileNm { get; set; }
+
+        [XmlElement("uri")]
+        public string[]? uri { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/web/Areas/Directory/Services/VMACSService.cs b/web/Areas/Directory/Services/VMACSService.cs
index d6de6aa..9cd2a8f 100644
--- a/web/Areas/Directory/Services/VMACSService.cs
+++ b/web/Areas/Directory/Services/VMACSService.cs
@@ -2,6 +2,7 @@
 using System.DirectoryServices.AccountManagement;
 using System.DirectoryServices;
 using Viper.Areas.RAPS.Models;
+using Viper.Areas.Directory.Models;
 using System.Net.Http;
 using System.Text;
 using System.Xml.Serialization;
@@ -16,71 +17,6 @@ public class VMACSService
         {
             BaseAddress = new Uri("https://vmacs-vmth.vetmed.ucdavis.edu"),
         };
-        /*
-        <?xml version =\"1.0\" ?>
-            <!-- generated by M2Web 19Apr24 8:46am. VMTH, UCD VMTH,  -->
-            <query>
-                <dbfile>3</dbfile>
-                <dbfileNm>VMTH PERSON</dbfileNm>
-                <uri>/trust/query.xml?dbfile=3&amp;index=CampusLoginId&amp;find=bedwards&amp;format=CHRIS4&amp;AUTH=06232005</uri>
-                <item dbfile='3'>
-                    <Name>Brandon Edwards</Name>
-                    <UserID>10172</UserID>
-                    <Unit>Computer Services</Unit>
-                    <LastEdit>13Oct23</LastEdit>
-                    <Home>916-893-1205</Home>
-                    <Nextel>916-893-1205</Nextel>
-                    <Status>Staff</Status>
-                    <Campus_LoginID>bedwards</Campus_LoginID>
-                    <Email_Forward>bsedwards@ucdavis.edu</Email_Forward>
-                </item>
-            </query>
-
-         * 
-         */
-        [XmlRoot("item")]
-        public class VMACS_item
-        {
-            [XmlAttribute("dbfile")]
-            public int dbfile { get; set; }
-
-            [XmlElement("Name")]
-            public string[]? Name { get; set; }
-            [XmlElement("UserID")]
-            public string[]? VMACSID { get; set; }
-            [XmlElement("Unit")]
-            public string[]? Unit { get; set; }
-            [XmlElement("Home")]
-            public string[]? Home { get; set; }
-            [XmlElement("Nextel")]
-            public string[]? Nextel { get; set; }
-            [XmlElement("LDPager")]
-            public string[]? LDPager { get; set; }
-            [XmlElement("Status")]
-            public string[]? Status { get; set; }
-            [XmlElement("Campus_LoginID")]
-            public string[]? Campus_LoginID { get; set; }
-            [XmlElement("Email_Forward")]
-            public string[]? Email_Forward { get; set; }
-            [XmlElement("LastEdit")]
-            public string[]? LastEdit { get; set; }
-        }
-
-        [XmlRoot("query")]
-        public class VMACS_query
-        {
-            [XmlElement("item")]
-            public VMACS_item item { get; set; }
-
-            [XmlElement("dbfile")]
-            public string[]? dbfile { get; set; }
-
-            [XmlElement("dbfileNm")]
-            public string[]? dbfileNm { get; set; }
-
-            [XmlElement("uri")]
-            public string[]? uri { get; set; }
-        }
 
         public VMACSService() { }
 
@@ -88,7 +24,7 @@ public VMACSService() { }
         /// </summary>
         /// <param name="loginID"></param>
         /// <returns></returns>
-        public static async Task<String?> Search (String? loginID)
+        public static async Task<VMACSQuery?> Search (String? loginID)
         {
 			string request = $"/trust/query.xml?dbfile=3&index=CampusLoginId&find={loginID}&format=CHRIS4&AUTH=06232005".ToString();
             using HttpResponseMessage response = await sharedClient.GetAsync(request);
@@ -99,12 +35,12 @@ public VMACSService() { }
             var buffer = Encoding.UTF8.GetBytes(s);
             using (var stream = new MemoryStream(buffer))
             {
-                var serializer = new XmlSerializer(typeof(VMACS_query));
+                var serializer = new XmlSerializer(typeof(VMACSQuery));
                 //return Encoding.ASCII.GetString(stream.ToArray());
-                var vmacs_api = (VMACS_query?)serializer.Deserialize(stream);
+                var vmacs_api = (VMACSQuery?)serializer.Deserialize(stream);
                 if (vmacs_api != null && vmacs_api.item != null && vmacs_api.item.Nextel != null)
                 {
-                    return vmacs_api.item.Nextel[0];
+                    return vmacs_api;
                 }
             }
             return null;
diff --git a/web/Areas/Directory/Views/CardExample.cshtml b/web/Areas/Directory/Views/Card.cshtml
similarity index 70%
rename from web/Areas/Directory/Views/CardExample.cshtml
rename to web/Areas/Directory/Views/Card.cshtml
index 9bd503e..9699d1d 100644
--- a/web/Areas/Directory/Views/CardExample.cshtml
+++ b/web/Areas/Directory/Views/Card.cshtml
@@ -25,17 +25,19 @@
               color="blue"
               label="Display IDs">
     </q-toggle>
+    <!--
     <q-toggle v-model="debug"
               color="red"
               label="Display debugging">
     </q-toggle>
+    -->
 </q-form>
 
 <div class="row q-pa-sm q-gutter-sm" style="background-color: #fff">
-    <q-card v-for="user in results" class="col-4 col-sm-16 col-md-4 col-lg-3 col-xl-2 block { SVM : user.SVM}" style="background-color: #f8f8f8; border: 2px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
+    <q-card v-for="user in results" class="col-2 col-sm-16 col-md-2 col-lg-3 col-xl-2 block { SVM : user.SVM}" style="background-color: #f8f8f8; border: 2px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
             <q-card-section class="grid row" :style="[user.svm ? {'background-color': '#1D4776'} : {'background-color': '#aaa'}]" style="padding:0; border-right: 1px solid #fff;">
-                <q-icon name="person" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon>
-                <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'" class="col"><q-icon name="email" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon></a>
+            <a v-if="user.iamId && user.mothraId" :href="'@HttpHelper.GetOldViperRootURL()/default.cfm?page=userinfo&id='+ user.iamId + '&mothraID=' + user.mothraId"><q-icon name="person" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon></a>
+                <a v-if="user.mailId" :href="'mailto:' + user.mailId + '@@ucdavis.edu'"><q-icon name="email" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon></a>
                 <q-btn icon="assignment_ind" size="xs" dense :href="'/EmulateUser/' + user.loginId" style="margin: 0.4rem; background-color: ; color: #fff;"></q-btn>
             </q-card-section>
             <q-card-section class="row">
@@ -69,45 +71,42 @@
                 <div v-if="user.postalAddress">{{ user.postalAddress }}</div>
                 <div v-if="user.phone">{{ user.phone }}</div>
                 <div v-if="user.mobile">{{ user.mobile }}</div>
-            </q-card-section>
+                <div v-if="user.nextel">{{ user.nextel }}</div>
+        </q-card-section>
             <q-separator v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)"></q-separator>
             <q-card-section v-if="ids && (user.spridentId || user.pidm || user.employeeId || user.iamId || user.mothraId || user.mivId)">
-                <ul>
-                    <li v-if="user.spridenId">
-                        BannerID:
-                        @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
-                        {
-                            @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
-                        }
-                        else
-                        {
-                            @: {{ user.spridenId }}
-                        }
-                    </li>
-                    <li v-if="user.pidm">PIDM: {{ user.pidm }}</li>
-                    <li v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</li>
-                    <li v-if="user.iamId">IAMID: {{ user.iamId }}</li>
-                    <li v-if="user.mothraId">MothraID: {{ user.mothraId }}</li>
-                    <li v-if="user.mivId > 0">MIVID: {{ user.mivId }}</li>
-                </ul>
-            </q-card-section>
-            <q-separator v-if="ids"></q-separator>
-            <q-card-section v-if="ids">
-                <ul>
-                    <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></li>
-                    <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></li>
-                    <li><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></li>
-                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
+                <div v-if="user.spridenId">
+                    BannerID:
+                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.SIS.AllStudents"))
                     {
-                        @:
-                        <li v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></li>
+                        @: <a :href="'@HttpHelper.GetOldViperRootURL()' + '/students/sis/default.cfm?Page=AssignPidmAndRedirect&Pidm=' + user.spridenId + '&JumpPage=Home'">{{ user.spridenId }}</a>
                     }
-                    @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
+                    else
                     {
-                        @:
-                        <li v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></li>
+                        @: {{ user.spridenId }}
                     }
-                </ul>
+                </div>
+                <div v-if="user.pidm">PIDM: {{ user.pidm }}</div>
+                <div v-if="user.employeeId">EmployeeID: {{ user.employeeId}}</div>
+                <div v-if="user.iamId">IAMID: {{ user.iamId }}</div>
+                <div v-if="user.mothraId">MothraID: {{ user.mothraId }}</div>
+                <div v-if="user.mivId > 0">MIVID: {{ user.mivId }}</div>
+            </q-card-section>
+            <q-separator v-if="ids"></q-separator>
+            <q-card-section style="font-size:90%;" v-if="ids">
+                <div><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=AAUDCheck&mothraID=' + user.mothraId + '&loginID=' + user.loginId">AAUD Check</a></div>
+                <div><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=IDCardCheck&LoginID=' + user.loginId">ID Check</a></div>
+                <div><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UnitHeads&MailID=' + user.mailId">MSO/CAO Lookup</a></div>
+                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.DirectoryUCPathInfo"))
+                {
+                    @:
+                    <div v-if="user.employeeId != ''"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=UCPathInfo&emplid=' + user.employeeId">UCPath Info</a></div>
+                }
+                @if (UserHelper.HasPermission(rapsContext, UserHelper.GetCurrentUser(), "SVMSecure.CATS.ServiceDesk"))
+                {
+                    @:
+                    <dv v-if="user.currentAffiliate == true"><a :href="'@HttpHelper.GetOldViperRootURL()' + '/default.cfm?Page=alternatePhoto&iamID' + user.iamId + '&mailID=' + props.row.mailId + '&empName=' + user.name">Alt. Photo</a></dv>
+                }
             </q-card-section>
             <q-separator v-if="debug"></q-separator>
             <q-card-section v-if="debug">
diff --git a/web/Areas/Directory/Views/Index.cshtml b/web/Areas/Directory/Views/Table.cshtml
similarity index 100%
rename from web/Areas/Directory/Views/Index.cshtml
rename to web/Areas/Directory/Views/Table.cshtml
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 346a2fc..82bc7e6 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -224,7 +224,6 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         /// <returns>LdapUserContact</returns>
         public LdapUserContact? GetUserByID(string? id)
         {
-            return null;
             if (id == null) return null;
             string filter = string.Format("(|(ucdpersoniamid = {0}))", id);
             DirectoryEntry de = GetRootContact();

From d29aa3810104b5e1529e14eccb2499c831c3a108 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Tue, 23 Apr 2024 15:23:01 -0700
Subject: [PATCH 53/69] Testing different start for ldap. Shrinking header
 avatar

---
 web/Areas/Directory/Views/Card.cshtml  |  2 +-
 web/Areas/RAPS/Services/LdapService.cs |  7 ++++---
 web/wwwroot/css/site.css               | 10 ++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/web/Areas/Directory/Views/Card.cshtml b/web/Areas/Directory/Views/Card.cshtml
index 9699d1d..99fa220 100644
--- a/web/Areas/Directory/Views/Card.cshtml
+++ b/web/Areas/Directory/Views/Card.cshtml
@@ -33,7 +33,7 @@
     -->
 </q-form>
 
-<div class="row q-pa-sm q-gutter-sm" style="background-color: #fff">
+<div class="row q-pa-sm q-gutter-sm" style="background-color: #fff" id="directoryResults">
     <q-card v-for="user in results" class="col-2 col-sm-16 col-md-2 col-lg-3 col-xl-2 block { SVM : user.SVM}" style="background-color: #f8f8f8; border: 2px solid #fff; border-radius: 7px; box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;">
             <q-card-section class="grid row" :style="[user.svm ? {'background-color': '#1D4776'} : {'background-color': '#aaa'}]" style="padding:0; border-right: 1px solid #fff;">
             <a v-if="user.iamId && user.mothraId" :href="'@HttpHelper.GetOldViperRootURL()/default.cfm?page=userinfo&id='+ user.iamId + '&mothraID=' + user.mothraId"><q-icon name="person" size="xs" style="margin: 0.4rem; color: #fff;"></q-icon></a>
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index bae98e4..3ff4bcb 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -18,7 +18,7 @@ public class LdapService
         private Logger _logger;
 
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
-        private const string _ouStart = "OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _ouStart = "DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ouServer = "ou.ad3.ucdavis.edu";
         private const string _ad3Server = "ad3.ucdavis.edu";
@@ -421,10 +421,11 @@ private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> user
         //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
         private DirectoryEntry GetRoot(bool fromOu = false)
         {
+            _logger.Info("GetRoot(" + (fromOu ? "OU" : "AD3") + ")");
             string start = fromOu ? _ouStart : _ad3Users;
-            //string server = fromOu ? _ouServer : _ad3Server;
+            string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry("oudc12c.ou.ad3.ucdavis.edu", _username, creds, AuthenticationTypes.Secure)
+            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
             {
                 Path = string.Format("LDAP://{0}", start)
             };
diff --git a/web/wwwroot/css/site.css b/web/wwwroot/css/site.css
index fb0e06f..aee8a62 100644
--- a/web/wwwroot/css/site.css
+++ b/web/wwwroot/css/site.css
@@ -235,6 +235,12 @@ body {
     margin: .0rem 0rem .5rem 0rem;
 }
 
-.q-avatar {
-    height: 111px !important; width: 87px !important;
+div#directoryResults .q-avatar {
+    height: 111px !important;
+    width: 87px !important;
 }
+
+header .q-avatar {
+    height: 40px !important;
+    width: 31px !important;
+}
\ No newline at end of file

From 4c9685d9c0f9ef5d51a11dd5f9f81636cc961b85 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 24 Apr 2024 15:06:35 -0700
Subject: [PATCH 54/69] Testing to see if I can get a different error

---
 web/Areas/RAPS/Services/LdapService.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 3ff4bcb..1ec2e47 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -425,12 +425,13 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
+            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.None)
             {
                 Path = string.Format("LDAP://{0}", start)
             };
             return de;
         }
+
         //Get the root to start our ldap.ucdavis.edu query
         private DirectoryEntry GetRootContact()
         {
@@ -443,7 +444,5 @@ private DirectoryEntry GetRootContact()
             };
             return de;
         }
-
-
     }
 }
\ No newline at end of file

From ed3ce5d817ee2a1fae9c6ea95c94d757a7c8a2f1 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 24 Apr 2024 15:18:00 -0700
Subject: [PATCH 55/69] More logging

---
 web/Areas/RAPS/Services/LdapService.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 1ec2e47..51d73f8 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -4,6 +4,8 @@
 using Viper.Areas.RAPS.Models;
 using NLog;
 using Amazon.Runtime.Internal.Transform;
+using System.Text;
+using System.Security.Cryptography;
 
 namespace Viper.Areas.RAPS.Services
 {
@@ -84,7 +86,8 @@ public class LdapService
             "accountexpires","adspath","badpasswordtime","badpwdcount","cn","codepage","company","countrycode","deliverandredirect","department","deptname","departmentnumber","Description","displayname","distinguishedname","dscorepropagationdata","edupersonaffiliation","edupersonprincipalname","employeenumber","extensionattribute10","extensionattribute11","extensionattribute12","extensionattribute13","extensionattribute14","extensionattribute15","extensionattribute5","extensionattribute6","extensionattribute7","extensionattribute8","extensionattribute9","gidnumber","givenname","instancetype","internetencoding","l","lastlogoff","lastlogon","lastlogontimestamp","legacyexchangedn","lockouttime","logoncount","mail","mailnickname","mapirecipient","memberof","mobile","msexcharchiveguid","msexcharchivename","msexcharchivestatus","msexchblockedsendershash","msexchcomanagedobjectsbl","msexchextensionattribute16","msexchextensionattribute17","msexchmailboxguid","msexchpoliciesexcluded","msexchrecipientdisplaytype","msexchrecipienttypedetails","msexchremoterecipienttype","msexchsafesendershash","msexchtextmessagingstate","msexchumdtmfmap","msexchuseraccountcontrol","msexchversion","msexchwhenmailboxcreated","name","objectcategory","objectclass","objectguid","objectsid","ou","pager","phone","physicaldeliveryofficename","postaladdress","postalcode","primarygroupid","proxyaddresses","pwdlastset","SamAccountName","samaccounttype","showinaddressbook","sn","st","street","streetaddress","targetaddress","telephonenumber","textencodedoraddress","title","ucdappointmentdepartmentcode","ucdappointmenttitlecode","ucdpersonaffiliation","ucdpersoniamid","ucdpersonnetid","ucdpersonpidm","ucdpersonppsid","ucdpersonuuid","ucdpublishitemflag","ucdstudentsid","uid","uidnumber","useraccountcontrol","username","userprincipalname","usnchanged","usncreated","whenchanged","whencreated"
         };
 
-        public LdapService() {
+        public LdapService()
+        {
             _logger = LogManager.GetCurrentClassLogger();
         }
 
@@ -111,7 +114,7 @@ public List<LdapGroup> GetGroups(string? name = null)
                     de.Options.Referral = ReferralChasingOption.All;
                 }
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                    { ReferralChasing = ReferralChasingOption.All };
+                { ReferralChasing = ReferralChasingOption.All };
 
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
@@ -209,14 +212,14 @@ public List<LdapUserContact> GetUsersContact(string search)
         /// </summary>
         /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
         /// <returns>Dictionary of Users, indexed by mothraID</returns>
-        public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string search)
+        public Dictionary<string, LdapUserContact> GetUsersContactDictionary(string search)
         {
             string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
             DirectoryEntry de = GetRootContact();
             SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
             { SizeLimit = 1000 }
                 .FindAll();
-            Dictionary<string,LdapUserContact> users = new();
+            Dictionary<string, LdapUserContact> users = new();
             foreach (SearchResult result in results)
             {
                 users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
@@ -272,7 +275,8 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
         {
             string filter = "(|";
-            foreach (string i in ids) {
+            foreach (string i in ids)
+            {
                 filter += string.Format("(ucdpersonuuid = {0})", i);
             }
             filter += ")";
@@ -425,6 +429,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            _logger.Info(Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(creds))));
             DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.None)
             {
                 Path = string.Format("LDAP://{0}", start)

From 5437c03fea43229dbb8e3899a85fb90945364d41 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 24 Apr 2024 15:23:11 -0700
Subject: [PATCH 56/69] Revert "More logging"

This reverts commit ed3ce5d817ee2a1fae9c6ea95c94d757a7c8a2f1.
---
 web/Areas/RAPS/Services/LdapService.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 51d73f8..1ec2e47 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -4,8 +4,6 @@
 using Viper.Areas.RAPS.Models;
 using NLog;
 using Amazon.Runtime.Internal.Transform;
-using System.Text;
-using System.Security.Cryptography;
 
 namespace Viper.Areas.RAPS.Services
 {
@@ -86,8 +84,7 @@ public class LdapService
             "accountexpires","adspath","badpasswordtime","badpwdcount","cn","codepage","company","countrycode","deliverandredirect","department","deptname","departmentnumber","Description","displayname","distinguishedname","dscorepropagationdata","edupersonaffiliation","edupersonprincipalname","employeenumber","extensionattribute10","extensionattribute11","extensionattribute12","extensionattribute13","extensionattribute14","extensionattribute15","extensionattribute5","extensionattribute6","extensionattribute7","extensionattribute8","extensionattribute9","gidnumber","givenname","instancetype","internetencoding","l","lastlogoff","lastlogon","lastlogontimestamp","legacyexchangedn","lockouttime","logoncount","mail","mailnickname","mapirecipient","memberof","mobile","msexcharchiveguid","msexcharchivename","msexcharchivestatus","msexchblockedsendershash","msexchcomanagedobjectsbl","msexchextensionattribute16","msexchextensionattribute17","msexchmailboxguid","msexchpoliciesexcluded","msexchrecipientdisplaytype","msexchrecipienttypedetails","msexchremoterecipienttype","msexchsafesendershash","msexchtextmessagingstate","msexchumdtmfmap","msexchuseraccountcontrol","msexchversion","msexchwhenmailboxcreated","name","objectcategory","objectclass","objectguid","objectsid","ou","pager","phone","physicaldeliveryofficename","postaladdress","postalcode","primarygroupid","proxyaddresses","pwdlastset","SamAccountName","samaccounttype","showinaddressbook","sn","st","street","streetaddress","targetaddress","telephonenumber","textencodedoraddress","title","ucdappointmentdepartmentcode","ucdappointmenttitlecode","ucdpersonaffiliation","ucdpersoniamid","ucdpersonnetid","ucdpersonpidm","ucdpersonppsid","ucdpersonuuid","ucdpublishitemflag","ucdstudentsid","uid","uidnumber","useraccountcontrol","username","userprincipalname","usnchanged","usncreated","whenchanged","whencreated"
         };
 
-        public LdapService()
-        {
+        public LdapService() {
             _logger = LogManager.GetCurrentClassLogger();
         }
 
@@ -114,7 +111,7 @@ public List<LdapGroup> GetGroups(string? name = null)
                     de.Options.Referral = ReferralChasingOption.All;
                 }
                 var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                { ReferralChasing = ReferralChasingOption.All };
+                    { ReferralChasing = ReferralChasingOption.All };
 
                 SearchResultCollection results = ds.FindAll();
                 foreach (SearchResult result in results)
@@ -212,14 +209,14 @@ public List<LdapUserContact> GetUsersContact(string search)
         /// </summary>
         /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
         /// <returns>Dictionary of Users, indexed by mothraID</returns>
-        public Dictionary<string, LdapUserContact> GetUsersContactDictionary(string search)
+        public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string search)
         {
             string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
             DirectoryEntry de = GetRootContact();
             SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
             { SizeLimit = 1000 }
                 .FindAll();
-            Dictionary<string, LdapUserContact> users = new();
+            Dictionary<string,LdapUserContact> users = new();
             foreach (SearchResult result in results)
             {
                 users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
@@ -275,8 +272,7 @@ public Dictionary<string, LdapUserContact> GetUsersContactDictionary(string sear
         public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
         {
             string filter = "(|";
-            foreach (string i in ids)
-            {
+            foreach (string i in ids) {
                 filter += string.Format("(ucdpersonuuid = {0})", i);
             }
             filter += ")";
@@ -429,7 +425,6 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            _logger.Info(Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(creds))));
             DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.None)
             {
                 Path = string.Format("LDAP://{0}", start)

From f564fc1a3d595c1da2e8fb30b945a12940fccca2 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 24 Apr 2024 15:44:14 -0700
Subject: [PATCH 57/69] Updating secure option

---
 web/Areas/RAPS/Services/LdapService.cs      | 2 +-
 web/Classes/DuoAuthenticationRequirement.cs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 1ec2e47..fe06e67 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -425,7 +425,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.None)
+            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.SecureSocketsLayer)
             {
                 Path = string.Format("LDAP://{0}", start)
             };
diff --git a/web/Classes/DuoAuthenticationRequirement.cs b/web/Classes/DuoAuthenticationRequirement.cs
index 661fd9c..60836ce 100644
--- a/web/Classes/DuoAuthenticationRequirement.cs
+++ b/web/Classes/DuoAuthenticationRequirement.cs
@@ -22,6 +22,11 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
             {
                 if (httpContext is not null)
                 {
+                    var env = httpContext.RequestServices.GetRequiredService<IWebHostEnvironment>();
+                    if (env != null && env.EnvironmentName == "Development")
+                    {
+                        context.Succeed(requirement);
+                    }
                     httpContext.Items["ErrorMessage"] = "DUO two-factor authentication is required";
                 }
                 else

From 0cbca65e7a88c82ac937818d1ed9edb1677cdb65 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 24 Apr 2024 15:55:30 -0700
Subject: [PATCH 58/69] Setting start OU

---
 web/Areas/RAPS/Services/LdapService.cs | 7 ++++---
 web/nlog.config                        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index fe06e67..e7fa370 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -18,12 +18,12 @@ public class LdapService
         private Logger _logger;
 
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
-        private const string _ouStart = "DC=ou,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _ouStart = "OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
-        private const string _ouServer = "ou.ad3.ucdavis.edu";
-        private const string _ad3Server = "ad3.ucdavis.edu";
         private const string _ldapUsers = "OU=People,DC=ldap,DC=ucdavis,DC=edu";
         //server and start for ldap.ucdavis.edu
+        private const string _ouServer = "ou.ad3.ucdavis.edu";
+        private const string _ad3Server = "ad3.ucdavis.edu";
         private const string _ldapServer = "ldap.ucdavis.edu";
         private const string _ldapStart = "ou=People,dc=ucdavis,dc=edu";
 
@@ -425,6 +425,7 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string start = fromOu ? _ouStart : _ad3Users;
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            _logger.Warn(string.Format("GetRoot Connection: {0} {1} {2}", server, start, _username));
             DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.SecureSocketsLayer)
             {
                 Path = string.Format("LDAP://{0}", start)
diff --git a/web/nlog.config b/web/nlog.config
index d6e4665..91f00fc 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -93,7 +93,7 @@
     </logger>
 
 	<!--Log to debug file in dev and test-->
-	<logger name="*" minlevel="Debug" maxlevel="Info" writeTo="debugFile">
+	<logger name="*" minlevel="Info" maxlevel="Info" writeTo="debugFile">
 		<filters defaultAction='Log'>
 			<when condition="contains('${currentEnviroment}','Production')" action="Ignore" />
 		</filters>

From 1a9275eacd4dd09d6af2c7b3601ae4fbe00876fe Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 24 Apr 2024 16:33:26 -0700
Subject: [PATCH 59/69] Adding path logging

---
 web/Areas/RAPS/Services/LdapService.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index e7fa370..5e892b7 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -12,6 +12,7 @@ public class LdapService
     {
         //username for campus active directory servers (ou.ad3 and ad3)
         private const string _username = "ou\\svc-accounts";
+        //private const string _username = "CN=svc-accounts,OU=Service Accounts,OU=SVM-OU-LocalUsers,OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         //username for ldap.ucdavis.edu
         private const string _ldapUsername = "uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu";
 
@@ -426,10 +427,11 @@ private DirectoryEntry GetRoot(bool fromOu = false)
             string server = fromOu ? _ouServer : _ad3Server;
             string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
             _logger.Warn(string.Format("GetRoot Connection: {0} {1} {2}", server, start, _username));
-            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.SecureSocketsLayer)
+            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
             {
                 Path = string.Format("LDAP://{0}", start)
             };
+            _logger.Warn(string.Format("Path: {0}", de.Path));
             return de;
         }
 

From 2487de1ed839d16deac8a4de20bbca8f5d4eeaed Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 26 Apr 2024 15:55:38 -0700
Subject: [PATCH 60/69] Using DirectoryServices.Protocols

---
 .../Models/IndividualSearchResultWithIDs.cs   |  21 +-
 web/Areas/RAPS/Models/LdapGroup.cs            |  26 ++
 web/Areas/RAPS/Models/LdapUserContact.cs      |  57 +++-
 web/Areas/RAPS/Services/LdapService.cs        | 243 ++++++++++++------
 4 files changed, 261 insertions(+), 86 deletions(-)

diff --git a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
index dee592c..d46d331 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
@@ -37,7 +37,26 @@ public IndividualSearchResultWithIDs(AaudUser? aaudUser, LdapUserContact? ldapUs
                 VmacsId = aaudUser.VmacsId;
                 UnexId = aaudUser.UnexId;
                 MivId = aaudUser.MivId;
-            }            
+            }
+            else if(ldapUserContact != null)
+            {
+                Title = ldapUserContact.title;
+                Department = ldapUserContact.department;
+                Phone = ldapUserContact.telephonenumber;
+                Mobile = ldapUserContact.mobile;
+                UserName = ldapUserContact.uid;
+                PostalAddress = (ldapUserContact.postaladdress ?? "").Replace("$", '\n'.ToString());
+                UCDAffiliation = ldapUserContact.ucdpersonaffiliation;
+                UCDPersonUUID = ldapUserContact.ucdpersonuuid;
+                if (string.IsNullOrEmpty(DisplayFullName))
+                {
+                    DisplayFullName = ldapUserContact.displayname;
+                }
+                if (string.IsNullOrEmpty(Name))
+                {
+                    Name = ldapUserContact.displayname;
+                }
+            }
         }
     }
 }
diff --git a/web/Areas/RAPS/Models/LdapGroup.cs b/web/Areas/RAPS/Models/LdapGroup.cs
index 9300dc0..3878831 100644
--- a/web/Areas/RAPS/Models/LdapGroup.cs
+++ b/web/Areas/RAPS/Models/LdapGroup.cs
@@ -1,4 +1,5 @@
 using System.DirectoryServices;
+using System.DirectoryServices.Protocols;
 using System.Runtime.Versioning;
 
 namespace Viper.Areas.RAPS.Models
@@ -49,5 +50,30 @@ public LdapGroup(SearchResult? ldapSearchResult)
                 }
             }
         }
+
+        public LdapGroup(SearchResultEntry entry)
+        {
+            foreach (DirectoryAttribute attr in entry.Attributes.Values)
+            {
+                var v = attr[0];
+                switch (attr.Name)
+                {
+                    case "sAMAccountName": SamAccountName = v.ToString(); break;
+                    case "objectGUID": ObjectGuid = (byte[])v; break;
+                    case "cn": Cn = v.ToString(); break;
+                    case "canonicalName": CanonicalName = v.ToString(); break;
+                    case "dn": Dn = v.ToString(); break;
+                    case "distinguishedName": DistinguishedName = v.ToString(); break;
+                    case "displayName": DisplayName = v.ToString(); break;
+                    case "groupType": GroupType = v.ToString(); break;
+                    case "description": Description = v.ToString(); break;
+                    case "extensionattribute1": ExtensionAttribute1 = v.ToString(); break;
+                    case "extensionattribute2": ExtensionAttribute2 = v.ToString(); break;
+                    case "extensionattribute3": ExtensionAttribute3 = v.ToString(); break;
+                    default: break;
+                }
+
+            }
+        }
     }
 }
diff --git a/web/Areas/RAPS/Models/LdapUserContact.cs b/web/Areas/RAPS/Models/LdapUserContact.cs
index 356a76b..1470bc4 100644
--- a/web/Areas/RAPS/Models/LdapUserContact.cs
+++ b/web/Areas/RAPS/Models/LdapUserContact.cs
@@ -1,6 +1,8 @@
 using Newtonsoft.Json;
 using System.DirectoryServices;
+using System.DirectoryServices.Protocols;
 using System.Linq.Dynamic.Core;
+using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 using System.Text.Json;
 
@@ -9,6 +11,16 @@ namespace Viper.Areas.RAPS.Models
     [SupportedOSPlatform("windows")]
     public class LdapUserContact
     {
+        public string? middlename { get; set; } = null!;
+        public string? eduPersonNickname { get; set; } = null!;
+        public string? ucdStudentLevel { get; set; } = null!;
+        public string? ucdPersonIAMID { get; set; } = null!;
+        public string? ucdPersonUUID { get; set; } = null!;
+        public string? ucdStudentSID { get; set; } = null!;
+        public string? ucdPersonPIDM { get; set; } = null!;
+        public string? employeeNumber { get; set; } = null!;
+        public string? ucdPersonAffiliation { get; set; } = null!;
+
         public string? accountexpires { get; set; } = null!;
         public string? adspath { get; set; } = null!;
         public string? badpasswordtime { get; set; } = null!;
@@ -89,7 +101,7 @@ public class LdapUserContact
         public string SamAccountName { get; set; } = null!;
         public string? samaccounttype { get; set; } = null!;
         public string? showinaddressbook { get; set; } = null!;
-        public string sn { get; set; } = null!;
+        public string surName { get; set; } = null!;
         public string? st { get; set; } = null!;
         public string? street { get; set; } = null!;
         public string? streetaddress { get; set; } = null!;
@@ -211,7 +223,7 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                             case "samaccountname": SamAccountName = v[0].ToString(); break;
                             case "samaccounttype": samaccounttype = v[0].ToString(); break;
                             case "showinaddressbook": showinaddressbook = v[0].ToString(); break;
-                            case "sn": sn = v[0].ToString(); break;
+                            case "sn": surName = v[0].ToString(); break;
                             case "st": st = v[0].ToString(); break;
                             case "street": street = v[0].ToString(); break;
                             case "streetaddress": streetaddress = v[0].ToString(); break;
@@ -252,5 +264,46 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                 }
             }
         }
+
+        //u.mailID = "";
+        //        u.email = row.mail;
+        //        u.name = row.displayname;
+        //        u.givenName = (len(row?.eduPersonNickname) > 0 ? row.eduPersonNickname : row.givenName);
+        //        u.surName = row.sn;
+        //        u.middlename = row.middlename;
+        public LdapUserContact(SearchResultEntry entry)
+        {
+            foreach (DirectoryAttribute attr in entry.Attributes.Values)
+            {
+                var v = attr[0];
+                switch (attr.Name)
+                {
+                    case "sAMAccountName": SamAccountName = v.ToString(); break;
+                    case "sn": surName = v.ToString(); break;
+
+                    case "givenName": givenname = v.ToString(); break;
+                    case "middlename": middlename = v.ToString(); break;
+                    case "displayName": displayname = v.ToString(); break;
+                    case "eduPersonNickname": eduPersonNickname = v.ToString(); break;
+
+                    case "title": title = v.ToString(); break;
+                    case "postalAddress": postaladdress = v.ToString(); break;
+                    case "telephoneNumber": telephonenumber = v.ToString(); break;
+                    case "mobile": mobile = v.ToString(); break;
+                    case "mail": mail = v.ToString(); break;
+
+                    case "ucdStudentLevel": ucdStudentLevel = v.ToString(); break;
+                    case "ucdStudentSID": ucdStudentSID = v.ToString(); break;
+                    case "ucdPersonPIDM": ucdPersonPIDM = v.ToString(); break;
+                    case "employeeNumber": employeeNumber = v.ToString(); break;
+                    case "ucdPersonUUID": ucdPersonUUID = v.ToString(); break;
+                    case "ucdPersonIAMID": ucdPersonIAMID = v.ToString(); break;
+                    case "ucdPersonAffiliation": ucdPersonAffiliation = v.ToString(); break;
+                   
+                    default: break;
+                }
+
+            }
+        }
     }
 }
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 5e892b7..444e214 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -1,9 +1,11 @@
-using System.DirectoryServices;
-using System.Runtime.Versioning;
+using System.Runtime.Versioning;
 using System.DirectoryServices.AccountManagement;
 using Viper.Areas.RAPS.Models;
 using NLog;
 using Amazon.Runtime.Internal.Transform;
+using System.DirectoryServices.Protocols;
+using AngleSharp.Html;
+using AngleSharp.Html.Dom.Events;
 
 namespace Viper.Areas.RAPS.Services
 {
@@ -11,10 +13,10 @@ namespace Viper.Areas.RAPS.Services
     public class LdapService
     {
         //username for campus active directory servers (ou.ad3 and ad3)
-        private const string _username = "ou\\svc-accounts";
+        private const string _username = "svc-accounts";
         //private const string _username = "CN=svc-accounts,OU=Service Accounts,OU=SVM-OU-LocalUsers,OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         //username for ldap.ucdavis.edu
-        private const string _ldapUsername = "uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu";
+        private const string _ldapUsername = "UID=vetmed,OU=Special Users,DC=ucdavis,DC=edu";
 
         private Logger _logger;
 
@@ -26,10 +28,11 @@ public class LdapService
         private const string _ouServer = "ou.ad3.ucdavis.edu";
         private const string _ad3Server = "ad3.ucdavis.edu";
         private const string _ldapServer = "ldap.ucdavis.edu";
-        private const string _ldapStart = "ou=People,dc=ucdavis,dc=edu";
+        private const string _ldapStart = "OU=People,DC=ucdavis,DC=edu";
+        private const int _ldapSSLPort = 636;
 
         //ldap attributes/properties to return for each object type
-        private readonly string[] _groupProperties =
+        private static readonly string[] _groupProperties =
         {
             "sAMAccountName",
             "objectGuid",
@@ -44,7 +47,7 @@ public class LdapService
             "extensionAttribute2",
             "extensionAttribute3"
         };
-        private readonly string[] _personProperties =
+        private static readonly string[] _personProperties =
         {
             "sAMAccountName",
             "objectGuid",
@@ -89,6 +92,41 @@ public LdapService() {
             _logger = LogManager.GetCurrentClassLogger();
         }
 
+        public static SearchResponse SearchActiveDirectory(string searchFilter, string searchStart, bool ou = false)
+        {
+            var ldapIdentifier = ou 
+                ? new LdapDirectoryIdentifier(_ouServer, _ldapSSLPort)
+                : new LdapDirectoryIdentifier(_ad3Server, _ldapSSLPort);
+            var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_username, cred, "ou"));
+            lc.SessionOptions.ProtocolVersion = 3;
+            lc.SessionOptions.SecureSocketLayer = true;
+            lc.Bind();
+
+            var searchRequest = new SearchRequest(searchStart, searchFilter, SearchScope.Subtree, _groupProperties)
+            {
+                SizeLimit = 1000                
+            };
+
+            var response = (SearchResponse)lc.SendRequest(searchRequest);
+            return response;
+        }
+
+        public static SearchResponse SearchLdap(string searchFilter)
+        {
+            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, _ldapSSLPort);
+            var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
+            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_ldapUsername, cred));
+            lc.SessionOptions.ProtocolVersion = 3;
+            lc.SessionOptions.SecureSocketLayer = true;
+            lc.AuthType = AuthType.Basic;
+            lc.Bind();
+
+            var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, _personProperties);
+            var response = (SearchResponse)lc.SendRequest(searchRequest);
+            return response;
+        }
+
         /// <summary>
         /// Get groups, optionally filtering with a wildcard match to name
         /// </summary>
@@ -101,8 +139,16 @@ public List<LdapGroup> GetGroups(string? name = null)
             {
                 filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
             };
-
+            
+            var searchResults = SearchActiveDirectory(filter, _ouStart, true);
             List<LdapGroup> groups = new();
+
+            foreach (SearchResultEntry e in searchResults.Entries)
+            {
+                groups.Add(new LdapGroup(e));
+            }
+
+            /*
             try
             {
                 var de = GetRoot(true);
@@ -130,6 +176,8 @@ public List<LdapGroup> GetGroups(string? name = null)
             {
                 _logger.Error(ex);
             }
+            */
+            groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
             return groups;
         }
 
@@ -141,10 +189,13 @@ public List<LdapGroup> GetGroups(string? name = null)
         public LdapGroup? GetGroup(string dn)
         {
             string filter = string.Format("(&(objectClass=group)(distinguishedName={0}))", dn);
+            return null;
+            /*
             return new LdapGroup(
                 new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
                     .FindOne()
             );
+            */
         }
 
         /// <summary>
@@ -157,6 +208,7 @@ public List<LdapGroup> GetGroups(string? name = null)
         /// <returns>List of users</returns>
         public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string? cn = null, string? samAccountName = null)
         {
+            /*
             string filter = "(objectClass=user)";
             string additionalFilters = "";
             if (name != null)
@@ -177,11 +229,13 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
             }
             SearchResultCollection results = new DirectorySearcher(GetRoot(fromOu), filter, _personProperties, SearchScope.Subtree)
                 .FindAll();
-            List<LdapUser> users = new();
+            
             foreach (SearchResult result in results)
             {
                 users.Add(new LdapUser(result));
             }
+            */
+            List<LdapUser> users = new();
             return SortUsers(users);
         }
 
@@ -192,15 +246,26 @@ public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string?
         /// <returns>List of Users</returns>
         public List<LdapUserContact> GetUsersContact(string search)
         {
-            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, filter)
-            { SizeLimit = 1000 }
-                .FindAll();
+            //string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            //DirectoryEntry de = GetRootContact();
+            //SearchResultCollection results = new DirectorySearcher(de, filter)
+            //{ SizeLimit = 1000 }
+            //    .FindAll();
+            //foreach (SearchResult result in results)
+            //{
+            //    users.Add(new LdapUserContact(result));
+            //}
             List<LdapUserContact> users = new();
-            foreach (SearchResult result in results)
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            var results = SearchLdap(filter);
+
+            foreach (SearchResultEntry entry in results.Entries)
             {
-                users.Add(new LdapUserContact(result));
+                users.Add(new LdapUserContact(entry));
+                if(users.Count >= 100)
+                {
+                    break;
+                }
             }
             return SortUsersContact(users);
         }
@@ -212,16 +277,17 @@ public List<LdapUserContact> GetUsersContact(string search)
         /// <returns>Dictionary of Users, indexed by mothraID</returns>
         public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string search)
         {
-            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            { SizeLimit = 1000 }
-                .FindAll();
-            Dictionary<string,LdapUserContact> users = new();
-            foreach (SearchResult result in results)
-            {
-                users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
-            }
+            //string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            //DirectoryEntry de = GetRootContact();
+            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            //{ SizeLimit = 1000 }
+            //    .FindAll();
+            //Dictionary<string,LdapUserContact> users = new();
+            //foreach (SearchResult result in results)
+            //{
+            //    users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
+            //}
+            Dictionary<string, LdapUserContact> users = new();
             return users;
         }
 
@@ -233,14 +299,20 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         public LdapUserContact? GetUserContact(string search)
         {
             string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            { SizeLimit = 1 }
-                .FindAll();
-            foreach (SearchResult result in results)
+            var results = SearchLdap(filter);
+
+            if(results.Entries.Count > 0)
             {
-                return new LdapUserContact(result);
+                return new LdapUserContact(results.Entries[0]);
             }
+            //DirectoryEntry de = GetRootContact();
+            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            //{ SizeLimit = 1 }
+            //    .FindAll();
+            //foreach (SearchResult result in results)
+            //{
+            //    return new LdapUserContact(result);
+            //}
             return null;
         }
 
@@ -252,16 +324,16 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         /// <returns>LdapUserContact</returns>
         public LdapUserContact? GetUserByID(string? id)
         {
-            if (id == null) return null;
-            string filter = string.Format("(|(ucdpersoniamid = {0}))", id);
-            DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            { SizeLimit = 1 }
-                .FindAll();
-            foreach (SearchResult result in results)
-            {
-                return new LdapUserContact(result);
-            }
+            //if (id == null) return null;
+            //string filter = string.Format("(|(ucdpersoniamid = {0}))", id);
+            //DirectoryEntry de = GetRootContact();
+            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            //{ SizeLimit = 1 }
+            //    .FindAll();
+            //foreach (SearchResult result in results)
+            //{
+            //    return new LdapUserContact(result);
+            //}
             return null;
         }
 
@@ -272,21 +344,22 @@ public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string searc
         /// <returns>Dictionary of Users, indexed by mothraID</returns>
         public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
         {
-            string filter = "(|";
-            foreach (string i in ids) {
-                filter += string.Format("(ucdpersonuuid = {0})", i);
-            }
-            filter += ")";
-            DirectoryEntry de = GetRootContact();
-            SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            { SizeLimit = 1000 }
-                .FindAll();
-            Dictionary<string, LdapUserContact> users = new();
-            foreach (SearchResult result in results)
-            {
-                users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
-            }
-            return users;
+            //string filter = "(|";
+            //foreach (string i in ids) {
+            //    filter += string.Format("(ucdpersonuuid = {0})", i);
+            //}
+            //filter += ")";
+            //DirectoryEntry de = GetRootContact();
+            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
+            //{ SizeLimit = 1000 }
+            //    .FindAll();
+            //Dictionary<string, LdapUserContact> users = new();
+            //foreach (SearchResult result in results)
+            //{
+            //    users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
+            //}
+            //return users;
+            return new Dictionary<string, LdapUserContact>();
         }
 
         /// <summary>
@@ -297,11 +370,11 @@ public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
         /// <returns></returns>
         public LdapUser? GetUser(string samAccountName, bool fromOu = false)
         {
-            return new LdapUser(
-                new DirectorySearcher(GetRoot(fromOu), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
-                .FindOne()
-            );
-
+            //return new LdapUser(
+            //    new DirectorySearcher(GetRoot(fromOu), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
+            //    .FindOne()
+            //);
+            return null;
         }
 
         /// <summary>
@@ -312,11 +385,11 @@ public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
         /// <returns></returns>
         public LdapUserContact? GetUserContact(string? samAccountName, bool fromOu = false)
         {
-            return new LdapUserContact(
-                new DirectorySearcher(GetRootContact(), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
-                .FindOne()
-            );
-
+            //return new LdapUserContact(
+            //    new DirectorySearcher(GetRootContact(), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
+            //    .FindOne()
+            //);
+            return null;
         }
 
         /// <summary>
@@ -327,23 +400,23 @@ public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
         public List<LdapUser> GetGroupMembership(string groupDn)
         {
             List<LdapUser> users = new();
-            string filter = string.Format("(&(objectClass=user)(memberOf={0}))", groupDn);
+            //string filter = string.Format("(&(objectClass=user)(memberOf={0}))", groupDn);
 
-            //Need to get users from both AD3 and OU
-            SearchResultCollection ouResults = new DirectorySearcher(GetRoot(true), filter, _personProperties, SearchScope.Subtree)
-                .FindAll();
-            foreach (SearchResult result in ouResults)
-            {
-                users.Add(new LdapUser(result));
-            }
+            ////Need to get users from both AD3 and OU
+            //SearchResultCollection ouResults = new DirectorySearcher(GetRoot(true), filter, _personProperties, SearchScope.Subtree)
+            //    .FindAll();
+            //foreach (SearchResult result in ouResults)
+            //{
+            //    users.Add(new LdapUser(result));
+            //}
 
-            SearchResultCollection ad3Results = new DirectorySearcher(GetRoot(false), filter, _personProperties, SearchScope.Subtree)
-            { PageSize = 1000 }
-                .FindAll();
-            foreach (SearchResult result in ad3Results)
-            {
-                users.Add(new LdapUser(result));
-            }
+            //SearchResultCollection ad3Results = new DirectorySearcher(GetRoot(false), filter, _personProperties, SearchScope.Subtree)
+            //{ PageSize = 1000 }
+            //    .FindAll();
+            //foreach (SearchResult result in ad3Results)
+            //{
+            //    users.Add(new LdapUser(result));
+            //}
 
             return SortUsers(users);
         }
@@ -413,13 +486,14 @@ private static List<LdapUser> SortUsers(List<LdapUser> users)
         private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> users)
         {
             users.Sort((a, b) => a.Description == b.Description
-                ? a.sn.CompareTo(b.sn)
+                ? a.surName.CompareTo(b.surName)
                 : a.Description.CompareTo(b.Description));
             return users;
         }
 
         //Get the root to start our ldap query - either the SVM OU in ou.ad3.ucdavis.edu for traditional security groups and SVM managed service accounts or 
         //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
+        /*
         private DirectoryEntry GetRoot(bool fromOu = false)
         {
             _logger.Info("GetRoot(" + (fromOu ? "OU" : "AD3") + ")");
@@ -432,6 +506,8 @@ private DirectoryEntry GetRoot(bool fromOu = false)
                 Path = string.Format("LDAP://{0}", start)
             };
             _logger.Warn(string.Format("Path: {0}", de.Path));
+
+            
             return de;
         }
 
@@ -447,5 +523,6 @@ private DirectoryEntry GetRootContact()
             };
             return de;
         }
+        */
     }
 }
\ No newline at end of file

From d4fb2f97c4533075b9ad085d0de30f5570b2ed46 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 26 Apr 2024 16:21:24 -0700
Subject: [PATCH 61/69] Auto accepting cert

---
 web/Areas/RAPS/Services/LdapService.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 444e214..8465045 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -101,6 +101,7 @@ public static SearchResponse SearchActiveDirectory(string searchFilter, string s
             using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_username, cred, "ou"));
             lc.SessionOptions.ProtocolVersion = 3;
             lc.SessionOptions.SecureSocketLayer = true;
+            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
             lc.Bind();
 
             var searchRequest = new SearchRequest(searchStart, searchFilter, SearchScope.Subtree, _groupProperties)
@@ -119,6 +120,7 @@ public static SearchResponse SearchLdap(string searchFilter)
             using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_ldapUsername, cred));
             lc.SessionOptions.ProtocolVersion = 3;
             lc.SessionOptions.SecureSocketLayer = true;
+            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
             lc.AuthType = AuthType.Basic;
             lc.Bind();
 

From 2848d810049b88acf5c302dc6c8ce8140bf617bb Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 26 Apr 2024 16:34:32 -0700
Subject: [PATCH 62/69] Updating connections

---
 web/Areas/RAPS/Services/LdapService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 8465045..57a3541 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -27,7 +27,7 @@ public class LdapService
         //server and start for ldap.ucdavis.edu
         private const string _ouServer = "ou.ad3.ucdavis.edu";
         private const string _ad3Server = "ad3.ucdavis.edu";
-        private const string _ldapServer = "ldap.ucdavis.edu";
+        private const string _ldapServer = "ldap.gdc.ucdavis.edu";
         private const string _ldapStart = "OU=People,DC=ucdavis,DC=edu";
         private const int _ldapSSLPort = 636;
 
@@ -98,7 +98,7 @@ public static SearchResponse SearchActiveDirectory(string searchFilter, string s
                 ? new LdapDirectoryIdentifier(_ouServer, _ldapSSLPort)
                 : new LdapDirectoryIdentifier(_ad3Server, _ldapSSLPort);
             var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_username, cred, "ou"));
+            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_username, cred, "ou.ad3.ucdavis.edu"));
             lc.SessionOptions.ProtocolVersion = 3;
             lc.SessionOptions.SecureSocketLayer = true;
             lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;

From 09e59df2c4c75794df7945c7b393faf78bdcc95a Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 26 Apr 2024 16:52:54 -0700
Subject: [PATCH 63/69] Trying anon auth

---
 web/Areas/RAPS/Services/LdapService.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 57a3541..ac1749e 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -115,13 +115,13 @@ public static SearchResponse SearchActiveDirectory(string searchFilter, string s
 
         public static SearchResponse SearchLdap(string searchFilter)
         {
-            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, _ldapSSLPort);
+            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, 389);
             var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
-            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_ldapUsername, cred));
+            using var lc = new LdapConnection(ldapIdentifier);// new System.Net.NetworkCredential(_ldapUsername, cred));
             lc.SessionOptions.ProtocolVersion = 3;
-            lc.SessionOptions.SecureSocketLayer = true;
+            //lc.SessionOptions.SecureSocketLayer = true;
             lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
-            lc.AuthType = AuthType.Basic;
+            lc.AuthType = AuthType.Anonymous;
             lc.Bind();
 
             var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, _personProperties);

From e064df60e32368b610d3e38b94ba7b73109dcb2b Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 26 Apr 2024 17:03:51 -0700
Subject: [PATCH 64/69] Reverting to basic auth

---
 web/Areas/RAPS/Services/LdapService.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index ac1749e..29b6ecd 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -115,13 +115,12 @@ public static SearchResponse SearchActiveDirectory(string searchFilter, string s
 
         public static SearchResponse SearchLdap(string searchFilter)
         {
-            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, 389);
+            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, 636);
             var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
-            using var lc = new LdapConnection(ldapIdentifier);// new System.Net.NetworkCredential(_ldapUsername, cred));
+            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential("uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu", cred), AuthType.Basic);
             lc.SessionOptions.ProtocolVersion = 3;
-            //lc.SessionOptions.SecureSocketLayer = true;
+            lc.SessionOptions.SecureSocketLayer = true;
             lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
-            lc.AuthType = AuthType.Anonymous;
             lc.Bind();
 
             var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, _personProperties);

From f788914d729267fbf5c0d50091bae224bcc5198c Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Mon, 29 Apr 2024 14:13:32 -0700
Subject: [PATCH 65/69] Logging

---
 web/Areas/RAPS/Services/LdapService.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index 29b6ecd..fb1b26a 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -27,7 +27,7 @@ public class LdapService
         //server and start for ldap.ucdavis.edu
         private const string _ouServer = "ou.ad3.ucdavis.edu";
         private const string _ad3Server = "ad3.ucdavis.edu";
-        private const string _ldapServer = "ldap.gdc.ucdavis.edu";
+        private const string _ldapServer = "ldap.ucdavis.edu";
         private const string _ldapStart = "OU=People,DC=ucdavis,DC=edu";
         private const int _ldapSSLPort = 636;
 
@@ -117,10 +117,20 @@ public static SearchResponse SearchLdap(string searchFilter)
         {
             var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, 636);
             var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
-            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential("uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu", cred), AuthType.Basic);
+            using var lc = new LdapConnection(ldapIdentifier, 
+                    new System.Net.NetworkCredential("uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu", cred), 
+                    AuthType.Basic);
             lc.SessionOptions.ProtocolVersion = 3;
             lc.SessionOptions.SecureSocketLayer = true;
-            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
+            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) =>
+            {
+                var _logger = LogManager.GetCurrentClassLogger();
+                _logger.Info(certificate.Issuer);
+                _logger.Info(certificate.Subject);
+                _logger.Info(connection.SessionOptions.HostName);
+                _logger.Info(connection.SessionOptions.HostReachable.ToString());
+                return true;
+            };
             lc.Bind();
 
             var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, _personProperties);

From aee19586889d95fb379bbff2864a18cf6863cddd Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Wed, 1 May 2024 14:48:53 -0700
Subject: [PATCH 66/69] Renaming logger so only things explicitly logged to it
 are written to the file

---
 web/Areas/RAPS/Services/LdapService.cs | 48 ++------------------------
 web/nlog.config                        |  2 +-
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
index fb1b26a..0f581e6 100644
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ b/web/Areas/RAPS/Services/LdapService.cs
@@ -2,10 +2,7 @@
 using System.DirectoryServices.AccountManagement;
 using Viper.Areas.RAPS.Models;
 using NLog;
-using Amazon.Runtime.Internal.Transform;
 using System.DirectoryServices.Protocols;
-using AngleSharp.Html;
-using AngleSharp.Html.Dom.Events;
 
 namespace Viper.Areas.RAPS.Services
 {
@@ -18,8 +15,6 @@ public class LdapService
         //username for ldap.ucdavis.edu
         private const string _ldapUsername = "UID=vetmed,OU=Special Users,DC=ucdavis,DC=edu";
 
-        private Logger _logger;
-
         //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
         private const string _ouStart = "OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
         private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
@@ -89,7 +84,7 @@ public class LdapService
         };
 
         public LdapService() {
-            _logger = LogManager.GetCurrentClassLogger();
+            
         }
 
         public static SearchResponse SearchActiveDirectory(string searchFilter, string searchStart, bool ou = false)
@@ -106,7 +101,7 @@ public static SearchResponse SearchActiveDirectory(string searchFilter, string s
 
             var searchRequest = new SearchRequest(searchStart, searchFilter, SearchScope.Subtree, _groupProperties)
             {
-                SizeLimit = 1000                
+                SizeLimit = 1000
             };
 
             var response = (SearchResponse)lc.SendRequest(searchRequest);
@@ -122,15 +117,7 @@ public static SearchResponse SearchLdap(string searchFilter)
                     AuthType.Basic);
             lc.SessionOptions.ProtocolVersion = 3;
             lc.SessionOptions.SecureSocketLayer = true;
-            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) =>
-            {
-                var _logger = LogManager.GetCurrentClassLogger();
-                _logger.Info(certificate.Issuer);
-                _logger.Info(certificate.Subject);
-                _logger.Info(connection.SessionOptions.HostName);
-                _logger.Info(connection.SessionOptions.HostReachable.ToString());
-                return true;
-            };
+            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
             lc.Bind();
 
             var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, _personProperties);
@@ -159,35 +146,6 @@ public List<LdapGroup> GetGroups(string? name = null)
                 groups.Add(new LdapGroup(e));
             }
 
-            /*
-            try
-            {
-                var de = GetRoot(true);
-                if (de.Options != null)
-                {
-                    _logger.Info("Setting DE Referral");
-                    de.Options.Referral = ReferralChasingOption.All;
-                }
-                var ds = new DirectorySearcher(de, filter, _groupProperties, SearchScope.Subtree)
-                    { ReferralChasing = ReferralChasingOption.All };
-
-                SearchResultCollection results = ds.FindAll();
-                foreach (SearchResult result in results)
-                {
-                    groups.Add(new LdapGroup(result));
-                }
-                groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
-            }
-            catch (DirectoryServicesCOMException cex)
-            {
-                _logger.Error(cex);
-                _logger.Error("Extended Error: " + cex?.ExtendedErrorMessage);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex);
-            }
-            */
             groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
             return groups;
         }
diff --git a/web/nlog.config b/web/nlog.config
index 91f00fc..6c63edd 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -93,7 +93,7 @@
     </logger>
 
 	<!--Log to debug file in dev and test-->
-	<logger name="*" minlevel="Info" maxlevel="Info" writeTo="debugFile">
+	<logger name="TestLog" minlevel="Debug" writeTo="debugFile">
 		<filters defaultAction='Log'>
 			<when condition="contains('${currentEnviroment}','Production')" action="Ignore" />
 		</filters>

From 8f85a7e69ad7da6ee9e27c49576d53f78c8f9559 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 31 May 2024 16:05:19 -0700
Subject: [PATCH 67/69] Splitting UCD LDAP and Active Directory functions into
 separate classes in the Utilities folder. Updating LDAP result properties to
 match properties from CF directory code.

---
 .../Controllers/DirectoryController.cs        |   5 +-
 .../Models/IndividualSearchResult.cs          |  20 +-
 .../Models/IndividualSearchResultCreator.cs   |  14 +-
 .../Models/IndividualSearchResultWithIDs.cs   |  20 +-
 .../RAPS/Controllers/AdGroupsController.cs    |   5 +-
 web/Areas/RAPS/Controllers/RAPSController.cs  |  14 +-
 web/Areas/RAPS/Models/LdapGroup.cs            |  29 -
 web/Areas/RAPS/Models/LdapUser.cs             |  63 ++-
 web/Areas/RAPS/Models/LdapUserContact.cs      |  72 ++-
 web/Areas/RAPS/Services/LdapService.cs        | 497 ------------------
 web/Areas/RAPS/Services/OuGroupService.cs     |  15 +-
 web/Areas/RAPS/Services/UinformService.cs     |   4 -
 .../Utilities/ActiveDirectoryService.cs       | 302 +++++++++++
 web/Classes/Utilities/LdapService.cs          | 176 +++++++
 14 files changed, 596 insertions(+), 640 deletions(-)
 delete mode 100644 web/Areas/RAPS/Services/LdapService.cs
 create mode 100644 web/Classes/Utilities/ActiveDirectoryService.cs
 create mode 100644 web/Classes/Utilities/LdapService.cs

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index c151081..b91309f 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -11,6 +11,7 @@
 using System.Runtime.Versioning;
 using System.Collections.Generic;
 using Viper.Areas.Directory.Services;
+using Viper.Classes.Utilities;
 
 namespace Viper.Areas.Directory.Controllers
 {
@@ -105,7 +106,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> Get(string
         public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(string search)
         {
             List<IndividualSearchResult> results = new();
-            List<LdapUserContact> ldap = new LdapService().GetUsersContact(search);
+            List<LdapUserContact> ldap = LdapService.GetUsersContact(search);
             var individuals = await _aaud.AaudUsers
                     .Where(u => (u.DisplayFirstName + " " + u.DisplayLastName).Contains(search)
                         || (u.MailId != null && u.MailId.Contains(search))
@@ -124,7 +125,7 @@ public async Task<ActionResult<IEnumerable<IndividualSearchResult>>> GetUCD(stri
             bool hasDetailPermission = UserHelper.HasPermission(_rapsContext, currentUser, "SVMSecure.DirectoryDetail");
             foreach (var l in ldap)
             {
-                AaudUser? userInfo = individuals.Find(m => m.IamId == l.ucdpersoniamid);
+                AaudUser? userInfo = individuals.Find(m => m.IamId == l.UcdPersonIamId);
                 results.Add(hasDetailPermission
                     ? new IndividualSearchResultWithIDs(userInfo, l)
                     : new IndividualSearchResult(userInfo, l));
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 694e5d2..32252cb 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -87,21 +87,21 @@ public IndividualSearchResult(AaudUser? aaudUser, LdapUserContact? ldapUserConta
             }
             if (ldapUserContact != null)
             {
-                Title = ldapUserContact.title;
-                Department = ldapUserContact.department;
-                Phone = ldapUserContact.telephonenumber;
-                Mobile = ldapUserContact.mobile;
-                UserName = ldapUserContact.uid;
-                PostalAddress = (ldapUserContact.postaladdress ?? "").Replace("$", '\n'.ToString());
-                UCDAffiliation = ldapUserContact.ucdpersonaffiliation;
-                UCDPersonUUID = ldapUserContact.ucdpersonuuid;
+                Title = ldapUserContact.Title;
+                //Department = ldapUserContact.Department;
+                Phone = ldapUserContact.TelephoneNumber;
+                Mobile = ldapUserContact.Mobile;
+                UserName = ldapUserContact.Uid;
+                PostalAddress = (ldapUserContact.PostalAddress ?? "").Replace("$", '\n'.ToString());
+                UCDAffiliation = ldapUserContact.UcdPersonAffiliation;
+                UCDPersonUUID = ldapUserContact.UcdPersonUuid;
                 if (string.IsNullOrEmpty(DisplayFullName))
                 {
-                    DisplayFullName = ldapUserContact.displayname;
+                    DisplayFullName = ldapUserContact.DisplayName;
                 }
                 if (string.IsNullOrEmpty(Name))
                 {
-                    Name = ldapUserContact.displayname;
+                    Name = ldapUserContact.DisplayName;
                 }
             }
 
diff --git a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
index 40a691c..ee34b73 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
@@ -81,18 +81,18 @@ private static void AddIds(IndividualSearchResultWithIDs indiv, AaudUser aaudUse
         [SupportedOSPlatform("windows")]
         private static void AddLdapContact(IndividualSearchResult indiv, LdapUserContact ldapUserContact)
         {
-            indiv.Title = ldapUserContact.title;
-            indiv.Department = ldapUserContact.department;
-            indiv.Phone = ldapUserContact.phone;
-            indiv.Mobile = ldapUserContact.mobile;
-            indiv.UserName = ldapUserContact.username;
+            indiv.Title = ldapUserContact.Title;
+            indiv.Department = ldapUserContact.Ou;
+            indiv.Phone = ldapUserContact.TelephoneNumber;
+            indiv.Mobile = ldapUserContact.Mobile;
+            indiv.UserName = ldapUserContact.Uid;
             if(string.IsNullOrEmpty(indiv.DisplayFullName))
             {
-                indiv.DisplayFullName = ldapUserContact.displayname;
+                indiv.DisplayFullName = ldapUserContact.DisplayName;
             }
             if(string.IsNullOrEmpty(indiv.Name))
             {
-                indiv.Name = ldapUserContact.displayname;
+                indiv.Name = ldapUserContact.DisplayName;
             }
         }
     }
diff --git a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
index d46d331..a0cc0fc 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
@@ -40,21 +40,21 @@ public IndividualSearchResultWithIDs(AaudUser? aaudUser, LdapUserContact? ldapUs
             }
             else if(ldapUserContact != null)
             {
-                Title = ldapUserContact.title;
-                Department = ldapUserContact.department;
-                Phone = ldapUserContact.telephonenumber;
-                Mobile = ldapUserContact.mobile;
-                UserName = ldapUserContact.uid;
-                PostalAddress = (ldapUserContact.postaladdress ?? "").Replace("$", '\n'.ToString());
-                UCDAffiliation = ldapUserContact.ucdpersonaffiliation;
-                UCDPersonUUID = ldapUserContact.ucdpersonuuid;
+                Title = ldapUserContact.Title;
+                Department = ldapUserContact.Ou;
+                Phone = ldapUserContact.TelephoneNumber;
+                Mobile = ldapUserContact.Mobile;
+                UserName = ldapUserContact.Uid;
+                PostalAddress = (ldapUserContact.PostalAddress ?? "").Replace("$", '\n'.ToString());
+                UCDAffiliation = ldapUserContact.UcdPersonAffiliation;
+                UCDPersonUUID = ldapUserContact.UcdPersonUuid;
                 if (string.IsNullOrEmpty(DisplayFullName))
                 {
-                    DisplayFullName = ldapUserContact.displayname;
+                    DisplayFullName = ldapUserContact.DisplayName;
                 }
                 if (string.IsNullOrEmpty(Name))
                 {
-                    Name = ldapUserContact.displayname;
+                    Name = ldapUserContact.DisplayName;
                 }
             }
         }
diff --git a/web/Areas/RAPS/Controllers/AdGroupsController.cs b/web/Areas/RAPS/Controllers/AdGroupsController.cs
index ded929d..7357e0e 100644
--- a/web/Areas/RAPS/Controllers/AdGroupsController.cs
+++ b/web/Areas/RAPS/Controllers/AdGroupsController.cs
@@ -2,14 +2,13 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using System.Data;
-using System.Runtime.Loader;
 using System.Runtime.Versioning;
-using System.Text.RegularExpressions;
 using Viper.Areas.RAPS.Models;
 using Viper.Areas.RAPS.Models.Uinform;
 using Viper.Areas.RAPS.Services;
 using Viper.Classes;
 using Viper.Classes.SQLContext;
+using Viper.Classes.Utilities;
 using Viper.Models.RAPS;
 using Web.Authorization;
 
@@ -64,7 +63,7 @@ public AdGroupsController(RAPSContext context)
         [HttpGet("OU")]
         public ActionResult<LdapGroup> GetLdapGroups()
         {
-            List<LdapGroup> ouGroups = new LdapService().GetGroups();
+            List<LdapGroup> ouGroups = ActiveDirectoryService.GetGroups();
             return Ok(ouGroups);
         }
 
diff --git a/web/Areas/RAPS/Controllers/RAPSController.cs b/web/Areas/RAPS/Controllers/RAPSController.cs
index c572b42..50930c8 100644
--- a/web/Areas/RAPS/Controllers/RAPSController.cs
+++ b/web/Areas/RAPS/Controllers/RAPSController.cs
@@ -9,6 +9,7 @@
 using System.Runtime.Versioning;
 using Microsoft.AspNetCore.Mvc.Filters;
 using System.Data;
+using Viper.Classes.Utilities;
 
 namespace Viper.Areas.RAPS.Controllers
 {
@@ -85,19 +86,6 @@ public async Task<ActionResult> Index(string? instance)
                 "VIPERFORMS" => await Task.Run(() => Redirect(string.Format("~/raps/ViperForms/rolelist"))),
                 _ => await Task.Run(() => View("~/Views/Home/403.cshtml")),
             };
-
-
-            //var data = await _RAPSContext.TblRoles.ToListAsync();
-            //var skipList = new List<string> { "Description" };
-            //var altColumnNames = new List<Tuple<string, string>> { new Tuple<string, string>("ViewName","Viewer") };
-
-            //ViewData["Columns"] = VueTableDefaultViewComponent.GetDefaultColumnNames(data, skipList, altColumnNames);
-            //ViewData["Rows"] = VueTableDefaultViewComponent.GetDefaultRows(data, skipList);
-            //ViewData["VisibleColumns"] = VueTableDefaultViewComponent.GetDefaultVisibleColumns(data, skipList);
-
-            //return _RAPSContext.TblRoles != null ?
-            //            View("~/Areas/RAPS/Views/Index.cshtml", data) :
-            //            Problem("Entity set 'RAPSContext.TblRoles'  is null.");}
         }
 
         public async Task<NavMenu> Nav(int? roleId, int? permissionId, string? memberId, string instance = "VIPER", string page = "")
diff --git a/web/Areas/RAPS/Models/LdapGroup.cs b/web/Areas/RAPS/Models/LdapGroup.cs
index 3878831..c7788f9 100644
--- a/web/Areas/RAPS/Models/LdapGroup.cs
+++ b/web/Areas/RAPS/Models/LdapGroup.cs
@@ -21,35 +21,6 @@ public class LdapGroup
         public string ExtensionAttribute3 { get; set; } = null!;
 
         public LdapGroup() { }
-        public LdapGroup(SearchResult? ldapSearchResult)
-        {
-            if(ldapSearchResult != null) {
-                foreach (System.Collections.DictionaryEntry prop in ldapSearchResult.Properties)
-                {
-                    if(prop.Value != null)
-                    {
-                        var v = ((ResultPropertyValueCollection)prop.Value)[0];
-                        switch (prop.Key.ToString())
-                        {
-                            case "samaccountname": SamAccountName = v.ToString(); break;
-                            case "objectguid": ObjectGuid = (byte[])v; break;
-                            case "cn": Cn = v.ToString(); break;
-                            case "canonicalname": CanonicalName = v.ToString(); break;
-                            case "dn": Dn = v.ToString(); break;
-                            case "distinguishedname": DistinguishedName = v.ToString(); break;
-                            case "displayname": DisplayName = v.ToString(); break;
-                            case "grouptype": GroupType = v.ToString(); break;
-                            case "description": Description = v.ToString(); break;
-                            case "extensionattribute1": ExtensionAttribute1 = v.ToString(); break;
-                            case "extensionattribute2": ExtensionAttribute2 = v.ToString(); break;
-                            case "extensionattribute3": ExtensionAttribute3 = v.ToString(); break;
-                            default: break;
-                        }
-
-                    }
-                }
-            }
-        }
 
         public LdapGroup(SearchResultEntry entry)
         {
diff --git a/web/Areas/RAPS/Models/LdapUser.cs b/web/Areas/RAPS/Models/LdapUser.cs
index efd4511..34b7577 100644
--- a/web/Areas/RAPS/Models/LdapUser.cs
+++ b/web/Areas/RAPS/Models/LdapUser.cs
@@ -1,5 +1,4 @@
-using System.DirectoryServices;
-using System.Linq.Dynamic.Core;
+using System.DirectoryServices.Protocols;
 using System.Runtime.Versioning;
 
 namespace Viper.Areas.RAPS.Models
@@ -19,46 +18,44 @@ public class LdapUser
         public string Description { get; set; } = "";
         public string UserPrincipalName { get; set; } = null!;
         public string Title { get; set; } = null!;
-        public string Department { get; set; } = null!; 
+        public string Department { get; set; } = null!;
         public string UidNumber { get; set; } = null!;
         public string MemberOf { get; set; } = null!;
 
         public LdapUser() { }
-        public LdapUser(SearchResult? ldapSearchResult)
+        public LdapUser(SearchResultEntry? ldapSearchResult)
         {
             if (ldapSearchResult != null)
             {
-                foreach (System.Collections.DictionaryEntry prop in ldapSearchResult.Properties)
+                foreach (DirectoryAttribute attr in ldapSearchResult.Attributes.Values)
                 {
-                    if (prop.Value != null)
+                    var v = attr[0];
+                    switch (attr.Name)
                     {
-                        var v = ((ResultPropertyValueCollection)prop.Value);
-                        switch (prop.Key.ToString())
-                        {
-                            case "samaccountname": SamAccountName = v[0].ToString(); break;
-                            case "objectguid": ObjectGuid = (byte[])v[0]; break;
-                            case "cn": Cn = v[0].ToString(); break;
-                            case "canonicalname": CanonicalName = v[0].ToString(); break;
-                            case "dn": Dn = v[0].ToString(); break;
-                            case "distinguishedname": DistinguishedName = v[0].ToString(); break;
-                            case "givenname": GivenName = v[0].ToString(); break;
-                            case "sn": Sn = v[0].ToString(); break;
-                            case "displayname": DisplayName = v[0].ToString(); break;
-                            case "description": Description = v[0].ToString(); break;
-                            case "userprincipalname": UserPrincipalName = v[0].ToString(); break;
-                            case "title": Title = v[0].ToString(); break;
-                            case "department": Department = v[0].ToString(); break;
-                            case "uidNumber": UidNumber = v[0].ToString(); break;
-                            case "memberof":
-                                List<string> groups = new();
-                                foreach (string group in v)
-                                {
-                                    groups.Add(group);
-                                }
-                                MemberOf = string.Join(",", groups); break;
-                            default: break;
-                        }
-
+                        case "sAMAaccountName": SamAccountName = v.ToString(); break;
+                        case "objectGUID": ObjectGuid = (byte[])v; break;
+                        case "cn": Cn = v.ToString(); break;
+                        case "canonicalName": CanonicalName = v.ToString(); break;
+                        case "dn": Dn = v.ToString(); break;
+                        case "distinguishedName": DistinguishedName = v.ToString(); break;
+                        case "givenName": GivenName = v.ToString(); break;
+                        case "sn": Sn = v.ToString(); break;
+                        case "displayName": DisplayName = v.ToString(); break;
+                        case "description": Description = v.ToString(); break;
+                        case "userPrincipalName": UserPrincipalName = v.ToString(); break;
+                        case "title": Title = v.ToString(); break;
+                        case "department": Department = v.ToString(); break;
+                        case "uidNumber": UidNumber = v.ToString(); break;
+                        
+                        case "memberOf":
+                            List<string> groups = new();
+                            foreach (string group in attr.GetValues(typeof(string)))
+                            {
+                                groups.Add(group);
+                            }
+                            MemberOf = string.Join(",", groups); 
+                            break;
+                        default: break;
                     }
                 }
             }
diff --git a/web/Areas/RAPS/Models/LdapUserContact.cs b/web/Areas/RAPS/Models/LdapUserContact.cs
index 1470bc4..1018c47 100644
--- a/web/Areas/RAPS/Models/LdapUserContact.cs
+++ b/web/Areas/RAPS/Models/LdapUserContact.cs
@@ -4,6 +4,7 @@
 using System.Linq.Dynamic.Core;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
+using System.Security.Cryptography;
 using System.Text.Json;
 
 namespace Viper.Areas.RAPS.Models
@@ -11,6 +12,29 @@ namespace Viper.Areas.RAPS.Models
     [SupportedOSPlatform("windows")]
     public class LdapUserContact
     {
+        public string Uid { get; set; } = null!;
+        public string SamAccountName { get; set; } = null!;
+        public string Ou { get; set; } = null!;
+        public string Sn { get; set; } = null!;
+        public string GivenName { get; set; } = null!;
+        public string MiddleName { get; set; } = null!;
+        public string DisplayName { get; set; } = null!;
+        public string EduPersonNickname { get; set; } = null!;
+        public string Title { get; set; } = null!;
+        public string PostalAddress { get; set; } = null!;
+        public string TelephoneNumber { get; set; } = null!;
+        public string Mobile { get; set; } = null!;
+        public string Mail { get; set; } = null!;
+        public string UcdStudentLevel { get; set; } = null!;
+        public string UcdStudentSid { get; set; } = null!;
+        public string UcdPersonPidm { get; set; } = null!;
+        public string EmployeeNumber { get; set; } = null!;
+        public string UcdPersonUuid { get; set; } = null!;
+        public string UcdPersonIamId { get; set; } = null!;
+        public string UcdPersonAffiliation { get; set; } = null!;
+
+        /*
+            
         public string? middlename { get; set; } = null!;
         public string? eduPersonNickname { get; set; } = null!;
         public string? ucdStudentLevel { get; set; } = null!;
@@ -129,7 +153,12 @@ public class LdapUserContact
         public string? whenchanged { get; set; } = null!;
         public string? whencreated { get; set; } = null!;
         public string originalObject { get; set; } = null!;
+
+        */
+
         public LdapUserContact() { }
+
+        /*
         public LdapUserContact(SearchResult? ldapSearchResult)
         {
             if (ldapSearchResult != null)
@@ -264,13 +293,8 @@ public LdapUserContact(SearchResult? ldapSearchResult)
                 }
             }
         }
+        */
 
-        //u.mailID = "";
-        //        u.email = row.mail;
-        //        u.name = row.displayname;
-        //        u.givenName = (len(row?.eduPersonNickname) > 0 ? row.eduPersonNickname : row.givenName);
-        //        u.surName = row.sn;
-        //        u.middlename = row.middlename;
         public LdapUserContact(SearchResultEntry entry)
         {
             foreach (DirectoryAttribute attr in entry.Attributes.Values)
@@ -278,27 +302,29 @@ public LdapUserContact(SearchResultEntry entry)
                 var v = attr[0];
                 switch (attr.Name)
                 {
+                    case "uid": Uid = v.ToString(); break;
                     case "sAMAccountName": SamAccountName = v.ToString(); break;
-                    case "sn": surName = v.ToString(); break;
+                    case "sn": Sn = v.ToString(); break;
+                    case "ou": Ou = v.ToString(); break;
 
-                    case "givenName": givenname = v.ToString(); break;
-                    case "middlename": middlename = v.ToString(); break;
-                    case "displayName": displayname = v.ToString(); break;
-                    case "eduPersonNickname": eduPersonNickname = v.ToString(); break;
+                    case "givenName": GivenName = v.ToString(); break;
+                    case "middleName": MiddleName = v.ToString(); break;
+                    case "displayName": DisplayName = v.ToString(); break;
+                    case "eduPersonNickname": EduPersonNickname = v.ToString(); break;
 
-                    case "title": title = v.ToString(); break;
-                    case "postalAddress": postaladdress = v.ToString(); break;
-                    case "telephoneNumber": telephonenumber = v.ToString(); break;
-                    case "mobile": mobile = v.ToString(); break;
-                    case "mail": mail = v.ToString(); break;
+                    case "title": Title = v.ToString(); break;
+                    case "postalAddress": PostalAddress = v.ToString(); break;
+                    case "telephoneNumber": TelephoneNumber = v.ToString(); break;
+                    case "mobile": Mobile = v.ToString(); break;
+                    case "mail": Mail = v.ToString(); break;
 
-                    case "ucdStudentLevel": ucdStudentLevel = v.ToString(); break;
-                    case "ucdStudentSID": ucdStudentSID = v.ToString(); break;
-                    case "ucdPersonPIDM": ucdPersonPIDM = v.ToString(); break;
-                    case "employeeNumber": employeeNumber = v.ToString(); break;
-                    case "ucdPersonUUID": ucdPersonUUID = v.ToString(); break;
-                    case "ucdPersonIAMID": ucdPersonIAMID = v.ToString(); break;
-                    case "ucdPersonAffiliation": ucdPersonAffiliation = v.ToString(); break;
+                    case "ucdStudentLevel": UcdStudentLevel = v.ToString(); break;
+                    case "ucdStudentSID": UcdStudentSid = v.ToString(); break;
+                    case "ucdPersonPIDM": UcdPersonPidm = v.ToString(); break;
+                    case "employeeNumber": EmployeeNumber = v.ToString(); break;
+                    case "ucdPersonUUID": UcdPersonUuid = v.ToString(); break;
+                    case "ucdPersonIAMID": UcdPersonIamId = v.ToString(); break;
+                    case "ucdPersonAffiliation": UcdPersonAffiliation = v.ToString(); break;
                    
                     default: break;
                 }
diff --git a/web/Areas/RAPS/Services/LdapService.cs b/web/Areas/RAPS/Services/LdapService.cs
deleted file mode 100644
index 0f581e6..0000000
--- a/web/Areas/RAPS/Services/LdapService.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-using System.Runtime.Versioning;
-using System.DirectoryServices.AccountManagement;
-using Viper.Areas.RAPS.Models;
-using NLog;
-using System.DirectoryServices.Protocols;
-
-namespace Viper.Areas.RAPS.Services
-{
-    [SupportedOSPlatform("windows")]
-    public class LdapService
-    {
-        //username for campus active directory servers (ou.ad3 and ad3)
-        private const string _username = "svc-accounts";
-        //private const string _username = "CN=svc-accounts,OU=Service Accounts,OU=SVM-OU-LocalUsers,OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
-        //username for ldap.ucdavis.edu
-        private const string _ldapUsername = "UID=vetmed,OU=Special Users,DC=ucdavis,DC=edu";
-
-        //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
-        private const string _ouStart = "OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
-        private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
-        private const string _ldapUsers = "OU=People,DC=ldap,DC=ucdavis,DC=edu";
-        //server and start for ldap.ucdavis.edu
-        private const string _ouServer = "ou.ad3.ucdavis.edu";
-        private const string _ad3Server = "ad3.ucdavis.edu";
-        private const string _ldapServer = "ldap.ucdavis.edu";
-        private const string _ldapStart = "OU=People,DC=ucdavis,DC=edu";
-        private const int _ldapSSLPort = 636;
-
-        //ldap attributes/properties to return for each object type
-        private static readonly string[] _groupProperties =
-        {
-            "sAMAccountName",
-            "objectGuid",
-            "cn",
-            "canonicalName",
-            "dn",
-            "distinguishedName",
-            "displayName",
-            "groupType",
-            "description",
-            "extensionAttribute1",
-            "extensionAttribute2",
-            "extensionAttribute3"
-        };
-        private static readonly string[] _personProperties =
-        {
-            "sAMAccountName",
-            "objectGuid",
-            "cn",
-            "canonicalName",
-            "dn",
-            "distinguishedName",
-            "givenName",
-            "sn",
-            "displayName",
-            "description",
-            "mail",
-            "streetAddress",
-            "userPrincipalName",
-            "userAccountControl",
-            "title",
-            "department",
-            "company",
-            "uidNumber",
-            "memberOf",
-            "telephoneNumber",
-            "mobile",
-            "uid",
-            "employeeNumber",
-            "labeledUri",
-            "middlename",
-            "ou",
-            "postalAddress",
-            "ucdPersonAffiliation",
-            "ucdPersonIAMID",
-            "ucdPersonPIDM",
-            "ucdPersonUUID",
-            "ucdStudentLevel",
-            "ucdStudentSID"
-    };
-        private readonly string[] CFParams =
-        {
-            "accountexpires","adspath","badpasswordtime","badpwdcount","cn","codepage","company","countrycode","deliverandredirect","department","deptname","departmentnumber","Description","displayname","distinguishedname","dscorepropagationdata","edupersonaffiliation","edupersonprincipalname","employeenumber","extensionattribute10","extensionattribute11","extensionattribute12","extensionattribute13","extensionattribute14","extensionattribute15","extensionattribute5","extensionattribute6","extensionattribute7","extensionattribute8","extensionattribute9","gidnumber","givenname","instancetype","internetencoding","l","lastlogoff","lastlogon","lastlogontimestamp","legacyexchangedn","lockouttime","logoncount","mail","mailnickname","mapirecipient","memberof","mobile","msexcharchiveguid","msexcharchivename","msexcharchivestatus","msexchblockedsendershash","msexchcomanagedobjectsbl","msexchextensionattribute16","msexchextensionattribute17","msexchmailboxguid","msexchpoliciesexcluded","msexchrecipientdisplaytype","msexchrecipienttypedetails","msexchremoterecipienttype","msexchsafesendershash","msexchtextmessagingstate","msexchumdtmfmap","msexchuseraccountcontrol","msexchversion","msexchwhenmailboxcreated","name","objectcategory","objectclass","objectguid","objectsid","ou","pager","phone","physicaldeliveryofficename","postaladdress","postalcode","primarygroupid","proxyaddresses","pwdlastset","SamAccountName","samaccounttype","showinaddressbook","sn","st","street","streetaddress","targetaddress","telephonenumber","textencodedoraddress","title","ucdappointmentdepartmentcode","ucdappointmenttitlecode","ucdpersonaffiliation","ucdpersoniamid","ucdpersonnetid","ucdpersonpidm","ucdpersonppsid","ucdpersonuuid","ucdpublishitemflag","ucdstudentsid","uid","uidnumber","useraccountcontrol","username","userprincipalname","usnchanged","usncreated","whenchanged","whencreated"
-        };
-
-        public LdapService() {
-            
-        }
-
-        public static SearchResponse SearchActiveDirectory(string searchFilter, string searchStart, bool ou = false)
-        {
-            var ldapIdentifier = ou 
-                ? new LdapDirectoryIdentifier(_ouServer, _ldapSSLPort)
-                : new LdapDirectoryIdentifier(_ad3Server, _ldapSSLPort);
-            var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_username, cred, "ou.ad3.ucdavis.edu"));
-            lc.SessionOptions.ProtocolVersion = 3;
-            lc.SessionOptions.SecureSocketLayer = true;
-            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
-            lc.Bind();
-
-            var searchRequest = new SearchRequest(searchStart, searchFilter, SearchScope.Subtree, _groupProperties)
-            {
-                SizeLimit = 1000
-            };
-
-            var response = (SearchResponse)lc.SendRequest(searchRequest);
-            return response;
-        }
-
-        public static SearchResponse SearchLdap(string searchFilter)
-        {
-            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, 636);
-            var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
-            using var lc = new LdapConnection(ldapIdentifier, 
-                    new System.Net.NetworkCredential("uid=vetmed,ou=Special Users,dc=ucdavis,dc=edu", cred), 
-                    AuthType.Basic);
-            lc.SessionOptions.ProtocolVersion = 3;
-            lc.SessionOptions.SecureSocketLayer = true;
-            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
-            lc.Bind();
-
-            var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, _personProperties);
-            var response = (SearchResponse)lc.SendRequest(searchRequest);
-            return response;
-        }
-
-        /// <summary>
-        /// Get groups, optionally filtering with a wildcard match to name
-        /// </summary>
-        /// <param name="name">Partial name of group to search for</param>
-        /// <returns>List of groups</returns>
-        public List<LdapGroup> GetGroups(string? name = null)
-        {
-            string filter = "(objectClass=group)";
-            if (name != null)
-            {
-                filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
-            };
-            
-            var searchResults = SearchActiveDirectory(filter, _ouStart, true);
-            List<LdapGroup> groups = new();
-
-            foreach (SearchResultEntry e in searchResults.Entries)
-            {
-                groups.Add(new LdapGroup(e));
-            }
-
-            groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
-            return groups;
-        }
-
-        /// <summary>
-        /// Get a single group by distinguished name
-        /// </summary>
-        /// <param name="dn">Distinguished name of group</param>
-        /// <returns>The group, if found</returns>
-        public LdapGroup? GetGroup(string dn)
-        {
-            string filter = string.Format("(&(objectClass=group)(distinguishedName={0}))", dn);
-            return null;
-            /*
-            return new LdapGroup(
-                new DirectorySearcher(GetRoot(true), filter, _groupProperties, SearchScope.Subtree)
-                    .FindOne()
-            );
-            */
-        }
-
-        /// <summary>
-        /// Get users, optionally searching ou.ad3, searching by name, cn, or samAccountName
-        /// </summary>
-        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
-        /// <param name="name">display name to search for</param>
-        /// <param name="cn">canonical name to search for</param>
-        /// <param name="samAccountName">samAccountName to search for</param>
-        /// <returns>List of users</returns>
-        public List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string? cn = null, string? samAccountName = null)
-        {
-            /*
-            string filter = "(objectClass=user)";
-            string additionalFilters = "";
-            if (name != null)
-            {
-                additionalFilters += string.Format("(displayName=*{0}*)", name);
-            }
-            if (cn != null)
-            {
-                additionalFilters += string.Format("(cn=*{0}*", cn);
-            }
-            if (samAccountName != null)
-            {
-                additionalFilters += string.Format("(samAccountName=*{0}*", samAccountName);
-            }
-            if (additionalFilters.Length > 0)
-            {
-                filter = string.Format("(&{0}{1})", filter, additionalFilters);
-            }
-            SearchResultCollection results = new DirectorySearcher(GetRoot(fromOu), filter, _personProperties, SearchScope.Subtree)
-                .FindAll();
-            
-            foreach (SearchResult result in results)
-            {
-                users.Add(new LdapUser(result));
-            }
-            */
-            List<LdapUser> users = new();
-            return SortUsers(users);
-        }
-
-        /// <summary>
-        /// Get users for display\ searching by name, cn, or samAccountName
-        /// </summary>
-        /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
-        /// <returns>List of Users</returns>
-        public List<LdapUserContact> GetUsersContact(string search)
-        {
-            //string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            //DirectoryEntry de = GetRootContact();
-            //SearchResultCollection results = new DirectorySearcher(de, filter)
-            //{ SizeLimit = 1000 }
-            //    .FindAll();
-            //foreach (SearchResult result in results)
-            //{
-            //    users.Add(new LdapUserContact(result));
-            //}
-            List<LdapUserContact> users = new();
-            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            var results = SearchLdap(filter);
-
-            foreach (SearchResultEntry entry in results.Entries)
-            {
-                users.Add(new LdapUserContact(entry));
-                if(users.Count >= 100)
-                {
-                    break;
-                }
-            }
-            return SortUsersContact(users);
-        }
-
-        /// <summary>
-        /// Get users for display, optionally searching ou.ad3, searching by name, cn, or samAccountName
-        /// </summary>
-        /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
-        /// <returns>Dictionary of Users, indexed by mothraID</returns>
-        public Dictionary<string,LdapUserContact> GetUsersContactDictionary(string search)
-        {
-            //string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            //DirectoryEntry de = GetRootContact();
-            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            //{ SizeLimit = 1000 }
-            //    .FindAll();
-            //Dictionary<string,LdapUserContact> users = new();
-            //foreach (SearchResult result in results)
-            //{
-            //    users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
-            //}
-            Dictionary<string, LdapUserContact> users = new();
-            return users;
-        }
-
-        /// <summary>
-        /// Look up User by search string
-        /// </summary>
-        /// <param name="search">Search string for looking up user</param>
-        /// <returns>LdapUserContact</returns>
-        public LdapUserContact? GetUserContact(string search)
-        {
-            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
-            var results = SearchLdap(filter);
-
-            if(results.Entries.Count > 0)
-            {
-                return new LdapUserContact(results.Entries[0]);
-            }
-            //DirectoryEntry de = GetRootContact();
-            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            //{ SizeLimit = 1 }
-            //    .FindAll();
-            //foreach (SearchResult result in results)
-            //{
-            //    return new LdapUserContact(result);
-            //}
-            return null;
-        }
-
-
-        /// <summary>
-        /// Look up User by its iamID
-        /// </summary>
-        /// <param name="id">iamID for looking up user</param>
-        /// <returns>LdapUserContact</returns>
-        public LdapUserContact? GetUserByID(string? id)
-        {
-            //if (id == null) return null;
-            //string filter = string.Format("(|(ucdpersoniamid = {0}))", id);
-            //DirectoryEntry de = GetRootContact();
-            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            //{ SizeLimit = 1 }
-            //    .FindAll();
-            //foreach (SearchResult result in results)
-            //{
-            //    return new LdapUserContact(result);
-            //}
-            return null;
-        }
-
-        /// <summary>
-        /// Get dictionary of Users from a list of MothraIDs
-        /// </summary>
-        /// <param name="ids">List of MothraIDs for looking up users</param>
-        /// <returns>Dictionary of Users, indexed by mothraID</returns>
-        public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
-        {
-            //string filter = "(|";
-            //foreach (string i in ids) {
-            //    filter += string.Format("(ucdpersonuuid = {0})", i);
-            //}
-            //filter += ")";
-            //DirectoryEntry de = GetRootContact();
-            //SearchResultCollection results = new DirectorySearcher(de, filter, CFParams, SearchScope.Subtree)
-            //{ SizeLimit = 1000 }
-            //    .FindAll();
-            //Dictionary<string, LdapUserContact> users = new();
-            //foreach (SearchResult result in results)
-            //{
-            //    users.Add((string)result.Properties["ucdpersonuuid"][0], new LdapUserContact(result));
-            //}
-            //return users;
-            return new Dictionary<string, LdapUserContact>();
-        }
-
-        /// <summary>
-        /// Gets a single user from ou or ad3
-        /// </summary>
-        /// <param name="samAccountName">samAccountName of user</param>
-        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
-        /// <returns></returns>
-        public LdapUser? GetUser(string samAccountName, bool fromOu = false)
-        {
-            //return new LdapUser(
-            //    new DirectorySearcher(GetRoot(fromOu), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
-            //    .FindOne()
-            //);
-            return null;
-        }
-
-        /// <summary>
-        /// Gets a single user from ou or ad3
-        /// </summary>
-        /// <param name="samAccountName">samAccountName of user</param>
-        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
-        /// <returns></returns>
-        public LdapUserContact? GetUserContact(string? samAccountName, bool fromOu = false)
-        {
-            //return new LdapUserContact(
-            //    new DirectorySearcher(GetRootContact(), string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName), _personProperties, SearchScope.Subtree)
-            //    .FindOne()
-            //);
-            return null;
-        }
-
-        /// <summary>
-        /// Get members of a group. Group must be in ou.ad3. Members can be in either ou.ad3 or ad3
-        /// </summary>
-        /// <param name="groupDn">Distingushed name of the group</param>
-        /// <returns>List of members of the group</returns>
-        public List<LdapUser> GetGroupMembership(string groupDn)
-        {
-            List<LdapUser> users = new();
-            //string filter = string.Format("(&(objectClass=user)(memberOf={0}))", groupDn);
-
-            ////Need to get users from both AD3 and OU
-            //SearchResultCollection ouResults = new DirectorySearcher(GetRoot(true), filter, _personProperties, SearchScope.Subtree)
-            //    .FindAll();
-            //foreach (SearchResult result in ouResults)
-            //{
-            //    users.Add(new LdapUser(result));
-            //}
-
-            //SearchResultCollection ad3Results = new DirectorySearcher(GetRoot(false), filter, _personProperties, SearchScope.Subtree)
-            //{ PageSize = 1000 }
-            //    .FindAll();
-            //foreach (SearchResult result in ad3Results)
-            //{
-            //    users.Add(new LdapUser(result));
-            //}
-
-            return SortUsers(users);
-        }
-
-        /// <summary>
-        /// Add a user to a group
-        /// </summary>
-        /// <param name="userDn">The distinguished name of the user</param>
-        /// <param name="groupDn">The distinguised name of the group</param>
-        public void AddUserToGroup(string userDn, string groupDn)
-        {
-            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            try
-            {
-                using PrincipalContext ad3Pc = new(ContextType.Domain, "ad3.ucdavis.edu", _username, creds);
-                using PrincipalContext ouPc = new(ContextType.Domain, "ou.ad3.ucdavis.edu", _username, creds);
-                GroupPrincipal? group = GroupPrincipal.FindByIdentity(ouPc, IdentityType.DistinguishedName, groupDn);
-                UserPrincipal? user = UserPrincipal.FindByIdentity(ad3Pc, IdentityType.DistinguishedName, userDn);
-                if (group != null && user != null)
-                {
-                    group.Members.Add(user);
-                    group.Save();
-                }
-            }
-            catch (Exception ex)
-            {
-                HttpHelper.Logger.Error(ex);
-            }
-        }
-
-        /// <summary>
-        /// Remove a user from a group
-        /// </summary>
-        /// <param name="userDn">The distinguished name of the user</param>
-        /// <param name="groupDn">The distinguised name of the group</param>
-        public void RemoveUserFromGroup(string userDn, string groupDn)
-        {
-            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            try
-            {
-                using PrincipalContext ad3Pc = new(ContextType.Domain, "ad3.ucdavis.edu", _username, creds);
-                using PrincipalContext ouPc = new(ContextType.Domain, "ou.ad3.ucdavis.edu", _username, creds);
-                GroupPrincipal group = GroupPrincipal.FindByIdentity(ouPc, IdentityType.DistinguishedName, groupDn);
-                UserPrincipal? user = UserPrincipal.FindByIdentity(ad3Pc, IdentityType.DistinguishedName, userDn);
-                if (group != null && user != null)
-                {
-                    group.Members.Remove(user);
-                    group.Save();
-                }
-            }
-            catch (Exception ex)
-            {
-                HttpHelper.Logger.Error(ex);
-            }
-        }
-
-        //Sort users by description first, or sam account name
-        private static List<LdapUser> SortUsers(List<LdapUser> users)
-        {
-            users.Sort((a, b) => a.Description == b.Description
-                ? a.SamAccountName.CompareTo(b.SamAccountName)
-                : a.Description.CompareTo(b.Description));
-            return users;
-        }
-
-        //Sort users by description first, or sam account name
-        private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> users)
-        {
-            users.Sort((a, b) => a.Description == b.Description
-                ? a.surName.CompareTo(b.surName)
-                : a.Description.CompareTo(b.Description));
-            return users;
-        }
-
-        //Get the root to start our ldap query - either the SVM OU in ou.ad3.ucdavis.edu for traditional security groups and SVM managed service accounts or 
-        //the ucdUsers OU in ad3.ucdavis.edu for campus user accounts
-        /*
-        private DirectoryEntry GetRoot(bool fromOu = false)
-        {
-            _logger.Info("GetRoot(" + (fromOu ? "OU" : "AD3") + ")");
-            string start = fromOu ? _ouStart : _ad3Users;
-            string server = fromOu ? _ouServer : _ad3Server;
-            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
-            _logger.Warn(string.Format("GetRoot Connection: {0} {1} {2}", server, start, _username));
-            DirectoryEntry de = new DirectoryEntry(server, _username, creds, AuthenticationTypes.Secure)
-            {
-                Path = string.Format("LDAP://{0}", start)
-            };
-            _logger.Warn(string.Format("Path: {0}", de.Path));
-
-            
-            return de;
-        }
-
-        //Get the root to start our ldap.ucdavis.edu query
-        private DirectoryEntry GetRootContact()
-        {
-            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
-            string serverAndStart = string.Format("LDAP://{0}/{1}", _ldapServer, _ldapStart);
-            //We have to initialize the DirectoryEntry object using just the server, and then change the path to the server + start OU
-            DirectoryEntry de = new(_ldapServer, _ldapUsername, creds, AuthenticationTypes.SecureSocketsLayer)
-            {
-                Path = serverAndStart
-            };
-            return de;
-        }
-        */
-    }
-}
\ No newline at end of file
diff --git a/web/Areas/RAPS/Services/OuGroupService.cs b/web/Areas/RAPS/Services/OuGroupService.cs
index 50716fc..c95fcc9 100644
--- a/web/Areas/RAPS/Services/OuGroupService.cs
+++ b/web/Areas/RAPS/Services/OuGroupService.cs
@@ -1,13 +1,12 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using NLog;
-using NuGet.Protocol.Plugins;
-using Polly;
 using System.Linq.Dynamic.Core;
 using System.Runtime.Versioning;
 using Viper.Areas.RAPS.Models;
 using Viper.Areas.RAPS.Models.Uinform;
 using Viper.Classes.SQLContext;
+using Viper.Classes.Utilities;
 using Viper.Models.RAPS;
 using static Viper.Areas.RAPS.Services.RAPSAuditService;
 
@@ -18,7 +17,6 @@ public class OuGroupService
     {
         private readonly RAPSContext _context;
         private readonly RAPSAuditService _auditService;
-        private readonly LdapService _ldapService;
         private readonly UinformService _uInformService;
 
         private const string _exceptionRolePrefix = "RAPS.Groups.";
@@ -30,7 +28,6 @@ public OuGroupService(RAPSContext context)
             _context = context;
             _auditService = new RAPSAuditService(_context);
             _uInformService = new();
-            _ldapService = new();
         }
         
         /// <summary>
@@ -49,7 +46,7 @@ public async Task<List<Group>> GetAllGroups(string? search)
             List<LdapGroup> ldapGroups = new();
             try
             {
-                _ldapService.GetGroups();
+                ActiveDirectoryService.GetGroups();
             }
             catch (Exception ex)
             {
@@ -268,7 +265,7 @@ private async Task CompareToGroup(string groupName, List<GroupMember> members)
             //For OU groups, use LdapService to get members
             if (IsOuGroup(groupName))
             {
-                List<LdapUser> usersInGroup = _ldapService.GetGroupMembership(groupName);
+                List<LdapUser> usersInGroup = ActiveDirectoryService.GetGroupMembership(groupName);
                 foreach (LdapUser user in usersInGroup)
                 {
                     //Record this user is in the group
@@ -364,7 +361,7 @@ private void UpdateOuGroupMember(string groupName, string loginId, bool add)
             }
             if(dn == null)
             {
-                dn = _ldapService.GetUser(loginId)?.DistinguishedName;
+                dn = ActiveDirectoryService.GetUser(loginId)?.DistinguishedName;
                 HttpHelper.Cache?.Set("ou.ad3-distinguishedname-" + loginId, dn, new TimeSpan(0, 20, 0));
             }
             
@@ -372,11 +369,11 @@ private void UpdateOuGroupMember(string groupName, string loginId, bool add)
             {
                 if (add)
                 {
-                    _ldapService.AddUserToGroup(dn, groupName);
+                    ActiveDirectoryService.AddUserToGroup(dn, groupName);
                 }
                 else
                 {
-                    _ldapService.RemoveUserFromGroup(dn, groupName);
+                    ActiveDirectoryService.RemoveUserFromGroup(dn, groupName);
                 }
                 
             }
diff --git a/web/Areas/RAPS/Services/UinformService.cs b/web/Areas/RAPS/Services/UinformService.cs
index 6e4e602..fa78a1c 100644
--- a/web/Areas/RAPS/Services/UinformService.cs
+++ b/web/Areas/RAPS/Services/UinformService.cs
@@ -1,12 +1,8 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using NuGet.Protocol;
-using System;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.Json;
 using Viper.Areas.RAPS.Models.Uinform;
-using Viper.Classes.Utilities;
 
 namespace Viper.Areas.RAPS.Services
 {
diff --git a/web/Classes/Utilities/ActiveDirectoryService.cs b/web/Classes/Utilities/ActiveDirectoryService.cs
new file mode 100644
index 0000000..fddeef6
--- /dev/null
+++ b/web/Classes/Utilities/ActiveDirectoryService.cs
@@ -0,0 +1,302 @@
+using System.DirectoryServices.AccountManagement;
+using System.DirectoryServices.Protocols;
+using System.Runtime.Versioning;
+using Viper.Areas.RAPS.Models;
+
+namespace Viper.Classes.Utilities
+{
+    [SupportedOSPlatform("windows")]
+    public class ActiveDirectoryService
+    {
+        //username for campus active directory servers (ou.ad3 and ad3)
+        //private const string _username = "CN=svc-accounts,OU=Service Accounts,OU=SVM-OU-LocalUsers,OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _username = "svc-accounts";
+
+        //Start OUs for ou.ad3 (old-style groups and service accounts) and ad3 (users and api managed groups)
+        private const string _ouStart = "OU=SVM,OU=DEPARTMENTS,DC=ou,DC=ad3,DC=ucdavis,DC=edu";
+        private const string _ad3Users = "OU=ucdUsers,DC=ad3,DC=ucdavis,DC=edu";
+        //server and start for ldap.ucdavis.edu
+        private const string _ouServer = "ou.ad3.ucdavis.edu";
+        private const string _ad3Server = "ad3.ucdavis.edu";
+
+        private const int port = 636;
+        //ldap attributes/properties to return for each object type
+        private static readonly string[] _groupProperties =
+        {
+            "sAMAccountName",
+            "objectGuid",
+            "cn",
+            "canonicalName",
+            "dn",
+            "distinguishedName",
+            "displayName",
+            "groupType",
+            "description",
+            "extensionAttribute1",
+            "extensionAttribute2",
+            "extensionAttribute3"
+        };
+        private static readonly string[] _personProperties =
+        {
+            "sAMAccountName",
+            "objectGuid",
+            "cn",
+            "canonicalName",
+            "dn",
+            "distinguishedName",
+            "givenName",
+            "sn",
+            "displayName",
+            "description",
+            "mail",
+            "streetAddress",
+            "userPrincipalName",
+            "userAccountControl",
+            "title",
+            "department",
+            "company",
+            "uidNumber",
+            "memberOf",
+            "telephoneNumber",
+            "mobile",
+            "uid",
+            "employeeNumber",
+            "labeledUri",
+            "middlename",
+            "ou",
+            "postalAddress",
+            "ucdPersonAffiliation",
+            "ucdPersonIAMID",
+            "ucdPersonPIDM",
+            "ucdPersonUUID",
+            "ucdStudentLevel",
+            "ucdStudentSID"
+        };
+
+        private enum Server {
+            AD3,
+            OU
+        }
+
+        private enum ObjectType
+        {
+            Person,
+            Group
+        }
+
+        /// <summary>
+        /// Get groups, optionally filtering with a wildcard match to name
+        /// </summary>
+        /// <param name="name">Partial name of group to search for</param>
+        /// <returns>List of groups</returns>
+        public static List<LdapGroup> GetGroups(string? name = null)
+        {
+            string filter = "(objectClass=group)";
+            if (name != null)
+            {
+                filter = string.Format("(&{0}(cn=*{1}*))", filter, name);
+            };
+
+            var searchResults = SearchActiveDirectory(filter, Server.OU, ObjectType.Group);
+            List<LdapGroup> groups = new();
+
+            foreach (SearchResultEntry e in searchResults.Entries)
+            {
+                groups.Add(new LdapGroup(e));
+            }
+
+            groups.Sort((g1, g2) => g1.DistinguishedName.CompareTo(g2.DistinguishedName));
+            return groups;
+        }
+
+        /// <summary>
+        /// Get a single group by distinguished name
+        /// </summary>
+        /// <param name="dn">Distinguished name of group</param>
+        /// <returns>The group, if found</returns>
+        public static LdapGroup? GetGroup(string dn)
+        {
+            string filter = string.Format("(&(objectClass=group)(distinguishedName={0}))", dn);
+            var searchResults = SearchActiveDirectory(filter, Server.OU, ObjectType.Group);
+            LdapGroup? group = null;
+            if (searchResults.Entries.Count == 1)
+            {
+                group = new LdapGroup(searchResults.Entries[0]);
+            }
+
+            return group;
+        }
+
+        /// <summary>
+        /// Get users, optionally searching ou.ad3, searching by name, cn, or samAccountName
+        /// </summary>
+        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
+        /// <param name="name">display name to search for</param>
+        /// <param name="cn">canonical name to search for</param>
+        /// <param name="samAccountName">samAccountName to search for</param>
+        /// <returns>List of users</returns>
+        public static List<LdapUser> GetUsers(bool fromOu = false, string? name = null, string? cn = null, string? samAccountName = null)
+        {
+            string filter = "(objectClass=user)";
+            string additionalFilters = "";
+            if (name != null)
+            {
+                additionalFilters += string.Format("(displayName=*{0}*)", name);
+            }
+            if (cn != null)
+            {
+                additionalFilters += string.Format("(cn=*{0}*)", cn);
+            }
+            if (samAccountName != null)
+            {
+                additionalFilters += string.Format("(samAccountName=*{0}*)", samAccountName);
+            }
+            if (additionalFilters.Length > 0)
+            {
+                filter = string.Format("(&{0}{1})", filter, additionalFilters);
+            }
+
+            var searchResults = SearchActiveDirectory(filter, fromOu ? Server.OU : Server.AD3, ObjectType.Person);
+
+            List<LdapUser> users = new();
+            foreach (SearchResultEntry result in searchResults.Entries)
+            {
+                users.Add(new LdapUser(result));
+            }
+
+            return SortUsers(users);
+        }
+
+        /// <summary>
+        /// Gets a single user from ou or ad3
+        /// </summary>
+        /// <param name="samAccountName">samAccountName of user</param>
+        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
+        /// <returns></returns>
+        public static LdapUser? GetUser(string samAccountName, bool fromOu = false)
+        {
+            var searchResults = SearchActiveDirectory(
+                string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName),
+                fromOu ? Server.OU : Server.AD3,
+                ObjectType.Person);
+            return searchResults.Entries.Count == 1 ? new LdapUser(searchResults.Entries[0]) : null;
+        }
+
+        /// <summary>
+        /// Get members of a group. Group must be in ou.ad3. Members can be in either ou.ad3 or ad3
+        /// </summary>
+        /// <param name="groupDn">Distingushed name of the group</param>
+        /// <returns>List of members of the group</returns>
+        public static List<LdapUser> GetGroupMembership(string groupDn)
+        {
+            List<LdapUser> users = new();
+            string filter = string.Format("(&(objectClass=user)(memberOf={0}))", groupDn);
+            ////Need to get users from both AD3 and OU
+            var ouSearchResults = SearchActiveDirectory(filter, Server.OU, ObjectType.Person);
+            var ad3SearchResults = SearchActiveDirectory(filter, Server.AD3, ObjectType.Person);
+
+            foreach (SearchResultEntry result in ouSearchResults.Entries)
+            {
+                users.Add(new LdapUser(result));
+            }
+            foreach (SearchResultEntry result in ad3SearchResults.Entries)
+            {
+                users.Add(new LdapUser(result));
+            }
+
+            return SortUsers(users);
+        }
+
+        /// <summary>
+        /// Add a user to a group
+        /// </summary>
+        /// <param name="userDn">The distinguished name of the user</param>
+        /// <param name="groupDn">The distinguised name of the group</param>
+        public static void AddUserToGroup(string userDn, string groupDn)
+        {
+            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            try
+            {
+                using PrincipalContext ad3Pc = new(ContextType.Domain, "ad3.ucdavis.edu", _username, creds);
+                using PrincipalContext ouPc = new(ContextType.Domain, "ou.ad3.ucdavis.edu", _username, creds);
+                GroupPrincipal? group = GroupPrincipal.FindByIdentity(ouPc, IdentityType.DistinguishedName, groupDn);
+                UserPrincipal? user = UserPrincipal.FindByIdentity(ad3Pc, IdentityType.DistinguishedName, userDn);
+                if (group != null && user != null)
+                {
+                    group.Members.Add(user);
+                    group.Save();
+                }
+            }
+            catch (Exception ex)
+            {
+                HttpHelper.Logger.Error(ex);
+            }
+        }
+
+        /// <summary>
+        /// Remove a user from a group
+        /// </summary>
+        /// <param name="userDn">The distinguished name of the user</param>
+        /// <param name="groupDn">The distinguised name of the group</param>
+        public static void RemoveUserFromGroup(string userDn, string groupDn)
+        {
+            string creds = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            try
+            {
+                using PrincipalContext ad3Pc = new(ContextType.Domain, "ad3.ucdavis.edu", _username, creds);
+                using PrincipalContext ouPc = new(ContextType.Domain, "ou.ad3.ucdavis.edu", _username, creds);
+                GroupPrincipal group = GroupPrincipal.FindByIdentity(ouPc, IdentityType.DistinguishedName, groupDn);
+                UserPrincipal? user = UserPrincipal.FindByIdentity(ad3Pc, IdentityType.DistinguishedName, userDn);
+                if (group != null && user != null)
+                {
+                    group.Members.Remove(user);
+                    group.Save();
+                }
+            }
+            catch (Exception ex)
+            {
+                HttpHelper.Logger.Error(ex);
+            }
+        }
+
+        //Sort users by description first, or sam account name
+        private static List<LdapUser> SortUsers(List<LdapUser> users)
+        {
+            users.Sort((a, b) => a.Description == b.Description
+                ? a.SamAccountName.CompareTo(b.SamAccountName)
+                : a.Description.CompareTo(b.Description));
+            return users;
+        }
+
+        /// <summary>
+        /// Generic search function
+        /// </summary>
+        /// <param name="searchFilter"></param>
+        /// <param name="searchStart"></param>
+        /// <param name="ou"></param>
+        /// <param name="groupProperties"></param>
+        /// <returns></returns>
+        private static SearchResponse SearchActiveDirectory(string searchFilter, Server server, ObjectType objectType)
+        {
+            var ldapIdentifier = server == Server.OU
+                ? new LdapDirectoryIdentifier(_ouServer, port)
+                : new LdapDirectoryIdentifier(_ad3Server, port);
+            var searchStart = server == Server.OU
+                ? _ouStart
+                : _ad3Users;
+            var props = objectType == ObjectType.Group
+                ? _groupProperties
+                : _personProperties;
+            var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisLDAP") ?? "";
+            using var lc = new LdapConnection(ldapIdentifier, new System.Net.NetworkCredential(_username, cred, "ou.ad3.ucdavis.edu"));
+            lc.SessionOptions.ProtocolVersion = 3;
+            lc.SessionOptions.SecureSocketLayer = true;
+            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
+            lc.Bind();
+
+            var searchRequest = new SearchRequest(searchStart, searchFilter, SearchScope.Subtree, props);
+            var response = (SearchResponse)lc.SendRequest(searchRequest);
+            return response;
+        }
+    }
+}
diff --git a/web/Classes/Utilities/LdapService.cs b/web/Classes/Utilities/LdapService.cs
new file mode 100644
index 0000000..f9308f6
--- /dev/null
+++ b/web/Classes/Utilities/LdapService.cs
@@ -0,0 +1,176 @@
+using System.Runtime.Versioning;
+using System.DirectoryServices.AccountManagement;
+using Viper.Areas.RAPS.Models;
+using System.DirectoryServices.Protocols;
+using System.Reflection;
+using Amazon.Runtime.Internal.Transform;
+using Viper.Models.AAUD;
+
+namespace Viper.Classes.Utilities
+{
+    [SupportedOSPlatform("windows")]
+    public class LdapService
+    {
+        private const string _ldapUsername = "UID=vetmed,OU=Special Users,DC=ucdavis,DC=edu";
+        private const string _ldapServer = "ldap.ucdavis.edu";
+        private const string _ldapStart = "OU=People,DC=ucdavis,DC=edu";
+        private const int _ldapSSLPort = 636;
+
+        private static readonly string[] personAttributes =
+        {
+            "givenName","sn","middlename","ou","mail","telephoneNumber","mobile","postalAddress",
+            "ucdStudentLevel","labeledUri","title","uid","ucdPersonPIDM","ucdPersonIAMID","employeeNumber",
+            "ucdStudentSID","ucdPersonUUID","eduPersonNickname","ucdPersonAffiliation","displayname"
+        };
+        private static readonly string[] CFParams =
+        {
+            "accountexpires","adspath","badpasswordtime","badpwdcount","cn","codepage","company","countrycode","deliverandredirect","department","deptname","departmentnumber","Description","displayname","distinguishedname","dscorepropagationdata","edupersonaffiliation","edupersonprincipalname","employeenumber","extensionattribute10","extensionattribute11","extensionattribute12","extensionattribute13","extensionattribute14","extensionattribute15","extensionattribute5","extensionattribute6","extensionattribute7","extensionattribute8","extensionattribute9","gidnumber","givenname","instancetype","internetencoding","l","lastlogoff","lastlogon","lastlogontimestamp","legacyexchangedn","lockouttime","logoncount","mail","mailnickname","mapirecipient","memberof","mobile","msexcharchiveguid","msexcharchivename","msexcharchivestatus","msexchblockedsendershash","msexchcomanagedobjectsbl","msexchextensionattribute16","msexchextensionattribute17","msexchmailboxguid","msexchpoliciesexcluded","msexchrecipientdisplaytype","msexchrecipienttypedetails","msexchremoterecipienttype","msexchsafesendershash","msexchtextmessagingstate","msexchumdtmfmap","msexchuseraccountcontrol","msexchversion","msexchwhenmailboxcreated","name","objectcategory","objectclass","objectguid","objectsid","ou","pager","phone","physicaldeliveryofficename","postaladdress","postalcode","primarygroupid","proxyaddresses","pwdlastset","SamAccountName","samaccounttype","showinaddressbook","sn","st","street","streetaddress","targetaddress","telephonenumber","textencodedoraddress","title","ucdappointmentdepartmentcode","ucdappointmenttitlecode","ucdpersonaffiliation","ucdpersoniamid","ucdpersonnetid","ucdpersonpidm","ucdpersonppsid","ucdpersonuuid","ucdpublishitemflag","ucdstudentsid","uid","uidnumber","useraccountcontrol","username","userprincipalname","usnchanged","usncreated","whenchanged","whencreated"
+        };
+
+        private static SearchResponse SearchLdap(string searchFilter)
+        {
+            var ldapIdentifier = new LdapDirectoryIdentifier(_ldapServer, _ldapSSLPort);
+            var cred = HttpHelper.GetSetting<string>("Credentials", "UCDavisDirectoryLDAP") ?? "";
+            using var lc = new LdapConnection(ldapIdentifier,
+                    new System.Net.NetworkCredential(_ldapUsername, cred),
+                    AuthType.Basic);
+            lc.SessionOptions.ProtocolVersion = 3;
+            lc.SessionOptions.SecureSocketLayer = true;
+            lc.SessionOptions.VerifyServerCertificate = (connection, certificate) => true;
+            lc.Bind();
+
+            var searchRequest = new SearchRequest(_ldapStart, searchFilter, SearchScope.Subtree, personAttributes);
+            var response = (SearchResponse)lc.SendRequest(searchRequest);
+            return response;
+        }
+
+        /// <summary>
+        /// Get users for display\ searching by name, cn, or samAccountName
+        /// </summary>
+        /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
+        /// <returns>List of Users</returns>
+        public static List<LdapUserContact> GetUsersContact(string search)
+        {
+            List<LdapUserContact> users = new();
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            var results = SearchLdap(filter);
+
+            foreach (SearchResultEntry entry in results.Entries)
+            {
+                users.Add(new LdapUserContact(entry));
+                if (users.Count >= 100)
+                {
+                    break;
+                }
+            }
+            return SortUsersContact(users);
+        }
+
+        /// <summary>
+        /// Get users for display, optionally searching ou.ad3, searching by name, cn, or samAccountName
+        /// </summary>
+        /// <param name="search">Searches all fields (phone number, SN, given name, UID, CN, mail) for this value</param>
+        /// <returns>Dictionary of Users, indexed by mothraID</returns>
+        public Dictionary<string, LdapUserContact> GetUsersContactDictionary(string search)
+        {
+            Dictionary<string, LdapUserContact> users = new();
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            var results = SearchLdap(filter);
+            foreach (SearchResultEntry entry in results.Entries)
+            {
+                var user = new LdapUserContact(entry);
+                if (user.UcdPersonUuid != null)
+                {
+                    users.Add(user.UcdPersonUuid, user);
+                }
+            }
+            return users;
+        }
+
+        /// <summary>
+        /// Look up User by search string
+        /// </summary>
+        /// <param name="search">Search string for looking up user</param>
+        /// <returns>LdapUserContact</returns>
+        public LdapUserContact? GetUserContact(string search)
+        {
+            string filter = string.Format("(|(telephoneNumber=*{0})(sn={0}*)(givenName={0}*)(uid={0}*)(cn={0})(mail={0}*))", search);
+            var results = SearchLdap(filter);
+
+            if (results.Entries.Count > 0)
+            {
+                return new LdapUserContact(results.Entries[0]);
+            }
+            return null;
+        }
+
+
+        /// <summary>
+        /// Look up User by its iamID
+        /// </summary>
+        /// <param name="id">iamID for looking up user</param>
+        /// <returns>LdapUserContact</returns>
+        public LdapUserContact? GetUserByID(string? id)
+        {
+            if (id == null) return null;
+            string filter = string.Format("(ucdpersoniamid = {0})", id);
+            var results = SearchLdap(filter);
+            if (results.Entries.Count > 0)
+            {
+                return new LdapUserContact(results.Entries[0]);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get dictionary of Users from a list of MothraIDs
+        /// </summary>
+        /// <param name="ids">List of MothraIDs for looking up users</param>
+        /// <returns>Dictionary of Users, indexed by mothraID</returns>
+        public Dictionary<string, LdapUserContact> GetUsersByIDs(List<string> ids)
+        {
+            string filter = "(|";
+            foreach (string i in ids) {
+                filter += string.Format("(ucdpersonuuid = {0})", i);
+            }
+            filter += ")";
+            var results = SearchLdap(filter);
+            var users = new Dictionary<string, LdapUserContact>();
+            foreach (SearchResultEntry entry in results.Entries)
+            {
+                var user = new LdapUserContact(entry);
+                if (user.UcdPersonUuid != null)
+                {
+                    users.Add(user.UcdPersonUuid, user);
+                }
+            }
+            return users;
+        }
+        
+        /// <summary>
+        /// Gets a single user from ou or ad3
+        /// </summary>
+        /// <param name="samAccountName">samAccountName of user</param>
+        /// <param name="fromOu">If true, searches the SVM OU in ou.ad3.ucdavis.edu, otherwise, searches ucdUsers in ad3</param>
+        /// <returns></returns>
+        public LdapUserContact? GetUserBySamAccountName(string? samAccountName)
+        {
+            string filter = string.Format("(&(objectClass=user)(samAccountName={0}))", samAccountName);
+            var results = SearchLdap(filter);
+            if (results.Entries.Count > 0)
+            {
+                return new LdapUserContact(results.Entries[0]);
+            }
+            return null;
+        }
+
+        //Sort users by description first, or sam account name
+        private static List<LdapUserContact> SortUsersContact(List<LdapUserContact> users)
+        {
+            users.Sort((a, b) => a.DisplayName == b.DisplayName
+                ? a.Sn.CompareTo(b.Sn)
+                : a.DisplayName.CompareTo(b.DisplayName));
+            return users;
+        }
+    }
+}
\ No newline at end of file

From 1328ea027393acf848143745cdc3475452684e20 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 31 May 2024 16:08:29 -0700
Subject: [PATCH 68/69] Moving LdapUserContact into the Directory models folder

---
 web/Areas/Directory/Controllers/DirectoryController.cs      | 1 -
 web/Areas/Directory/Models/IndividualSearchResult.cs        | 1 -
 web/Areas/Directory/Models/IndividualSearchResultCreator.cs | 1 -
 web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs | 1 -
 web/Areas/{RAPS => Directory}/Models/LdapUserContact.cs     | 4 ++--
 web/Classes/Utilities/LdapService.cs                        | 2 +-
 6 files changed, 3 insertions(+), 7 deletions(-)
 rename web/Areas/{RAPS => Directory}/Models/LdapUserContact.cs (99%)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index b91309f..a44349d 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -6,7 +6,6 @@
 using Web.Authorization;
 using Viper.Classes;
 using Viper.Classes.SQLContext;
-using Viper.Areas.RAPS.Models;
 using Viper.Areas.Directory.Models;
 using System.Runtime.Versioning;
 using System.Collections.Generic;
diff --git a/web/Areas/Directory/Models/IndividualSearchResult.cs b/web/Areas/Directory/Models/IndividualSearchResult.cs
index 32252cb..24c5de5 100644
--- a/web/Areas/Directory/Models/IndividualSearchResult.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResult.cs
@@ -2,7 +2,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 using Viper.Areas.Directory.Services;
-using Viper.Areas.RAPS.Models;
 using Viper.Models.AAUD;
 
 namespace Viper.Areas.Directory.Models
diff --git a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
index ee34b73..3ac2988 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultCreator.cs
@@ -1,5 +1,4 @@
 using System.Runtime.Versioning;
-using Viper.Areas.RAPS.Models;
 using Viper.Models.AAUD;
 
 namespace Viper.Areas.Directory.Models
diff --git a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
index a0cc0fc..fb74a6a 100644
--- a/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
+++ b/web/Areas/Directory/Models/IndividualSearchResultWithIDs.cs
@@ -1,5 +1,4 @@
 using System.Runtime.Versioning;
-using Viper.Areas.RAPS.Models;
 using Viper.Models.AAUD;
 
 namespace Viper.Areas.Directory.Models
diff --git a/web/Areas/RAPS/Models/LdapUserContact.cs b/web/Areas/Directory/Models/LdapUserContact.cs
similarity index 99%
rename from web/Areas/RAPS/Models/LdapUserContact.cs
rename to web/Areas/Directory/Models/LdapUserContact.cs
index 1018c47..d069785 100644
--- a/web/Areas/RAPS/Models/LdapUserContact.cs
+++ b/web/Areas/Directory/Models/LdapUserContact.cs
@@ -7,7 +7,7 @@
 using System.Security.Cryptography;
 using System.Text.Json;
 
-namespace Viper.Areas.RAPS.Models
+namespace Viper.Areas.Directory.Models
 {
     [SupportedOSPlatform("windows")]
     public class LdapUserContact
@@ -325,7 +325,7 @@ public LdapUserContact(SearchResultEntry entry)
                     case "ucdPersonUUID": UcdPersonUuid = v.ToString(); break;
                     case "ucdPersonIAMID": UcdPersonIamId = v.ToString(); break;
                     case "ucdPersonAffiliation": UcdPersonAffiliation = v.ToString(); break;
-                   
+
                     default: break;
                 }
 
diff --git a/web/Classes/Utilities/LdapService.cs b/web/Classes/Utilities/LdapService.cs
index f9308f6..785b756 100644
--- a/web/Classes/Utilities/LdapService.cs
+++ b/web/Classes/Utilities/LdapService.cs
@@ -1,10 +1,10 @@
 using System.Runtime.Versioning;
 using System.DirectoryServices.AccountManagement;
-using Viper.Areas.RAPS.Models;
 using System.DirectoryServices.Protocols;
 using System.Reflection;
 using Amazon.Runtime.Internal.Transform;
 using Viper.Models.AAUD;
+using Viper.Areas.Directory.Models;
 
 namespace Viper.Classes.Utilities
 {

From 11d41887e5d559ae04f8b9c1b6785075df90f2ec Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Tue, 4 Jun 2024 12:22:31 -0700
Subject: [PATCH 69/69] Locking directory to SVM-IT so we can test on prod to
 make sure LDAP is working.

---
 web/Areas/Directory/Controllers/DirectoryController.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/Areas/Directory/Controllers/DirectoryController.cs b/web/Areas/Directory/Controllers/DirectoryController.cs
index a44349d..0239425 100644
--- a/web/Areas/Directory/Controllers/DirectoryController.cs
+++ b/web/Areas/Directory/Controllers/DirectoryController.cs
@@ -16,6 +16,7 @@ namespace Viper.Areas.Directory.Controllers
 {
     [Area("Directory")]
     [Permission(Allow = "SVMSecure")]
+    [Authorize(Roles = "VMDO SVM-IT")] //locking directory for now until it's complete
     public class DirectoryController : AreaController
     {
         public Classes.SQLContext.AAUDContext _aaud;