diff --git a/src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableAdminRepository.cs b/src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableAdminRepository.cs index f2f73659..f415af6a 100644 --- a/src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableAdminRepository.cs +++ b/src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableAdminRepository.cs @@ -200,7 +200,7 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage { var result = await _tenantAdminsTableClient.GetEntityAsync(tenantId, upn); var entity = result.Value; - if (entity == null || !entity.IsEnabled) return null; + if (entity == null) return null; return MapToTenantMember(entity); } catch (RequestFailedException ex) when (ex.Status == 404) @@ -217,7 +217,7 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage public async Task IsTenantAdminAsync(string tenantId, string upn) { var member = await GetTenantMemberAsync(tenantId, upn); - if (member == null) return false; + if (member == null || !member.IsEnabled) return false; // Only true for Admin role (null Role = Admin for backward compat) return member.Role == null || member.Role == Constants.TenantRoles.Admin; } @@ -225,7 +225,7 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage public async Task IsTenantMemberAsync(string tenantId, string upn) { var member = await GetTenantMemberAsync(tenantId, upn); - if (member == null) return false; + if (member == null || !member.IsEnabled) return false; return member.Role != Constants.TenantRoles.Viewer; } diff --git a/src/Backend/AutopilotMonitor.Functions/Services/TenantAdminsService.cs b/src/Backend/AutopilotMonitor.Functions/Services/TenantAdminsService.cs index 834ea40c..f74723dd 100644 --- a/src/Backend/AutopilotMonitor.Functions/Services/TenantAdminsService.cs +++ b/src/Backend/AutopilotMonitor.Functions/Services/TenantAdminsService.cs @@ -217,7 +217,7 @@ public class TenantAdminsService return cached; var member = await _adminRepo.GetTenantMemberAsync(tenantId, upn); - if (member == null) + if (member == null || !member.IsEnabled) { _cache.Set(cacheKey, (MemberRoleInfo?)null, _cacheDuration); return null;