Merge pull request #633 from bcgov/yj

chore: aps auth

Author: ychung-mot

server/StrDss.Api/Authorization/ApiAuthorizeAttribute.cs

@@ -32,32 +32,40 @@ public void OnAuthorization(AuthorizationFilterContext context)
                 return;
             }
 
+            var clientId = user.GetCustomClaim(StrDssClaimTypes.ClientId);
+
             var identityProviderNm = user.GetCustomClaim(StrDssClaimTypes.IdentityProvider);
+
+            if (identityProviderNm == "" && clientId != "")
+            {
+                identityProviderNm = StrDssIdProviders.Aps;
+            }
+
             var displayName = user.GetCustomClaim(StrDssClaimTypes.DisplayName);
 
-            string userGuid;
+            string userId;
             switch (identityProviderNm)
             {
                 case StrDssIdProviders.Idir:
-                    userGuid = user.GetCustomClaim(StrDssClaimTypes.IdirUserGuid);
+                    userId = user.GetCustomClaim(StrDssClaimTypes.IdirUserGuid);
                     break;
                 case StrDssIdProviders.BceidBusiness:
-                    userGuid = user.GetCustomClaim(StrDssClaimTypes.BceidUserGuid);
+                    userId = user.GetCustomClaim(StrDssClaimTypes.BceidUserGuid);
                     break;
                 case StrDssIdProviders.StrDss:
-                    userGuid = user.GetCustomClaim(StrDssClaimTypes.StrDssUserGuid);
+                    userId = user.GetCustomClaim(StrDssClaimTypes.StrDssUserGuid);
                     break;
                 case StrDssIdProviders.Aps:
-                    userGuid = user.GetCustomClaim(StrDssClaimTypes.ClientId);
+                    userId = clientId;
                     break;
                 default:
-                    userGuid = "";
+                    userId = "Unknown";
                     break;
             }
 
             if (_permissions.Length == 0)
             {
-                _logger.LogInformation($"[AUTH] User '{userGuid}' is authorized to access {context.ActionDescriptor.DisplayName} from IP address {ip}.");
+                _logger.LogInformation($"[AUTH] User '{userId}' is authorized to access {context.ActionDescriptor.DisplayName} from IP address {ip}.");
                 return;
             }
 
@@ -74,12 +82,12 @@ public void OnAuthorization(AuthorizationFilterContext context)
 
             if (!hasPermission)
             {
-                _logger.LogInformation($"[AUTH] User '{userGuid}' does not have permission to access {context.ActionDescriptor.DisplayName} from IP address {ip}.");
+                _logger.LogInformation($"[AUTH] User '{userId}' does not have permission to access {context.ActionDescriptor.DisplayName} from IP address {ip}.");
                 context.Result = new UnauthorizedResult(); //401
                 return;
             }
 
-            _logger.LogInformation($"[AUTH] User '{userGuid}' is authorized to access {context.ActionDescriptor.DisplayName} from IP address {ip}.");
+            _logger.LogInformation($"[AUTH] User '{userId}' is authorized to access {context.ActionDescriptor.DisplayName} from IP address {ip}.");
         }
     }
 }

server/StrDss.Data/Repositories/RentalListingRepository.cs

@@ -277,6 +277,9 @@ await _dbSet.AsNoTracking()
                 group.PrimaryHostNm = listingWithLatestAction.Hosts.Where(x => x.IsPropertyOwner).Select(x => x.FullNm).FirstOrDefault();
                 group.LastActionNm = listingWithLatestAction.LastActionNm;
                 group.LastActionDtm = listingWithLatestAction.LastActionDtm;
+                group.BusinessLicenceId = listingWithLatestAction.BusinessLicenceId;
+                group.BusinessLicenceExpiryDt = listingWithLatestAction.BusinessLicenceExpiryDt;
+                group.LicenceStatusType = listingWithLatestAction.LicenceStatusType;
             }
 
             stopwatch.Stop();

server/StrDss.Model/RentalListingGroupDto.cs

@@ -13,6 +13,9 @@ public class RentalListingGroupDto
         public string? BusinessLicenceNo { get; set; }
         public string? LastActionNm { get; set; }
         public DateTime? LastActionDtm { get; set; }
+        public long? BusinessLicenceId { get; set; }
+        public DateOnly? BusinessLicenceExpiryDt { get; set; }
+        public string? LicenceStatusType { get; set; }
         public List<RentalListingViewDto> Listings { get; set; } = new List<RentalListingViewDto>();
     }
 }