From 15be7ce90f8c74b17f19d0b8cd40217ed1893ef1 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Fri, 5 Sep 2025 19:15:37 +0100
Subject: [PATCH] Update
 app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../security/service/CustomUserDetailsService.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java
index 969d04c4f..df3934bbd 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java
@@ -75,8 +75,8 @@ public class CustomUserDetailsService implements UserDetailsService {
      */
     private AuthenticationType determinePreferredSSOType() {
         // Check what SSO types are enabled and prefer in order: OAUTH2 > SAML2 > fallback to OAUTH2
-        boolean oauth2Enabled = securityProperties.getOauth2().getEnabled();
-        boolean saml2Enabled = securityProperties.getSaml2().getEnabled();
+        boolean oauth2Enabled = securityProperties.getOauth2() != null && securityProperties.getOauth2().getEnabled();
+        boolean saml2Enabled = securityProperties.getSaml2() != null && securityProperties.getSaml2().getEnabled();
 
         if (oauth2Enabled) {
             return AuthenticationType.OAUTH2;