Cleanup dead code.

wireapp · Aug 19, 2024 · 68a03de · 68a03de
1 parent 02fd276
commit 68a03de
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/libs/wire-api/src/Wire/API/User/Identity.hs b/libs/wire-api/src/Wire/API/User/Identity.hs
@@ -316,8 +316,6 @@ emailFromSAML = fromJust . emailAddressText . SAMLEmail.render
 emailToSAMLNameID :: EmailAddress -> Either String SAML.NameID
 emailToSAMLNameID = SAML.emailNameID . fromEmail
 
--- emailToSAMLNameID mail = either (Left "not an email") (SAML.emailNameID . fromEmail $ mail)
-
 emailFromSAMLNameID :: SAML.NameID -> Maybe EmailAddress
 emailFromSAMLNameID nid = case nid ^. SAML.nameID of
   SAML.UNameIDEmail email -> Just . emailFromSAML . CI.original $ email

diff --git a/services/brig/test/integration/API/UserPendingActivation.hs b/services/brig/test/integration/API/UserPendingActivation.hs
@@ -213,21 +213,11 @@ randomScimUserWithSubjectAndRichInfo richInfo = do
     ( (Scim.User.empty @SparTag userSchemas ("scimuser_" <> suffix) (ScimUserExtra richInfo))
         { Scim.User.displayName = Just ("ScimUser" <> suffix),
           Scim.User.externalId = Just externalId,
-          -- Scim.User.emails = emailFromEmailAddress <$> emails,
           Scim.User.phoneNumbers = phones
         },
       subj
     )
 
--- where
---   emailFromEmailAddress :: EmailAddress -> Email.Email
---   emailFromEmailAddress addr =
---     Email.Email
---       { typ = Nothing,
---         value = (Email.EmailAddress addr),
---         primary = Nothing
---       }
-
 randomScimEmail :: (MonadRandom m) => m EmailAddress
 randomScimEmail = do
   localpart <- cs <$> replicateM 15 (getRandomR ('a', 'z'))

diff --git a/services/federator/test/integration/Test/Federator/Util.hs b/services/federator/test/integration/Test/Federator/Util.hs
@@ -320,7 +320,6 @@ mkEmailRandomLocalSuffix :: (MonadIO m) => Text -> m EmailAddress
 mkEmailRandomLocalSuffix e = do
   uid <- liftIO UUID.nextRandom
   case emailAddressText e of
-    -- TODO:
     Just mail -> pure $ unsafeEmailAddress ((localPart mail) <> "+" <> UUID.toASCIIBytes uid) (domainPart mail)
     Nothing -> error $ "Invalid email address: " ++ Text.unpack e
 

diff --git a/services/spar/src/Spar/Intra/BrigApp.hs b/services/spar/src/Spar/Intra/BrigApp.hs
@@ -78,7 +78,7 @@ veidFromUserSSOId = \case
     case urefToEmail uref of
       Nothing -> pure $ UrefOnly uref
       Just email -> pure $ EmailAndUref email uref
-  -- TODO: parse fallback emails?
+  -- FUTUREWORK(elland): account for SCIM emails fields?
   UserScimExternalId email ->
     maybe
       (throwError "externalId not an email and no issuer")

diff --git a/services/spar/src/Spar/Scim/User.hs b/services/spar/src/Spar/Scim/User.hs
@@ -260,7 +260,7 @@ validateHandle txt = case parseHandle txt of
 -- in our database, and implementing verification requires design decisions
 -- that we haven't made yet. We store them in our SCIM blobs, but don't syncronize them with
 -- Brig. See <https://github.com/wireapp/wire-server/pull/559#discussion_r247466760>.
--- TODO(elland): verify with fisx if this still applies.
+-- FUTUREWORK(elland): verify with fisx if this still applies.
 validateScimUser' ::
   forall r.
   ( Member (Error Scim.ScimError) r,
@@ -567,7 +567,7 @@ createValidScimUser tokeninfo@ScimTokenInfo {stiTeam} vsu@(ST.ValidScimUser {..}
       createValidScimUserSpar stiTeam buid storedUser externalId
 
       -- If applicable, trigger email validation procedure on brig.
-      -- TODO: validate fallback emails?
+      -- FUTUREWORK: validate fallback emails?
       lift $ Spar.App.validateEmail (Just stiTeam) buid `mapM_` vsUserEmail vsu
 
       -- TODO: suspension via scim is brittle, and may leave active users behind: if we don't