Merge branch 'feature/userinfo' into Development

# Conflicts:
#	web/wwwroot/css/userinfo.css

Author: JasonRobertFrancis

VueApp/src/styles/colors.css

@@ -112,3 +112,22 @@
     border-left: 0.25rem solid var(--q-negative);
     color: var(--q-negative);
 }
+
+/* Warning-state surface — mirrors StatusBanner type="warning" treatment
+   (own padding/layout, not layered onto Quasar's .q-banner) for Razor pages
+   that have no Vue mount, e.g. UserInfo.cshtml's unavailable-sections banner.
+   Mirrored into web/wwwroot/css/site.css so Razor and Vue render it
+   identically - see that copy for why it can't just reuse .q-banner. */
+.warning-surface {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.75rem;
+    padding: 0.75rem 1rem;
+    border-radius: 4px;
+    background-color: color-mix(in srgb, var(--q-warning) 15%, white);
+    border-left: 0.25rem solid var(--q-warning);
+    color: #5d4600;
+}
+.warning-surface .material-icons {
+    flex: none;
+}

scripts/build-dotnet.js

@@ -25,6 +25,15 @@ const artifactsPath = ".artifacts-precommit"
 // that, which would surface as a false "build failed" instead of the real result.
 const MAX_BUILD_OUTPUT = 10_485_760
 
+// .artifacts-precommit is a separate, isolated output path (deliberately kept apart from
+// the normal bin/obj folders to avoid file-lock conflicts with a running dev server), so a
+// rebuild here doesn't get the benefit of warm incremental state the way a plain `dotnet
+// build` does. A cold build of this solution - more so right after a merge, and with
+// SonarAnalyzer's security/vulnerability rule categories enabled - can take a while. 120s
+// was too tight and got mistaken for a real compile failure when execFileSync killed the
+// process mid-build; give it more headroom.
+const BUILD_TIMEOUT_MS = 600_000
+
 // Check if either project needs rebuild
 const webNeedsBuild = needsBuild("web", "Viper.csproj")
 const testNeedsBuild = needsBuild("test", "Viper.test.csproj")
