Skip to content

Commit 5391cbb

Browse files
isovectorisovector
committed
make format
1 parent 55a1edf commit 5391cbb

File tree

8 files changed

+63
-55
lines changed

8 files changed

+63
-55
lines changed

‎services/spar/src/Spar/API.hs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ import qualified Spar.Sem.DefaultSsoCode as DefaultSsoCode
7575
import Spar.Sem.GalleyAccess (GalleyAccess)
7676
import qualified Spar.Sem.GalleyAccess as GalleyAccess
7777
import qualified Spar.Sem.IdP as IdPEffect
78+
import Spar.Sem.Random (Random)
79+
import qualified Spar.Sem.Random as Random
7880
import Spar.Sem.SAMLUserStore (SAMLUserStore)
7981
import qualified Spar.Sem.SAMLUserStore as SAMLUserStore
8082
import Spar.Sem.ScimExternalIdStore (ScimExternalIdStore)
@@ -86,8 +88,6 @@ import Wire.API.Cookie
8688
import Wire.API.Routes.Public.Spar
8789
import Wire.API.User.IdentityProvider
8890
import Wire.API.User.Saml
89-
import qualified Spar.Sem.Random as Random
90-
import Spar.Sem.Random (Random)
9191

9292
app :: Env -> Application
9393
app ctx =
@@ -232,8 +232,18 @@ validateRedirectURL uri = do
232232

233233
authresp ::
234234
forall r.
235-
Members '[ Random,
236-
GalleyAccess, BrigAccess, BindCookieStore, AssIDStore, AReqIDStore, ScimTokenStore, IdPEffect.IdP, SAMLUserStore] r =>
235+
Members
236+
'[ Random,
237+
GalleyAccess,
238+
BrigAccess,
239+
BindCookieStore,
240+
AssIDStore,
241+
AReqIDStore,
242+
ScimTokenStore,
243+
IdPEffect.IdP,
244+
SAMLUserStore
245+
]
246+
r =>
237247
Maybe TeamId ->
238248
Maybe ST ->
239249
SAML.AuthnResponseBody ->

‎services/spar/src/Spar/App.hs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ import Spar.Sem.GalleyAccess.Http (galleyAccessToHttp)
113113
import Spar.Sem.IdP (GetIdPResult (..))
114114
import qualified Spar.Sem.IdP as IdPEffect
115115
import Spar.Sem.IdP.Cassandra (idPToCassandra)
116+
import Spar.Sem.Random (Random)
117+
import qualified Spar.Sem.Random as Random
118+
import Spar.Sem.Random.IO (randomToIO)
116119
import Spar.Sem.SAMLUserStore (SAMLUserStore)
117120
import qualified Spar.Sem.SAMLUserStore as SAMLUserStore
118121
import Spar.Sem.SAMLUserStore.Cassandra (interpretClientToIO, samlUserStoreToCassandra)
@@ -133,9 +136,6 @@ import Wire.API.User.Identity (Email (..))
133136
import Wire.API.User.IdentityProvider
134137
import Wire.API.User.Saml
135138
import Wire.API.User.Scim (ValidExternalId (..))
136-
import qualified Spar.Sem.Random as Random
137-
import Spar.Sem.Random (Random)
138-
import Spar.Sem.Random.IO (randomToIO)
139139

140140
newtype Spar r a = Spar {fromSpar :: Member (Final IO) r => ReaderT Env (ExceptT SparError (Sem r)) a}
141141
deriving (Functor)
@@ -453,23 +453,23 @@ instance
453453
runFinal $
454454
embedToFinal @IO $
455455
randomToIO $
456-
runError @SparError $
457-
ttlErrorToSparError $
458-
ReaderEff.runReader (sparCtxOpts ctx) $
459-
galleyAccessToHttp (sparCtxLogger ctx) (sparCtxHttpManager ctx) (sparCtxHttpGalley ctx) $
460-
brigAccessToHttp (sparCtxLogger ctx) (sparCtxHttpManager ctx) (sparCtxHttpBrig ctx) $
461-
interpretClientToIO (sparCtxCas ctx) $
462-
samlUserStoreToCassandra @Cas.Client $
463-
idPToCassandra @Cas.Client $
464-
defaultSsoCodeToCassandra $
465-
scimTokenStoreToCassandra $
466-
scimUserTimesStoreToCassandra $
467-
scimExternalIdStoreToCassandra $
468-
aReqIDStoreToCassandra $
469-
assIDStoreToCassandra $
470-
bindCookieStoreToCassandra $
471-
runExceptT $
472-
runReaderT action ctx
456+
runError @SparError $
457+
ttlErrorToSparError $
458+
ReaderEff.runReader (sparCtxOpts ctx) $
459+
galleyAccessToHttp (sparCtxLogger ctx) (sparCtxHttpManager ctx) (sparCtxHttpGalley ctx) $
460+
brigAccessToHttp (sparCtxLogger ctx) (sparCtxHttpManager ctx) (sparCtxHttpBrig ctx) $
461+
interpretClientToIO (sparCtxCas ctx) $
462+
samlUserStoreToCassandra @Cas.Client $
463+
idPToCassandra @Cas.Client $
464+
defaultSsoCodeToCassandra $
465+
scimTokenStoreToCassandra $
466+
scimUserTimesStoreToCassandra $
467+
scimExternalIdStoreToCassandra $
468+
aReqIDStoreToCassandra $
469+
assIDStoreToCassandra $
470+
bindCookieStoreToCassandra $
471+
runExceptT $
472+
runReaderT action ctx
473473
throwErrorAsHandlerException :: Either SparError a -> Handler a
474474
throwErrorAsHandlerException (Left err) =
475475
sparToServerErrorWithLogging (sparCtxLogger ctx) err >>= throwError

