From 274c86a82012c50d9b80a626e60ac3777736db97 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Wed, 20 Mar 2024 15:56:30 +0100
Subject: [PATCH] chore(oauth2): fix conf constructors in !develop

---
 src/Application.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index bf5889899..4163209f3 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -59,6 +59,7 @@ import System.Directory
 
 import Jobs
 
+import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
 
 import Yesod.Auth.OAuth2.AzureAD (oauth2AzureADScoped)
@@ -355,18 +356,18 @@ makeFoundation appSettings''@AppSettings{..} = do
 #else
       let -- Auth Plugins
         loadPlugin p prefix = do -- Loads given YesodAuthPlugin
-          mID <- fmap Text.pack <$> appUserAuthConf ^? _UserAuthConfSingleSource . _AuthSourceConfAzure . _azureConfClientId
-          mSecret <- fmap Text.pack <$> appUserAuthConf ^? _UserAuthConfSingleSource . _AuthSourceConfAzure . _azureConfClientSecret
+          mID <- fmap Text.pack <$> appUserAuthConf ^? _UserAuthConfSingleSource . _AuthSourceConfAzureAdV2 . _azureConfClientId
+          mSecret <- fmap Text.pack <$> appUserAuthConf ^? _UserAuthConfSingleSource . _AuthSourceConfAzureAdV2 . _azureConfClientSecret
           let mArgs = (,) <$> mID <*> mSecret
           guard $ isJust mArgs
           return . uncurry p $ fromJust mArgs
         tenantID = case appUserAuthConf of
-          UserAuthConfSingleSource (AuthSourceConfAzure AzureConf{..})
+          UserAuthConfSingleSource (AuthSourceConfAzureAdV2 AzureConf{..})
             -> Text.pack azureConfTenantId
           _other
             -> error "Tenant ID missing!"
         oauth2Plugins
-          | UserAuthConfSingleSource (AuthSourceConfAzure AzureConf{..}) appUserAuthConf
+          | UserAuthConfSingleSource (AuthSourceConfAzureAdV2 AzureConf{..}) appUserAuthConf
             = singleton $ oauth2AzureADScoped (Set.toList azureConfScopes) azureConfClientId azureConfClientSecret
           | otherwise
             = mempty