diff --git a/cabal.project b/cabal.project index f35b3b9505..1d81134050 100644 --- a/cabal.project +++ b/cabal.project @@ -41,7 +41,7 @@ packages: , services/galley/ , services/gundeck/ , services/proxy/ - , services/wire-server-enterprise + -- , services/wire-server-enterprise , services/spar/ , tools/db/assets/ , tools/db/auto-whitelist/ @@ -90,8 +90,8 @@ package extended flags: +nix-dev-env package metrics-wai flags: +nix-dev-env -package wire-server-enterprise - flags: +nix-dev-env +-- package wire-server-enterprise +-- flags: +nix-dev-env package spar flags: +nix-dev-env package wire-message-proto-lens diff --git a/libs/wire-api/src/Wire/API/Routes/Public/Brig.hs b/libs/wire-api/src/Wire/API/Routes/Public/Brig.hs index 80ae80db1b..2cf3536737 100644 --- a/libs/wire-api/src/Wire/API/Routes/Public/Brig.hs +++ b/libs/wire-api/src/Wire/API/Routes/Public/Brig.hs @@ -492,32 +492,6 @@ type SelfAPI = :> ReqBody '[JSON] UserUpdate :> MultiVerb1 'PUT '[JSON] (RespondEmpty 200 "User updated") ) - :<|> Named - "change-phone" - ( Summary "Change your phone number." - :> Until 'V6 - :> ZUser - :> ZConn - :> "self" - :> "phone" - :> ReqBody '[JSON] PhoneUpdate - :> MultiVerb 'PUT '[JSON] ChangePhoneResponses (Maybe ChangePhoneError) - ) - :<|> - -- This endpoint can lead to the following events being sent: - -- - UserIdentityRemoved event to self - Named - "remove-phone" - ( Summary "Remove your phone number." - :> Until 'V6 - :> Description - "Your phone number can only be removed if you also have an \ - \email address and a password." - :> ZUser - :> "self" - :> "phone" - :> MultiVerb 'DELETE '[JSON] RemoveIdentityResponses (Maybe RemoveIdentityError) - ) :<|> -- This endpoint can lead to the following events being sent: -- - UserIdentityRemoved event to self @@ -1767,26 +1741,6 @@ type AuthAPI = :> CanThrow 'BadCredentials :> MultiVerb1 'POST '[JSON] TokenResponse ) - :<|> Named - "send-login-code" - ( "login" - :> "send" - :> Until 'V6 - :> Summary "Send a login code to a verified phone number" - :> Description - "This operation generates and sends a login code via sms for phone login.\ - \ A login code can be used only once and times out after\ - \ 10 minutes. Only one login code may be pending at a time.\ - \ For 2nd factor authentication login with email and password, use the\ - \ `/verification-code/send` endpoint." - :> ReqBody '[JSON] SendLoginCode - :> CanThrow 'InvalidPhone - :> CanThrow 'PasswordExists - :> MultiVerb1 - 'POST - '[JSON] - (Respond 200 "OK" LoginCodeTimeout) - ) :<|> Named "login" ( "login" diff --git a/libs/wire-api/src/Wire/API/User.hs b/libs/wire-api/src/Wire/API/User.hs index defa322a59..6aaedc6615 100644 --- a/libs/wire-api/src/Wire/API/User.hs +++ b/libs/wire-api/src/Wire/API/User.hs @@ -87,9 +87,6 @@ module Wire.API.User ChangePasswordResponses, LocaleUpdate (..), EmailUpdate (..), - PhoneUpdate (..), - ChangePhoneError (..), - ChangePhoneResponses, RemoveIdentityError (..), RemoveIdentityResponses, HandleUpdate (..), @@ -1557,38 +1554,6 @@ instance ToByteString EmailActivation where builder SendActivationEmail = "send_activation_email" builder AutoActivate = "auto_activate" -newtype PhoneUpdate = PhoneUpdate {puPhone :: Phone} - deriving stock (Eq, Show, Generic) - deriving newtype (Arbitrary) - deriving (ToJSON, FromJSON, S.ToSchema) via Schema PhoneUpdate - -instance ToSchema PhoneUpdate where - schema = - object "PhoneUpdate" $ - PhoneUpdate - <$> puPhone - .= field "phone" schema - -data ChangePhoneError - = PhoneExists - | InvalidNewPhone - deriving (Generic) - deriving (AsUnion ChangePhoneErrorResponses) via GenericAsUnion ChangePhoneErrorResponses ChangePhoneError - -instance GSOP.Generic ChangePhoneError - -type ChangePhoneErrorResponses = - [ ErrorResponse 'UserKeyExists, - ErrorResponse 'InvalidPhone - ] - -type ChangePhoneResponses = - ChangePhoneErrorResponses .++ '[RespondEmpty 202 "Phone updated"] - -instance (res ~ ChangePhoneResponses) => AsUnion res (Maybe ChangePhoneError) where - toUnion = maybeToUnion (toUnion @ChangePhoneErrorResponses) - fromUnion = maybeFromUnion (fromUnion @ChangePhoneErrorResponses) - data RemoveIdentityError = LastIdentity | NoIdentity diff --git a/libs/wire-api/src/Wire/API/User/Auth.hs b/libs/wire-api/src/Wire/API/User/Auth.hs index 3a029c4750..2202d1debc 100644 --- a/libs/wire-api/src/Wire/API/User/Auth.hs +++ b/libs/wire-api/src/Wire/API/User/Auth.hs @@ -24,7 +24,6 @@ module Wire.API.User.Auth LoginCode (..), LoginId (..), PendingLoginCode (..), - SendLoginCode (..), LoginCodeTimeout (..), -- * Cookies @@ -86,7 +85,7 @@ import Imports import Servant import Web.Cookie import Wire.API.Routes.MultiVerb -import Wire.API.User.Identity (EmailAddress, Phone) +import Wire.API.User.Identity (EmailAddress) import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..)) -------------------------------------------------------------------------------- @@ -154,40 +153,6 @@ instance ToSchema PendingLoginCode where <$> pendingLoginCode .= field "code" schema <*> pendingLoginTimeout .= field "expires_in" schema --------------------------------------------------------------------------------- --- SendLoginCode - --- | A request for sending a 'LoginCode' -data SendLoginCode = SendLoginCode - { lcPhone :: Phone, - lcCall :: Bool, - lcForce :: Bool - } - deriving stock (Eq, Show, Generic) - deriving (Arbitrary) via (GenericUniform SendLoginCode) - deriving (FromJSON, ToJSON, S.ToSchema) via Schema SendLoginCode - -instance ToSchema SendLoginCode where - schema = - objectWithDocModifier - "SendLoginCode" - (description ?~ "Payload for requesting a login code to be sent") - $ SendLoginCode - <$> lcPhone - .= fieldWithDocModifier - "phone" - (description ?~ "E.164 phone number to send the code to") - (unnamed schema) - <*> lcCall - .= fmap - (fromMaybe False) - ( optFieldWithDocModifier - "voice_call" - (description ?~ "Request the code with a call instead (default is SMS)") - schema - ) - <*> lcForce .= fmap (fromMaybe True) (optField "force" schema) - -------------------------------------------------------------------------------- -- LoginCodeTimeout diff --git a/libs/wire-api/src/Wire/API/User/Identity.hs b/libs/wire-api/src/Wire/API/User/Identity.hs index 97a3c503e5..63609b9234 100644 --- a/libs/wire-api/src/Wire/API/User/Identity.hs +++ b/libs/wire-api/src/Wire/API/User/Identity.hs @@ -47,14 +47,19 @@ module Wire.API.User.Identity where import Cassandra qualified as C +import Control.Applicative (optional) import Control.Error (hush) -import Control.Lens (dimap, (.~), (?~)) +import Control.Lens (dimap, over, (.~), (?~)) import Data.Aeson (FromJSON (..), ToJSON (..)) import Data.Aeson qualified as A import Data.Aeson.Types qualified as A +import Data.Attoparsec.Text import Data.ByteString (fromStrict, toStrict) +import Data.ByteString.Conversion import Data.ByteString.UTF8 qualified as UTF8 +import Data.OpenApi (ToParamSchema (..)) import Data.OpenApi qualified as S +import Data.Proxy (Proxy (Proxy)) import Data.Schema import Data.Text qualified as Text import Data.Text.Encoding @@ -66,15 +71,69 @@ import SAML2.WebSSO.Test.Arbitrary () import SAML2.WebSSO.Types qualified as SAML import SAML2.WebSSO.XML qualified as SAML import Servant +import Servant.API qualified as S import System.FilePath (()) +import Test.QuickCheck qualified as QC import Text.Email.Parser import URI.ByteString qualified as URI import URI.ByteString.QQ (uri) import Web.Scim.Schema.User.Email () import Wire.API.User.EmailAddress -import Wire.API.User.Phone import Wire.API.User.Profile (fromName, mkName) -import Wire.Arbitrary (Arbitrary, GenericUniform (..)) +import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..)) + +-------------------------------------------------------------------------------- +-- Phone (minimal definition for backward compatibility) + +-- | Phone number in E.164 format. This type is kept for backward compatibility +-- in API schemas and data structures, but phone-based functionality has been removed. +newtype Phone = Phone {fromPhone :: Text} + deriving stock (Eq, Ord, Show, Generic) + deriving (ToJSON, FromJSON, S.ToSchema) via (Schema Phone) + +instance ToParamSchema Phone where + toParamSchema _ = toParamSchema (Proxy @Text) + +instance ToSchema Phone where + schema = + over doc (S.description ?~ "E.164 phone number") $ + fromPhone + .= parsedText "PhoneNumber" (maybe (Left "Invalid phone number. Expected E.164 format.") Right . parsePhone) + +instance ToByteString Phone where + builder = builder . fromPhone + +instance FromByteString Phone where + parser = parser >>= maybe (fail "Invalid phone") pure . parsePhone + +instance S.FromHttpApiData Phone where + parseUrlPiece = maybe (Left "Invalid phone") Right . fromByteString . encodeUtf8 + +instance S.ToHttpApiData Phone where + toUrlPiece = decodeUtf8With lenientDecode . toByteString' + +instance Arbitrary Phone where + arbitrary = + Phone . Text.pack <$> do + let mkdigits n = replicateM n (QC.elements ['0' .. '9']) + mini <- mkdigits 8 + maxi <- mkdigits =<< QC.chooseInt (0, 7) + pure $ '+' : mini <> maxi + +deriving instance C.Cql Phone + +-- | Parses a phone number in E.164 format with a mandatory leading '+'. +parsePhone :: Text -> Maybe Phone +parsePhone p + | isValidPhone p = Just $! Phone p + | otherwise = Nothing + +-- | Checks whether a phone number is valid, i.e. it is in E.164 format +-- with a mandatory leading '+' followed by 10-15 digits. +isValidPhone :: Text -> Bool +isValidPhone = either (const False) (const True) . parseOnly e164 + where + e164 = char '+' *> count 8 digit *> count 7 (optional digit) *> endOfInput -------------------------------------------------------------------------------- -- UserIdentity diff --git a/libs/wire-api/src/Wire/API/User/Password.hs b/libs/wire-api/src/Wire/API/User/Password.hs index 33ad254da7..75e8542409 100644 --- a/libs/wire-api/src/Wire/API/User/Password.hs +++ b/libs/wire-api/src/Wire/API/User/Password.hs @@ -52,7 +52,7 @@ import Data.Tuple.Extra import Imports import Servant (FromHttpApiData (..)) import Wire.API.User.EmailAddress -import Wire.API.User.Phone +import Wire.API.User.Identity (Phone) import Wire.Arbitrary (Arbitrary, GenericUniform (..)) -------------------------------------------------------------------------------- diff --git a/libs/wire-api/src/Wire/API/User/Phone.hs b/libs/wire-api/src/Wire/API/User/Phone.hs deleted file mode 100644 index 5648e32632..0000000000 --- a/libs/wire-api/src/Wire/API/User/Phone.hs +++ /dev/null @@ -1,94 +0,0 @@ --- This file is part of the Wire Server implementation. --- --- Copyright (C) 2025 Wire Swiss GmbH --- --- This program is free software: you can redistribute it and/or modify it under --- the terms of the GNU Affero General Public License as published by the Free --- Software Foundation, either version 3 of the License, or (at your option) any --- later version. --- --- This program is distributed in the hope that it will be useful, but WITHOUT --- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more --- details. --- --- You should have received a copy of the GNU Affero General Public License along --- with this program. If not, see . - -module Wire.API.User.Phone - ( Phone (..), - parsePhone, - isValidPhone, - ) -where - -import Cassandra qualified as C -import Control.Applicative (optional) -import Control.Lens (over, (?~)) -import Data.Aeson (FromJSON (..), ToJSON (..)) -import Data.Attoparsec.Text -import Data.ByteString.Conversion -import Data.OpenApi (ToParamSchema (..)) -import Data.OpenApi qualified as S -import Data.Schema -import Data.Text qualified as Text -import Data.Text.Encoding -import Data.Text.Encoding.Error -import Imports -import SAML2.WebSSO.Test.Arbitrary () -import Servant -import Servant.API qualified as S -import Test.QuickCheck qualified as QC -import Web.Scim.Schema.User.Email () -import Wire.Arbitrary (Arbitrary (arbitrary)) - --------------------------------------------------------------------------------- --- Phone - -newtype Phone = Phone {fromPhone :: Text} - deriving stock (Eq, Ord, Show, Generic) - deriving (ToJSON, FromJSON, S.ToSchema) via (Schema Phone) - -instance ToParamSchema Phone where - toParamSchema _ = toParamSchema (Proxy @Text) - -instance ToSchema Phone where - schema = - over doc (S.description ?~ "E.164 phone number") $ - fromPhone - .= parsedText "PhoneNumber" (maybe (Left "Invalid phone number. Expected E.164 format.") Right . parsePhone) - -instance ToByteString Phone where - builder = builder . fromPhone - -instance FromByteString Phone where - parser = parser >>= maybe (fail "Invalid phone") pure . parsePhone - -instance S.FromHttpApiData Phone where - parseUrlPiece = maybe (Left "Invalid phone") Right . fromByteString . encodeUtf8 - -instance S.ToHttpApiData Phone where - toUrlPiece = decodeUtf8With lenientDecode . toByteString' - -instance Arbitrary Phone where - arbitrary = - Phone . Text.pack <$> do - let mkdigits n = replicateM n (QC.elements ['0' .. '9']) - mini <- mkdigits 8 - maxi <- mkdigits =<< QC.chooseInt (0, 7) - pure $ '+' : mini <> maxi - -deriving instance C.Cql Phone - --- | Parses a phone number in E.164 format with a mandatory leading '+'. -parsePhone :: Text -> Maybe Phone -parsePhone p - | isValidPhone p = Just $! Phone p - | otherwise = Nothing - --- | Checks whether a phone number is valid, i.e. it is in E.164 format --- with a mandatory leading '+' followed by 10-15 digits. -isValidPhone :: Text -> Bool -isValidPhone = either (const False) (const True) . parseOnly e164 - where - e164 = char '+' *> count 8 digit *> count 7 (optional digit) *> endOfInput diff --git a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated.hs b/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated.hs index 02dc1d21e4..a05027f4af 100644 --- a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated.hs +++ b/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated.hs @@ -140,7 +140,6 @@ import Test.Wire.API.Golden.Generated.PasswordResetKey_user qualified import Test.Wire.API.Golden.Generated.PasswordReset_provider qualified import Test.Wire.API.Golden.Generated.PendingLoginCode_user qualified import Test.Wire.API.Golden.Generated.Permissions_team qualified -import Test.Wire.API.Golden.Generated.PhoneUpdate_user qualified import Test.Wire.API.Golden.Generated.Phone_user qualified import Test.Wire.API.Golden.Generated.Pict_user qualified import Test.Wire.API.Golden.Generated.PrekeyBundle_user qualified @@ -178,7 +177,6 @@ import Test.Wire.API.Golden.Generated.Scheme_user qualified import Test.Wire.API.Golden.Generated.SearchResult_20Contact_user qualified import Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user qualified import Test.Wire.API.Golden.Generated.SelfProfile_user qualified -import Test.Wire.API.Golden.Generated.SendLoginCode_user qualified import Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider qualified import Test.Wire.API.Golden.Generated.ServiceKeyType_provider qualified import Test.Wire.API.Golden.Generated.ServiceKey_provider qualified @@ -969,8 +967,6 @@ tests = testObjects [(Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_1, "testObject_LocaleUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_2, "testObject_LocaleUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_3, "testObject_LocaleUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_4, "testObject_LocaleUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_5, "testObject_LocaleUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_6, "testObject_LocaleUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_7, "testObject_LocaleUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_8, "testObject_LocaleUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_9, "testObject_LocaleUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_10, "testObject_LocaleUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_11, "testObject_LocaleUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_12, "testObject_LocaleUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_13, "testObject_LocaleUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_14, "testObject_LocaleUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_15, "testObject_LocaleUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_16, "testObject_LocaleUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_17, "testObject_LocaleUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_18, "testObject_LocaleUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_19, "testObject_LocaleUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_20, "testObject_LocaleUpdate_user_20.json")], testGroup "Golden: EmailUpdate_user" $ testObjects [(Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_1, "testObject_EmailUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_2, "testObject_EmailUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_3, "testObject_EmailUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_4, "testObject_EmailUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_5, "testObject_EmailUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_6, "testObject_EmailUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_7, "testObject_EmailUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_8, "testObject_EmailUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_9, "testObject_EmailUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_10, "testObject_EmailUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_11, "testObject_EmailUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_12, "testObject_EmailUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_13, "testObject_EmailUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_14, "testObject_EmailUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_15, "testObject_EmailUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_16, "testObject_EmailUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_17, "testObject_EmailUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_18, "testObject_EmailUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_19, "testObject_EmailUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_20, "testObject_EmailUpdate_user_20.json")], - testGroup "Golden: PhoneUpdate_user" $ - testObjects [(Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_1, "testObject_PhoneUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_2, "testObject_PhoneUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_3, "testObject_PhoneUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_4, "testObject_PhoneUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_5, "testObject_PhoneUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_6, "testObject_PhoneUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_7, "testObject_PhoneUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_8, "testObject_PhoneUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_9, "testObject_PhoneUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_10, "testObject_PhoneUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_11, "testObject_PhoneUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_12, "testObject_PhoneUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_13, "testObject_PhoneUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_14, "testObject_PhoneUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_15, "testObject_PhoneUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_16, "testObject_PhoneUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_17, "testObject_PhoneUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_18, "testObject_PhoneUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_19, "testObject_PhoneUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_20, "testObject_PhoneUpdate_user_20.json")], testGroup "Golden: HandleUpdate_user" $ testObjects [(Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_1, "testObject_HandleUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_2, "testObject_HandleUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_3, "testObject_HandleUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_4, "testObject_HandleUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_5, "testObject_HandleUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_6, "testObject_HandleUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_7, "testObject_HandleUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_8, "testObject_HandleUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_9, "testObject_HandleUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_10, "testObject_HandleUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_11, "testObject_HandleUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_12, "testObject_HandleUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_13, "testObject_HandleUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_14, "testObject_HandleUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_15, "testObject_HandleUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_16, "testObject_HandleUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_17, "testObject_HandleUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_18, "testObject_HandleUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_19, "testObject_HandleUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_20, "testObject_HandleUpdate_user_20.json")], testGroup "Golden: DeleteUser_user" $ @@ -989,8 +985,6 @@ tests = testObjects [(Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_1, "testObject_LoginCode_user_1.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_2, "testObject_LoginCode_user_2.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_3, "testObject_LoginCode_user_3.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_4, "testObject_LoginCode_user_4.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_5, "testObject_LoginCode_user_5.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_6, "testObject_LoginCode_user_6.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_7, "testObject_LoginCode_user_7.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_8, "testObject_LoginCode_user_8.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_9, "testObject_LoginCode_user_9.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_10, "testObject_LoginCode_user_10.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_11, "testObject_LoginCode_user_11.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_12, "testObject_LoginCode_user_12.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_13, "testObject_LoginCode_user_13.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_14, "testObject_LoginCode_user_14.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_15, "testObject_LoginCode_user_15.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_16, "testObject_LoginCode_user_16.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_17, "testObject_LoginCode_user_17.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_18, "testObject_LoginCode_user_18.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_19, "testObject_LoginCode_user_19.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_20, "testObject_LoginCode_user_20.json")], testGroup "Golden: PendingLoginCode_user" $ testObjects [(Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_1, "testObject_PendingLoginCode_user_1.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_2, "testObject_PendingLoginCode_user_2.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_3, "testObject_PendingLoginCode_user_3.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_4, "testObject_PendingLoginCode_user_4.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_5, "testObject_PendingLoginCode_user_5.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_6, "testObject_PendingLoginCode_user_6.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_7, "testObject_PendingLoginCode_user_7.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_8, "testObject_PendingLoginCode_user_8.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_9, "testObject_PendingLoginCode_user_9.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_10, "testObject_PendingLoginCode_user_10.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_11, "testObject_PendingLoginCode_user_11.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_12, "testObject_PendingLoginCode_user_12.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_13, "testObject_PendingLoginCode_user_13.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_14, "testObject_PendingLoginCode_user_14.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_15, "testObject_PendingLoginCode_user_15.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_16, "testObject_PendingLoginCode_user_16.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_17, "testObject_PendingLoginCode_user_17.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_18, "testObject_PendingLoginCode_user_18.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_19, "testObject_PendingLoginCode_user_19.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_20, "testObject_PendingLoginCode_user_20.json")], - testGroup "Golden: SendLoginCode_user" $ - testObjects [(Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_1, "testObject_SendLoginCode_user_1.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_2, "testObject_SendLoginCode_user_2.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_3, "testObject_SendLoginCode_user_3.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_4, "testObject_SendLoginCode_user_4.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_5, "testObject_SendLoginCode_user_5.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_6, "testObject_SendLoginCode_user_6.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_7, "testObject_SendLoginCode_user_7.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_8, "testObject_SendLoginCode_user_8.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_9, "testObject_SendLoginCode_user_9.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_10, "testObject_SendLoginCode_user_10.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_11, "testObject_SendLoginCode_user_11.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_12, "testObject_SendLoginCode_user_12.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_13, "testObject_SendLoginCode_user_13.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_14, "testObject_SendLoginCode_user_14.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_15, "testObject_SendLoginCode_user_15.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_16, "testObject_SendLoginCode_user_16.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_17, "testObject_SendLoginCode_user_17.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_18, "testObject_SendLoginCode_user_18.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_19, "testObject_SendLoginCode_user_19.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_20, "testObject_SendLoginCode_user_20.json")], testGroup "Golden: LoginCodeTimeout_user" $ testObjects [(Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_1, "testObject_LoginCodeTimeout_user_1.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_2, "testObject_LoginCodeTimeout_user_2.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_3, "testObject_LoginCodeTimeout_user_3.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_4, "testObject_LoginCodeTimeout_user_4.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_5, "testObject_LoginCodeTimeout_user_5.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_6, "testObject_LoginCodeTimeout_user_6.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_7, "testObject_LoginCodeTimeout_user_7.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_8, "testObject_LoginCodeTimeout_user_8.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_9, "testObject_LoginCodeTimeout_user_9.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_10, "testObject_LoginCodeTimeout_user_10.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_11, "testObject_LoginCodeTimeout_user_11.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_12, "testObject_LoginCodeTimeout_user_12.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_13, "testObject_LoginCodeTimeout_user_13.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_14, "testObject_LoginCodeTimeout_user_14.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_15, "testObject_LoginCodeTimeout_user_15.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_16, "testObject_LoginCodeTimeout_user_16.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_17, "testObject_LoginCodeTimeout_user_17.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_18, "testObject_LoginCodeTimeout_user_18.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_19, "testObject_LoginCodeTimeout_user_19.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_20, "testObject_LoginCodeTimeout_user_20.json")], testGroup "Golden: CookieLabel_user" $ diff --git a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/PhoneUpdate_user.hs b/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/PhoneUpdate_user.hs deleted file mode 100644 index d0cf97e9ab..0000000000 --- a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/PhoneUpdate_user.hs +++ /dev/null @@ -1,80 +0,0 @@ --- This file is part of the Wire Server implementation. --- --- Copyright (C) 2022 Wire Swiss GmbH --- --- This program is free software: you can redistribute it and/or modify it under --- the terms of the GNU Affero General Public License as published by the Free --- Software Foundation, either version 3 of the License, or (at your option) any --- later version. --- --- This program is distributed in the hope that it will be useful, but WITHOUT --- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more --- details. --- --- You should have received a copy of the GNU Affero General Public License along --- with this program. If not, see . - -module Test.Wire.API.Golden.Generated.PhoneUpdate_user where - -import Wire.API.User (Phone (Phone, fromPhone), PhoneUpdate (..)) - -testObject_PhoneUpdate_user_1 :: PhoneUpdate -testObject_PhoneUpdate_user_1 = PhoneUpdate {puPhone = Phone {fromPhone = "+059566184168"}} - -testObject_PhoneUpdate_user_2 :: PhoneUpdate -testObject_PhoneUpdate_user_2 = PhoneUpdate {puPhone = Phone {fromPhone = "+030094397"}} - -testObject_PhoneUpdate_user_3 :: PhoneUpdate -testObject_PhoneUpdate_user_3 = PhoneUpdate {puPhone = Phone {fromPhone = "+39788099045"}} - -testObject_PhoneUpdate_user_4 :: PhoneUpdate -testObject_PhoneUpdate_user_4 = PhoneUpdate {puPhone = Phone {fromPhone = "+6060447691"}} - -testObject_PhoneUpdate_user_5 :: PhoneUpdate -testObject_PhoneUpdate_user_5 = PhoneUpdate {puPhone = Phone {fromPhone = "+27199438794"}} - -testObject_PhoneUpdate_user_6 :: PhoneUpdate -testObject_PhoneUpdate_user_6 = PhoneUpdate {puPhone = Phone {fromPhone = "+403076793307922"}} - -testObject_PhoneUpdate_user_7 :: PhoneUpdate -testObject_PhoneUpdate_user_7 = PhoneUpdate {puPhone = Phone {fromPhone = "+58949773"}} - -testObject_PhoneUpdate_user_8 :: PhoneUpdate -testObject_PhoneUpdate_user_8 = PhoneUpdate {puPhone = Phone {fromPhone = "+5689710422639"}} - -testObject_PhoneUpdate_user_9 :: PhoneUpdate -testObject_PhoneUpdate_user_9 = PhoneUpdate {puPhone = Phone {fromPhone = "+60751390"}} - -testObject_PhoneUpdate_user_10 :: PhoneUpdate -testObject_PhoneUpdate_user_10 = PhoneUpdate {puPhone = Phone {fromPhone = "+431000511612"}} - -testObject_PhoneUpdate_user_11 :: PhoneUpdate -testObject_PhoneUpdate_user_11 = PhoneUpdate {puPhone = Phone {fromPhone = "+1939668594372"}} - -testObject_PhoneUpdate_user_12 :: PhoneUpdate -testObject_PhoneUpdate_user_12 = PhoneUpdate {puPhone = Phone {fromPhone = "+156939434"}} - -testObject_PhoneUpdate_user_13 :: PhoneUpdate -testObject_PhoneUpdate_user_13 = PhoneUpdate {puPhone = Phone {fromPhone = "+54660214"}} - -testObject_PhoneUpdate_user_14 :: PhoneUpdate -testObject_PhoneUpdate_user_14 = PhoneUpdate {puPhone = Phone {fromPhone = "+17373888509447"}} - -testObject_PhoneUpdate_user_15 :: PhoneUpdate -testObject_PhoneUpdate_user_15 = PhoneUpdate {puPhone = Phone {fromPhone = "+817869255119807"}} - -testObject_PhoneUpdate_user_16 :: PhoneUpdate -testObject_PhoneUpdate_user_16 = PhoneUpdate {puPhone = Phone {fromPhone = "+541926748"}} - -testObject_PhoneUpdate_user_17 :: PhoneUpdate -testObject_PhoneUpdate_user_17 = PhoneUpdate {puPhone = Phone {fromPhone = "+7836584019595"}} - -testObject_PhoneUpdate_user_18 :: PhoneUpdate -testObject_PhoneUpdate_user_18 = PhoneUpdate {puPhone = Phone {fromPhone = "+3488257402473"}} - -testObject_PhoneUpdate_user_19 :: PhoneUpdate -testObject_PhoneUpdate_user_19 = PhoneUpdate {puPhone = Phone {fromPhone = "+1413522786322"}} - -testObject_PhoneUpdate_user_20 :: PhoneUpdate -testObject_PhoneUpdate_user_20 = PhoneUpdate {puPhone = Phone {fromPhone = "+64700149027"}} diff --git a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/SendLoginCode_user.hs b/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/SendLoginCode_user.hs deleted file mode 100644 index ba2d75d38a..0000000000 --- a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/SendLoginCode_user.hs +++ /dev/null @@ -1,102 +0,0 @@ --- This file is part of the Wire Server implementation. --- --- Copyright (C) 2022 Wire Swiss GmbH --- --- This program is free software: you can redistribute it and/or modify it under --- the terms of the GNU Affero General Public License as published by the Free --- Software Foundation, either version 3 of the License, or (at your option) any --- later version. --- --- This program is distributed in the hope that it will be useful, but WITHOUT --- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more --- details. --- --- You should have received a copy of the GNU Affero General Public License along --- with this program. If not, see . - -module Test.Wire.API.Golden.Generated.SendLoginCode_user where - -import Imports (Bool (False, True)) -import Wire.API.User (Phone (Phone, fromPhone)) -import Wire.API.User.Auth (SendLoginCode (..)) - -testObject_SendLoginCode_user_1 :: SendLoginCode -testObject_SendLoginCode_user_1 = - SendLoginCode {lcPhone = Phone {fromPhone = "+7852237164"}, lcCall = True, lcForce = False} - -testObject_SendLoginCode_user_2 :: SendLoginCode -testObject_SendLoginCode_user_2 = - SendLoginCode {lcPhone = Phone {fromPhone = "+1361303129"}, lcCall = False, lcForce = True} - -testObject_SendLoginCode_user_3 :: SendLoginCode -testObject_SendLoginCode_user_3 = - SendLoginCode {lcPhone = Phone {fromPhone = "+0278364030"}, lcCall = False, lcForce = False} - -testObject_SendLoginCode_user_4 :: SendLoginCode -testObject_SendLoginCode_user_4 = - SendLoginCode {lcPhone = Phone {fromPhone = "+7017081269"}, lcCall = True, lcForce = True} - -testObject_SendLoginCode_user_5 :: SendLoginCode -testObject_SendLoginCode_user_5 = - SendLoginCode {lcPhone = Phone {fromPhone = "+7210550349"}, lcCall = True, lcForce = True} - -testObject_SendLoginCode_user_6 :: SendLoginCode -testObject_SendLoginCode_user_6 = - SendLoginCode {lcPhone = Phone {fromPhone = "+57561912568"}, lcCall = True, lcForce = True} - -testObject_SendLoginCode_user_7 :: SendLoginCode -testObject_SendLoginCode_user_7 = - SendLoginCode {lcPhone = Phone {fromPhone = "+0478831396"}, lcCall = False, lcForce = True} - -testObject_SendLoginCode_user_8 :: SendLoginCode -testObject_SendLoginCode_user_8 = - SendLoginCode {lcPhone = Phone {fromPhone = "+731463104296"}, lcCall = True, lcForce = False} - -testObject_SendLoginCode_user_9 :: SendLoginCode -testObject_SendLoginCode_user_9 = - SendLoginCode {lcPhone = Phone {fromPhone = "+95425609807"}, lcCall = True, lcForce = False} - -testObject_SendLoginCode_user_10 :: SendLoginCode -testObject_SendLoginCode_user_10 = - SendLoginCode {lcPhone = Phone {fromPhone = "+43915096382846"}, lcCall = False, lcForce = False} - -testObject_SendLoginCode_user_11 :: SendLoginCode -testObject_SendLoginCode_user_11 = - SendLoginCode {lcPhone = Phone {fromPhone = "+08251498"}, lcCall = True, lcForce = False} - -testObject_SendLoginCode_user_12 :: SendLoginCode -testObject_SendLoginCode_user_12 = - SendLoginCode {lcPhone = Phone {fromPhone = "+8151944856397"}, lcCall = False, lcForce = True} - -testObject_SendLoginCode_user_13 :: SendLoginCode -testObject_SendLoginCode_user_13 = - SendLoginCode {lcPhone = Phone {fromPhone = "+40692963"}, lcCall = False, lcForce = True} - -testObject_SendLoginCode_user_14 :: SendLoginCode -testObject_SendLoginCode_user_14 = - SendLoginCode {lcPhone = Phone {fromPhone = "+661842350866268"}, lcCall = True, lcForce = True} - -testObject_SendLoginCode_user_15 :: SendLoginCode -testObject_SendLoginCode_user_15 = - SendLoginCode {lcPhone = Phone {fromPhone = "+921771798513"}, lcCall = True, lcForce = False} - -testObject_SendLoginCode_user_16 :: SendLoginCode -testObject_SendLoginCode_user_16 = - SendLoginCode {lcPhone = Phone {fromPhone = "+250712302"}, lcCall = False, lcForce = False} - -testObject_SendLoginCode_user_17 :: SendLoginCode -testObject_SendLoginCode_user_17 = - SendLoginCode {lcPhone = Phone {fromPhone = "+073544070484537"}, lcCall = False, lcForce = False} - -testObject_SendLoginCode_user_18 :: SendLoginCode -testObject_SendLoginCode_user_18 = - SendLoginCode {lcPhone = Phone {fromPhone = "+938837684"}, lcCall = True, lcForce = False} - -testObject_SendLoginCode_user_19 :: SendLoginCode -testObject_SendLoginCode_user_19 = - SendLoginCode {lcPhone = Phone {fromPhone = "+8081583978"}, lcCall = False, lcForce = True} - -testObject_SendLoginCode_user_20 :: SendLoginCode -testObject_SendLoginCode_user_20 = - SendLoginCode {lcPhone = Phone {fromPhone = "+55901961505705"}, lcCall = True, lcForce = False} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json deleted file mode 100644 index e2e0a54d51..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+059566184168" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json deleted file mode 100644 index 2edaeeb14c..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+431000511612" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json deleted file mode 100644 index bad9e03326..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+1939668594372" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json deleted file mode 100644 index 22a4474435..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+156939434" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json deleted file mode 100644 index 45f00e3be0..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+54660214" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json deleted file mode 100644 index 0993ecb56b..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+17373888509447" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json deleted file mode 100644 index 119e498a1d..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+817869255119807" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json deleted file mode 100644 index 2fe9ce33d3..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+541926748" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json deleted file mode 100644 index 28dd8427d2..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+7836584019595" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json deleted file mode 100644 index 421b57587d..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+3488257402473" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json deleted file mode 100644 index 8ca748e27a..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+1413522786322" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json deleted file mode 100644 index 41577586d9..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+030094397" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json deleted file mode 100644 index 992bc694e4..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+64700149027" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json deleted file mode 100644 index 932505249e..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+39788099045" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json deleted file mode 100644 index b9a771478d..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+6060447691" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json deleted file mode 100644 index b7a95f7759..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+27199438794" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json deleted file mode 100644 index a0a90e3400..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+403076793307922" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json deleted file mode 100644 index b1112e1e2d..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+58949773" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json deleted file mode 100644 index 4e030e1182..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+5689710422639" -} diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json deleted file mode 100644 index 07de23169b..0000000000 --- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "phone": "+60751390" -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json deleted file mode 100644 index 1bafe991f6..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+7852237164", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json deleted file mode 100644 index 5dacbe14be..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+43915096382846", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json deleted file mode 100644 index 6a4551985f..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+08251498", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json deleted file mode 100644 index 8b562bf8bd..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+8151944856397", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json deleted file mode 100644 index bd154b7520..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+40692963", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json deleted file mode 100644 index f737860916..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+661842350866268", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json deleted file mode 100644 index c16cc5f52f..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+921771798513", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json deleted file mode 100644 index db2431d558..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+250712302", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json deleted file mode 100644 index 190eb5fc0e..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+073544070484537", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json deleted file mode 100644 index f4e69f0d7d..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+938837684", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json deleted file mode 100644 index 50aa6c6249..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+8081583978", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json deleted file mode 100644 index 46953585e1..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+1361303129", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json deleted file mode 100644 index ada6762a40..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+55901961505705", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json deleted file mode 100644 index 1902ecd0bc..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+0278364030", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json deleted file mode 100644 index 47ff049e6c..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+7017081269", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json deleted file mode 100644 index 6a1b8d2ea0..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+7210550349", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json deleted file mode 100644 index 7f083fdd29..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+57561912568", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json deleted file mode 100644 index 2965c03f43..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": true, - "phone": "+0478831396", - "voice_call": false -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json deleted file mode 100644 index f99c81f3bc..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+731463104296", - "voice_call": true -} diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json deleted file mode 100644 index 6050998c9a..0000000000 --- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "force": false, - "phone": "+95425609807", - "voice_call": true -} diff --git a/libs/wire-api/wire-api.cabal b/libs/wire-api/wire-api.cabal index cc4ec01bb5..5f4771d957 100644 --- a/libs/wire-api/wire-api.cabal +++ b/libs/wire-api/wire-api.cabal @@ -260,7 +260,6 @@ library Wire.API.User.IdentityProvider Wire.API.User.Orphans Wire.API.User.Password - Wire.API.User.Phone Wire.API.User.Profile Wire.API.User.RichInfo Wire.API.User.Saml diff --git a/services/brig/src/Brig/API/Auth.hs b/services/brig/src/Brig/API/Auth.hs index 962a8d79b9..7417335936 100644 --- a/services/brig/src/Brig/API/Auth.hs +++ b/services/brig/src/Brig/API/Auth.hs @@ -125,11 +125,6 @@ access mcid t mt = traverse mkUserTokenCookie =<< Auth.renewAccess t mt mcid !>> (StdError . zauthError) -sendLoginCode :: SendLoginCode -> Handler r LoginCodeTimeout -sendLoginCode _ = - -- Login by phone is unsupported - throwStd (errorToWai @'E.InvalidPhone) - login :: ( Member GalleyAPIAccess r, Member TinyLog r, diff --git a/services/brig/src/Brig/API/Public.hs b/services/brig/src/Brig/API/Public.hs index 3d37d91d4e..fa57713584 100644 --- a/services/brig/src/Brig/API/Public.hs +++ b/services/brig/src/Brig/API/Public.hs @@ -477,8 +477,6 @@ servantSitemap = Named @"get-self" getSelf :<|> Named @"delete-self" deleteSelfUser :<|> Named @"put-self" updateUser - :<|> Named @"change-phone" changePhone - :<|> Named @"remove-phone" removePhone :<|> Named @"remove-email" removeEmail :<|> Named @"check-password-exists" checkPasswordExists :<|> Named @"change-password" changePassword @@ -590,7 +588,6 @@ servantSitemap = authAPI :: ServerT AuthAPI (Handler r) authAPI = Named @"access" accessH - :<|> Named @"send-login-code" sendLoginCode :<|> Named @"login" login :<|> Named @"logout" logoutH :<|> Named @"change-self-email" changeSelfEmail @@ -1134,18 +1131,6 @@ updateUser uid conn uu = do lift . liftSem $ updateUserProfile uid (Just conn) UpdateOriginWireClient update --- | Phone based functionality is not supported any more, but the handler is --- kept here so long as client API version 5 is supported. -changePhone :: - UserId -> - ConnId -> - Public.PhoneUpdate -> - (Handler r) (Maybe Public.ChangePhoneError) -changePhone _ _ _ = pure . Just $ Public.InvalidNewPhone - -removePhone :: UserId -> Handler r (Maybe Public.RemoveIdentityError) -removePhone _ = (lift . pure) Nothing - removeEmail :: ( Member UserSubsystem r, Member (Error UserSubsystemError) r