‎services/spar/src/Spar/Scim.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ import Spar.Scim.User
8686
import Spar.Sem.BrigAccess (BrigAccess)
8787
import Spar.Sem.GalleyAccess (GalleyAccess)
8888
import qualified Spar.Sem.IdP as IdPEffect
89+
import Spar.Sem.Random (Random)
8990
import Spar.Sem.SAMLUserStore (SAMLUserStore)
9091
import Spar.Sem.ScimExternalIdStore (ScimExternalIdStore)
9192
import Spar.Sem.ScimTokenStore (ScimTokenStore)
@@ -99,7 +100,6 @@ import qualified Web.Scim.Schema.Schema as Scim.Schema
99100
import qualified Web.Scim.Server as Scim
100101
import Wire.API.Routes.Public.Spar
101102
import Wire.API.User.Scim
102-
import Spar.Sem.Random (Random)
103103

104104
-- | SCIM config for our server.
105105
--

‎services/spar/src/Spar/Scim/Auth.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ import Spar.Sem.BrigAccess (BrigAccess)
5454
import qualified Spar.Sem.BrigAccess as BrigAccess
5555
import Spar.Sem.GalleyAccess (GalleyAccess)
5656
import qualified Spar.Sem.IdP as IdPEffect
57+
import Spar.Sem.Random (Random)
58+
import qualified Spar.Sem.Random as Random
5759
import Spar.Sem.ScimTokenStore (ScimTokenStore)
5860
import qualified Spar.Sem.ScimTokenStore as ScimTokenStore
5961
import qualified Web.Scim.Class.Auth as Scim.Class.Auth
@@ -62,8 +64,6 @@ import qualified Web.Scim.Schema.Error as Scim
6264
import Wire.API.Routes.Public.Spar (APIScimToken)
6365
import Wire.API.User.Saml (maxScimTokens)
6466
import Wire.API.User.Scim
65-
import qualified Spar.Sem.Random as Random
66-
import Spar.Sem.Random (Random)
6767

6868
-- | An instance that tells @hscim@ how authentication should be done for SCIM routes.
6969
instance Member ScimTokenStore r => Scim.Class.Auth.AuthDB SparTag (Spar r) where

‎services/spar/src/Spar/Scim/User.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ import qualified Spar.Scim.Types as ST
7272
import Spar.Sem.BrigAccess as BrigAccess
7373
import Spar.Sem.GalleyAccess (GalleyAccess)
7474
import qualified Spar.Sem.IdP as IdPEffect
75+
import Spar.Sem.Random (Random)
76+
import qualified Spar.Sem.Random as Random
7577
import Spar.Sem.SAMLUserStore (SAMLUserStore)
7678
import qualified Spar.Sem.SAMLUserStore as SAMLUserStore
7779
import Spar.Sem.ScimExternalIdStore (ScimExternalIdStore)
@@ -99,8 +101,6 @@ import qualified Wire.API.User.RichInfo as RI
99101
import Wire.API.User.Saml (derivedOpts, derivedOptsScimBaseURI, richInfoLimit)
100102
import Wire.API.User.Scim (ScimTokenInfo (..))
101103
import qualified Wire.API.User.Scim as ST
102-
import qualified Spar.Sem.Random as Random
103-
import Spar.Sem.Random (Random)
104104

105105
----------------------------------------------------------------------------
106106
-- UserDB instance

‎services/spar/src/Spar/Sem/Random.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
module Spar.Sem.Random where
22

3-
import Imports
4-
import Polysemy
53
import Data.Id (ScimTokenId)
64
import Data.UUID (UUID)
5+
import Imports
6+
import Polysemy
77

88
data Random m a where
99
Bytes :: Int -> Random m ByteString
1010
Uuid :: Random m UUID
1111
ScimTokenId :: Random m ScimTokenId
1212

