Skip to content

nit-picks #2761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fisx merged 6 commits into from
Oct 25, 2022
Merged

nit-picks #2761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b304f2
Refactor for clarity.
fisx Oct 11, 2022
e67cc53
More hints in case of compiler errors.
fisx Oct 11, 2022
fdb94b3
hlint.
fisx Oct 24, 2022
1f53e9c
Merge branch 'develop' into debug-spar
fisx Oct 24, 2022
672b7c5
Make `make full-clean` fuller.
fisx Oct 24, 2022
69f1ed9
Merge remote-tracking branch 'origin/develop' into debug-spar
fisx Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ ifdef CABAL_DIR
else
rm -rf ~/.cabal/store
endif
rm -rf ./dist-newbuild ./.env
direnv reload

.PHONY: clean
clean:
Expand All @@ -65,8 +67,10 @@ clean:
.PHONY: clean-hint
clean-hint:
@echo -e "\n\n\n>>> PSA: if you get errors that are hard to explain,"
@echo -e ">>> try 'make full-clean' and run your command again."
@echo -e ">>> see https://github.com/wireapp/wire-server/blob/develop/docs/developer/building.md#linker-errors-while-compiling\n\n\n"
@echo -e ">>> try 'git submodule update --init --recursive' and 'make full-clean' and run your command again."
@echo -e ">>> see https://github.com/wireapp/wire-server/blob/develop/docs/developer/building.md#linker-errors-while-compiling"
@echo -e ">>> to never have to remember submodules again, try `git config --global submodule.recurse true`"
Copy link
Contributor

@elland elland Oct 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

@echo -e "\n\n\n"

.PHONY: cabal.project.local
cabal.project.local:
Expand Down
3 changes: 1 addition & 2 deletions services/spar/src/Spar/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ module Spar.App
verdictHandler,
getUserByUrefUnsafe,
getUserIdByScimExternalId,
validateEmailIfExists,
validateEmail,
errorPage,
deleteTeam,
Expand Down Expand Up @@ -196,7 +195,6 @@ autoprovisionSamlUser idp buid suid = do
guardReplacedIdP
guardScimTokens
createSamlUserWithId (idp ^. idpExtraInfo . wiTeam) buid suid
validateEmailIfExists buid suid
where
-- Replaced IdPs are not allowed to create new wire accounts.
guardReplacedIdP :: Sem r ()
Expand Down Expand Up @@ -393,6 +391,7 @@ verdictHandlerResultCore idp = \case
Nothing -> do
buid <- Id <$> Random.uuid
autoprovisionSamlUser idp buid uref
validateEmailIfExists buid uref
pure buid

Logger.log Logger.Debug ("granting sso login for " <> show uid)
Expand Down
9 changes: 3 additions & 6 deletions services/spar/src/Spar/Scim/User.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ import Network.URI (URI, parseURI)
import Polysemy
import Polysemy.Input
import qualified SAML2.WebSSO as SAML
import Spar.App (getUserByUrefUnsafe, getUserIdByScimExternalId, validateEmail, validateEmailIfExists)
import Spar.App (getUserByUrefUnsafe, getUserIdByScimExternalId)
import qualified Spar.App
import qualified Spar.Intra.BrigApp as Brig
import Spar.Scim.Auth ()
import Spar.Scim.Types (normalizeLikeStored)
Expand Down Expand Up @@ -481,11 +482,7 @@ createValidScimUser tokeninfo@ScimTokenInfo {stiTeam} vsu@(ST.ValidScimUser veid
createValidScimUserSpar stiTeam buid storedUser veid

-- If applicable, trigger email validation procedure on brig.
lift $
ST.runValidExternalIdEither
(validateEmailIfExists buid)
(\_ -> pure () {- nothing to do; user is sent an invitation that validates the address implicitly -})
veid
lift $ Spar.App.validateEmail (Just stiTeam) buid `mapM_` veidEmail veid

-- TODO: suspension via scim is brittle, and may leave active users behind: if we don't
-- reach the following line due to a crash, the user will be active.
Expand Down