fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(oauth2): fix conf constructors in !develop

Browse Source
This commit is contained in:
Sarah Vaupel 2024-03-20 15:56:30 +01:00
parent 3119dff6fe
commit 274c86a820
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Application.hs
View File

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