1313
makeSem ''Random
14-

‎services/spar/src/Spar/Sem/Random/IO.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module Spar.Sem.Random.IO where
22

3-
import Imports
4-
import Polysemy
5-
import Spar.Sem.Random (Random(..))
63
import Data.Id (randomId)
74
import qualified Data.UUID.V4 as UUID
5+
import Imports
86
import OpenSSL.Random (randBytes)
7+
import Polysemy
8+
import Spar.Sem.Random (Random (..))
99

1010
randomToIO ::
1111
Member (Embed IO) r =>
@@ -15,4 +15,3 @@ randomToIO = interpret $ \case
1515
Bytes i -> embed $ randBytes i
1616
Uuid -> embed $ UUID.nextRandom
1717
ScimTokenId -> embed $ randomId @IO
18-

‎services/spar/test-integration/Util/Core.hs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ import Spar.Sem.GalleyAccess (GalleyAccess)
195195
import Spar.Sem.GalleyAccess.Http (galleyAccessToHttp)
196196
import qualified Spar.Sem.IdP as IdPEffect
197197
import Spar.Sem.IdP.Cassandra
198+
import Spar.Sem.Random (Random)
199+
import Spar.Sem.Random.IO (randomToIO)
198200
import Spar.Sem.SAMLUserStore (SAMLUserStore)
199201
import qualified Spar.Sem.SAMLUserStore as SAMLUserStore
200202
import Spar.Sem.SAMLUserStore.Cassandra
@@ -227,8 +229,6 @@ import qualified Wire.API.User as User
227229
import Wire.API.User.IdentityProvider
228230
import Wire.API.User.Saml
229231
import Wire.API.User.Scim (runValidExternalId)
230-
import Spar.Sem.Random (Random)
231-
import Spar.Sem.Random.IO (randomToIO)
232232

233233
-- | Call 'mkEnv' with options from config files.
234234
mkEnvFromOptions :: IO TestEnv
@@ -1277,23 +1277,23 @@ runSpar (Spar.Spar action) = do
12771277
runFinal $
12781278
embedToFinal @IO $
12791279
randomToIO $
1280-
ErrorEff.runError @SparError $
1281-
ttlErrorToSparError $
1282-
ReaderEff.runReader (Spar.sparCtxOpts env) $
1283-
interpretClientToIO (Spar.sparCtxCas env) $
1284-
samlUserStoreToCassandra @Cas.Client $
1285-
idPToCassandra @Cas.Client $
1286-
defaultSsoCodeToCassandra @Cas.Client $
1287-
scimTokenStoreToCassandra @Cas.Client $
1288-
scimUserTimesStoreToCassandra @Cas.Client $
1289-
scimExternalIdStoreToCassandra @Cas.Client $
1290-
aReqIDStoreToCassandra @Cas.Client $
1291-
assIDStoreToCassandra @Cas.Client $
1292-
bindCookieStoreToCassandra @Cas.Client $
1293-
brigAccessToHttp (Spar.sparCtxLogger env) (Spar.sparCtxHttpManager env) (Spar.sparCtxHttpBrig env) $
1294-
galleyAccessToHttp (Spar.sparCtxLogger env) (Spar.sparCtxHttpManager env) (Spar.sparCtxHttpBrig env) $
1295-
runExceptT $
1296-
runReaderT action env
1280+
ErrorEff.runError @SparError $
1281+
ttlErrorToSparError $
1282+
ReaderEff.runReader (Spar.sparCtxOpts env) $
1283+
interpretClientToIO (Spar.sparCtxCas env) $
1284+
samlUserStoreToCassandra @Cas.Client $
1285+
idPToCassandra @Cas.Client $
1286+
defaultSsoCodeToCassandra @Cas.Client $
1287+
scimTokenStoreToCassandra @Cas.Client $
1288+
scimUserTimesStoreToCassandra @Cas.Client $
1289+
scimExternalIdStoreToCassandra @Cas.Client $
1290+
aReqIDStoreToCassandra @Cas.Client $
1291+
assIDStoreToCassandra @Cas.Client $
1292+
bindCookieStoreToCassandra @Cas.Client $
1293+
brigAccessToHttp (Spar.sparCtxLogger env) (Spar.sparCtxHttpManager env) (Spar.sparCtxHttpBrig env) $
1294+
galleyAccessToHttp (Spar.sparCtxLogger env) (Spar.sparCtxHttpManager env) (Spar.sparCtxHttpBrig env) $
1295+
runExceptT $
1296+
runReaderT action env
12971297
either (throwIO . ErrorCall . show) pure result
12981298

12991299
getSsoidViaSelf :: HasCallStack => UserId -> TestSpar UserSSOId

0 commit comments

Comments
 (0)