@@ -55,7 +64,7 @@ try {
         ["build", "test/", "--artifacts-path", artifactsPath, "--verbosity", "quiet", "--nologo"],
         {
             encoding: "utf8",
-            timeout: 120_000,
+            timeout: BUILD_TIMEOUT_MS,
             maxBuffer: MAX_BUILD_OUTPUT,
             stdio: ["inherit", "pipe", "pipe"],
             env: { ...env, DOTNET_USE_COMPILER_SERVER: "1" },
@@ -68,6 +77,25 @@ try {
     logger.success("Build complete")
 } catch (error) {
     const output = (error.stdout || "") + (error.stderr || "")
+
+    if (error.signal) {
+        // execFileSync kills the child and sets `signal` (not a normal exit code) when the
+        // timeout fires - that's an environment/timing issue, not a deterministic function
+        // of the code, so it must NOT be cached as a build failure. Caching it would make
+        // every future run replay this same "failure" (via the cached-output branch above)
+        // for as long as the file hashes stay unchanged, exactly like a real compile error,
+        // even though the code may be fine and just needs another (or longer) attempt.
+        logger.error(
+            `Build timed out after ${BUILD_TIMEOUT_MS / 1000}s (signal ${error.signal}) - ` +
+                "not a compile error, so nothing was cached. Try again; if it keeps timing out, " +
+                "BUILD_TIMEOUT_MS in this script may need to go up further.",
+        )
+        if (output) {
+            console.error(filterBuildErrors(output))
+        }
+        process.exit(1)
+    }
+
     // Cache failure - no point rebuilding if code hasn't changed
     markAsBuilt("web", "Viper.csproj", output, false)
     markAsBuilt("test", "Viper.test.csproj", output, false)

web/Areas/CMS/Services/CmsUserPhotoService.cs

@@ -87,7 +87,7 @@ public async Task<CmsUserPhotoResult> GetUserPhotoAsync(string? mailId, string?
                 return (mailId, iamId);
             }
 
-            var query = _aaudContext.AaudUsers.AsNoTracking().Where(u => u.Current != 0);
+            var query = _aaudContext.AaudUsers.AsNoTracking().Where(u => u.Current != 0 || u.Future != 0);
             if (!string.IsNullOrEmpty(mailId))
             {
                 query = query.Where(u => u.MailId == mailId);

web/Areas/Directory/Models/LdapUserContact.cs

@@ -15,11 +15,11 @@ public class LdapUserContact
         public string DisplayName { get; set; } = null!;
         public string EduPersonNickname { get; set; } = null!;
         public string Title { get; set; } = null!;
-        public string LabeledUri { 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 LabeledUri { get; set; } = null!;
         public string UcdStudentLevel { get; set; } = null!;
         public string UcdStudentSid { get; set; } = null!;
         public string UcdPersonPidm { get; set; } = null!;
@@ -51,11 +51,11 @@ public LdapUserContact(SearchResultEntry entry)
                     case "eduPersonNickname": EduPersonNickname = v.ToString(); break;
 
                     case "title": Title = v.ToString(); break;
-                    case "labeledUri": LabeledUri = 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 "labeledUri": LabeledUri = v.ToString(); break;
 
                     case "employeeNumber": EmployeeNumber = v.ToString(); break;
                     case "ucdStudentLevel": UcdStudentLevel = v.ToString(); break;

web/Areas/Directory/Services/UserInfoService.cs

@@ -454,23 +454,38 @@ private async Task PopulateStudentInfoAsync(UserInfoResult result)
         }
 
         /// <summary>
-        /// Get current or future term for student - equivalent to getCurrentOrFutureTermForUser in SIS.cfc
+        /// Get current or future term for student - equivalent to getCurrentOrFutureTermForUser in SIS.cfc.
+        ///
+        /// Runs over its own connection built from the AAUD connection string rather than
+        /// _aaudContext, which this class otherwise uses only for EF entity queries - mixing raw
+        /// SQL and EF entities on the same context causes auth failures. No database qualifier on
+        /// the proc name either, so this follows whatever database the connection string points at,
+        /// same as the SIS raw SQL calls below.
         /// </summary>
         private async Task<string?> GetCurrentOrFutureTermForStudentAsync(UserInfoResult result, string pidm)
         {
             try
             {
+                var connectionString = _configuration.GetConnectionString("AAUD")
+                    ?? throw new InvalidOperationException("Connection string 'AAUD' not configured");
+
+                await using var connection = new Microsoft.Data.SqlClient.SqlConnection(connectionString);
+                await using var command = new Microsoft.Data.SqlClient.SqlCommand(
+                    "EXEC dbo.usp_get_CurrentOrFutureTermForUser @pidm = @pidm, @loginID = NULL, @termCode = @termCode OUTPUT",
+                    connection);
+
+                command.Parameters.Add(new Microsoft.Data.SqlClient.SqlParameter("@pidm", pidm));
+
                 var termCodeParam = new Microsoft.Data.SqlClient.SqlParameter
                 {
                     ParameterName = "@termCode",
                     SqlDbType = System.Data.SqlDbType.Int,
                     Direction = System.Data.ParameterDirection.Output
                 };
+                command.Parameters.Add(termCodeParam);
 
-                await _aaudContext.Database.ExecuteSqlRawAsync(
-                    "EXEC AAUD.dbo.usp_get_CurrentOrFutureTermForUser @pidm = @pidm, @loginID = NULL, @termCode = @termCode OUTPUT",
-                    new Microsoft.Data.SqlClient.SqlParameter("@pidm", pidm),
-                    termCodeParam);
+                await connection.OpenAsync();
+                await command.ExecuteNonQueryAsync();
 
                 var value = termCodeParam.Value;
                 return value == null || value == DBNull.Value ? null : value.ToString();
@@ -723,7 +738,7 @@ private async Task PopulateIamInfoAsync(UserInfoResult result)
                 // Get people information - equivalent to iamPeople.getById() in ColdFusion
                 var peopleResponse = await iamApi.SearchForPerson(iamId: result.IamId);
                 _logger.LogDebug("IAM people response data count {Count}, error {Error}",
-                    peopleResponse.Data?.Count(), peopleResponse.ErrorMessage ?? "none");
+                    peopleResponse.Data?.Count(), LogSanitizer.SanitizeString(peopleResponse.ErrorMessage) ?? "none");
                 if (peopleResponse.Data?.Any() == true)
                 {
                     result.IamPeople = peopleResponse.Data.ToList();
@@ -739,7 +754,7 @@ private async Task PopulateIamInfoAsync(UserInfoResult result)
                 // Get employee associations - equivalent to iamAssociations.getEmployeeAssociations() in ColdFusion
                 var associationsResponse = await iamApi.GetEmployeeAssociations(result.IamId);
                 _logger.LogDebug("IAM associations response data count {Count}, error {Error}",
-                    associationsResponse.Data?.Count(), associationsResponse.ErrorMessage ?? "none");
+                    associationsResponse.Data?.Count(), LogSanitizer.SanitizeString(associationsResponse.ErrorMessage) ?? "none");
                 if (associationsResponse.Data?.Any() == true)
                 {
                     result.IamAssociations = associationsResponse.Data.ToList();
@@ -1513,9 +1528,14 @@ query SearchUsers($name: String!) {
                     }
                     else
                     {
+                        // No candidates is the common case - most VIPER users don't have an
+                        // Instinct account. That's not a failure, so leave Valid false and
+                        // ErrorMessage unset: PopulateInstinctInfoAsync only flags "Instinct" as
+                        // an unavailable section when ErrorMessage is set, and this isn't one.
                         // Do not include other candidates' names from the search results here -
                         // they belong to unrelated people and would leak into this user's directory page.
-                        result.ErrorMessage = $"User found in API but no name match. Variations tried: {string.Join(", ", nameVariations)}.";
+                        _logger.LogDebug("Instinct API: no account matched {LastName}, {FirstName}. Variations tried: {Variations}",
+                            LogSanitizer.SanitizeString(lastName), LogSanitizer.SanitizeString(firstName), string.Join(", ", nameVariations));
                     }
                 }
                 else
@@ -1548,7 +1568,7 @@ private static void AppendError(InstinctResult result, string msg)
             if (string.IsNullOrWhiteSpace(apiUrl))
             {
                 const string errMsg = "Instinct:ApiUrl is not configured";
-                _logger.LogWarning("Instinct API: {ErrorMessage}", errMsg);
+                _logger.LogWarning("Instinct API: {ErrorMessage}", LogSanitizer.SanitizeString(errMsg));
                 AppendError(result, errMsg);
                 return null;
             }
@@ -1586,7 +1606,7 @@ private static void AppendError(InstinctResult result, string msg)
                 if (string.IsNullOrEmpty(password))
                 {
                     string errMsg = "Password is null or empty in configuration";
-                    _logger.LogWarning("Instinct auth: {ErrorMessage}", errMsg);
+                    _logger.LogWarning("Instinct auth: {ErrorMessage}", LogSanitizer.SanitizeString(errMsg));
                     AppendError(result, errMsg);
                     return null;
                 }
@@ -1629,7 +1649,7 @@ private static void AppendError(InstinctResult result, string msg)
                 {
                     var responseContent = await response.Content.ReadAsStringAsync();
                     string errMsg = $"Token POST request failed (Status: {response.StatusCode}): {responseContent}";
-                    _logger.LogWarning("Instinct auth: {ErrorMessage}", errMsg);
+                    _logger.LogWarning("Instinct auth: {ErrorMessage}", LogSanitizer.SanitizeString(errMsg));
                     AppendError(result, errMsg);
                 }
             }

web/Areas/Directory/Views/Card.cshtml

@@ -79,7 +79,7 @@
         </q-card-section>
             <q-card-section class="row">
                 <q-card-section class="col photo">
-                    <q-img :src="'@HttpHelper.GetRootURL()/api/cms/photos/by-mail/' + user.mailId + '?altphoto=true'"
+                <q-img :src="'@HttpHelper.GetRootURL()/api/cms/photos/by-iam/' + user.iamId + '?altphoto=true'"
                         :alt="'Photo of ' + user.name"
                         class="photo_avatar"
                         fit="cover"

web/Areas/Directory/Views/UserInfo.cshtml

@@ -8,6 +8,16 @@
 }
 <article class="userinfo">
 
+    @* Unavailable Sections *@
+    @if (Model.UnavailableSections.Any())
+    {
+        <div class="warning-surface" role="status">
+            <i class="q-icon notranslate material-icons" aria-hidden="true" role="img">warning</i>
+            <div class="text-body2">
+                <strong>Some information may be unavailable.</strong> The following sections could not be loaded and may be showing incomplete data: @string.Join(", ", Model.UnavailableSections).
+            </div>
+        </div>
+    }
 
     @* Directory Information *@
     @if (Model.CanViewDirectoryDetail || Model.IsOwnPage)

web/Classes/SQLContext/PPSContext.cs

@@ -68,8 +68,6 @@ public PPSContext(DbContextOptions<PPSContext> options)
 
     public virtual DbSet<EthnicityGender> EthnicityGenders { get; set; }
 
-    public virtual DbSet<EthnicityGender20210201> EthnicityGender20210201s { get; set; }
-
     public virtual DbSet<Export> Exports { get; set; }
 
     public virtual DbSet<FurloughTarget> FurloughTargets { get; set; }
@@ -244,8 +242,6 @@ public PPSContext(DbContextOptions<PPSContext> options)
 
     public virtual DbSet<UcpathMissingPerson> UcpathMissingPeople { get; set; }
 
-    public virtual DbSet<UcpathMissingPerson20190821> UcpathMissingPerson20190821s { get; set; }
-
     public virtual DbSet<UcpathOverride> UcpathOverrides { get; set; }
 
     public virtual DbSet<UcpathVerificationItem> UcpathVerificationItems { get; set; }

web/wwwroot/css/site.css

@@ -523,3 +523,24 @@ table.htable tr th {
     border-left: 0.25rem solid var(--q-negative);
     color: var(--q-negative);
 }
+
+/* Warning-state surface - same tint/border/text treatment as StatusBanner
+   type="warning" (see VueApp/src/components/StatusBanner.vue) for Razor
+   pages, which have no Vue mount and so can't render StatusBanner directly.
+   Self-contained (own padding/layout) rather than layered onto Quasar's
+   .q-banner: site.css loads before quasar.prod.css in _VIPERLayout.cshtml,
+   so a shared class would lose the background-color override to Quasar's
+   own white .q-banner background at equal specificity. */
+.warning-surface {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.75rem;
+    padding: 0.75rem 1rem;
+    border-radius: 4px;
+    background-color: color-mix(in srgb, var(--q-warning) 15%, white);
+    border-left: 0.25rem solid var(--q-warning);
+    color: #5d4600;
+}
+.warning-surface .material-icons {
+    flex: none;
+}

web/wwwroot/css/userinfo.css

@@ -72,7 +72,9 @@
     padding-top: 1em;
     border-top: 1px solid #888;
 }
-
+.userinfo .warning-surface + div {
+    border-top: none;
+}
 .direct {
     position: relative;
     min-height: 17rem;
@@ -86,19 +88,22 @@
 
 .direct span.photo2 {
     position: absolute;
-    top: 10.5rem;
-    left: 25rem;
+    top: 3rem;
+    left: 33rem;
 }
 
 .userinfo span.photo b,
 .userinfo span.photo2 b {
     display: block;
 }
+<<<<<<< HEAD
 
 .userinfo span.photo2 b {
     padding-top: 1.5rem;
 }
 
+=======
+>>>>>>> feature/userinfo
 .direct ul {
     width: 23rem;
 }