WIP

Author: akshaymankar

libs/galley-types/src/Galley/Types/IdMapping.hs

@@ -24,7 +24,6 @@ module Galley.Types.IdMapping
   )
 where
 
-import Data.Aeson
 import Data.Coerce (coerce)
 import Data.Id (Id, Mapped, Remote)
 import Data.Qualified (Qualified)
@@ -42,14 +41,6 @@ newtype PostIdMappingRequest = PostIdMappingRequest
 mkPostIdMappingRequest :: Qualified (Id (Remote a)) -> PostIdMappingRequest
 mkPostIdMappingRequest = PostIdMappingRequest . coerce
 
-instance ToJSON PostIdMappingRequest where
-  toJSON (PostIdMappingRequest qualifiedId) =
-    object ["qualified_id" .= qualifiedId]
-
-instance FromJSON PostIdMappingRequest where
-  parseJSON = withObject "PostIdMappingRequest" $ \o ->
-    PostIdMappingRequest <$> o .: "qualified_id"
-
 -- | Response used for inter-service communication between Galley and Brig to ensure that ID
 -- mappings discovered in one service are also known in the other.
 --
@@ -58,11 +49,3 @@ instance FromJSON PostIdMappingRequest where
 newtype PostIdMappingResponse = PostIdMappingResponse
   {resMappedId :: Id (Mapped ())}
   deriving stock (Eq, Show)
-
-instance ToJSON PostIdMappingResponse where
-  toJSON (PostIdMappingResponse mappedId) =
-    object ["mapped_id" .= mappedId]
-
-instance FromJSON PostIdMappingResponse where
-  parseJSON = withObject "PostIdMappingResponse" $ \o ->
-    PostIdMappingResponse <$> o .: "mapped_id"

libs/galley-types/test/unit/Test/Galley/Types.hs

@@ -53,9 +53,7 @@ tests =
         -- accordingly.  Just maintain the property that adding a new feature name will break
         -- this test, and force future develpers to consider what permissions they want to set.
         assertBool "all covered" (all (roleHasPerm RoleExternalPartner) (ViewTeamFeature <$> [minBound ..])),
-      testRoundTrip @FeatureFlags,
-      testRoundTrip @PostIdMappingRequest,
-      testRoundTrip @PostIdMappingRequest
+      testRoundTrip @FeatureFlags
     ]
 
 instance Arbitrary FeatureFlags where

libs/types-common/src/Data/IdMapping.hs

@@ -58,15 +58,6 @@ data IdMapping a = IdMapping
   }
   deriving stock (Eq, Ord, Show)
 
--- Don't add a FromJSON instance!
--- We don't want to just accept mappings we didn't create ourselves.
-instance ToJSON (IdMapping a) where
-  toJSON IdMapping {_imMappedId, _imQualifiedId} =
-    Aeson.object
-      [ "mapped_id" .= _imMappedId,
-        "qualified_id" .= _imQualifiedId
-      ]
-
 -- | Deterministically hashes a qualified ID to a single UUID
 --
 -- Note that when using this function to obtain a mapped ID, you should also create

libs/types-common/src/Data/Qualified.hs

@@ -35,8 +35,6 @@ module Data.Qualified
 where
 
 import Control.Applicative (optional)
-import Data.Aeson (FromJSON, ToJSON, withText)
-import qualified Data.Aeson as Aeson
 import qualified Data.Attoparsec.ByteString.Char8 as Atto
 import Data.Bifunctor (first)
 import Data.ByteString.Conversion (FromByteString (parser))
@@ -129,11 +127,11 @@ renderQualifiedId = renderQualified (cs . UUID.toString . toUUID)
 mkQualifiedId :: Text -> Either String (Qualified (Id a))
 mkQualifiedId = Atto.parseOnly (parser <* Atto.endOfInput) . Text.E.encodeUtf8
 
-instance ToJSON (Qualified (Id a)) where
-  toJSON = Aeson.String . renderQualifiedId
+-- instance ToJSON (Qualified (Id a)) where
+--   toJSON = Aeson.String . renderQualifiedId
 
-instance FromJSON (Qualified (Id a)) where
-  parseJSON = withText "QualifiedUserId" $ either fail pure . mkQualifiedId
+-- instance FromJSON (Qualified (Id a)) where
+--   parseJSON = withText "QualifiedUserId" $ either fail pure . mkQualifiedId
 
 instance FromHttpApiData (Qualified (Id a)) where
   parseUrlPiece = first cs . mkQualifiedId
@@ -149,11 +147,11 @@ renderQualifiedHandle = renderQualified fromHandle
 mkQualifiedHandle :: Text -> Either String (Qualified Handle)
 mkQualifiedHandle = Atto.parseOnly (parser <* Atto.endOfInput) . Text.E.encodeUtf8
 
-instance ToJSON (Qualified Handle) where
-  toJSON = Aeson.String . renderQualifiedHandle
+-- instance ToJSON (Qualified Handle) where
+--   toJSON = Aeson.String . renderQualifiedHandle
 
-instance FromJSON (Qualified Handle) where
-  parseJSON = withText "QualifiedHandle" $ either fail pure . mkQualifiedHandle
+-- instance FromJSON (Qualified Handle) where
+--   parseJSON = withText "QualifiedHandle" $ either fail pure . mkQualifiedHandle
 
 instance FromHttpApiData (Qualified Handle) where
   parseUrlPiece = first cs . mkQualifiedHandle

libs/types-common/test/Test/Qualified.hs

@@ -69,9 +69,7 @@ testQualifiedSerialization =
       \(x :: OptionallyQualified UserId) -> do
         let render = Text.E.encodeUtf8 . either (cs . UUID.toString . toUUID) renderQualifiedId . eitherQualifiedOrNot
         let parse = BS.C.runParser BS.C.parser
-        parse (render x) === Right x,
-    jsonRoundtrip @(Qualified Handle),
-    jsonRoundtrip @(Qualified UserId)
+        parse (render x) === Right x
   ]
 
 jsonRoundtrip ::

libs/wire-api-federation/src/Wire/API/Federation/Event.hs

@@ -7,6 +7,7 @@
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2020 Wire Swiss GmbH <[email protected]>
+
 --
 -- 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
@@ -54,7 +55,7 @@ data AnyEvent
 -- To represent possiblity of multiple different event types, use a sum type around it.
 data ConversationEvent a = ConversationEvent
   { eventConversation :: Qualified ConvId,
-    eventFrom :: Qualified UserId,
+    eventFrom :: UserId,
     eventTime :: UTCTime,
     eventData :: a
   }
@@ -68,7 +69,7 @@ newtype MemberJoin = MemberJoin
   deriving (ToJSON, FromJSON) via (CustomEncoded MemberJoin)
 
 data SimpleMember = SimpleMember
-  { smId :: Qualified UserId,
+  { smId :: UserId,
     smConversationRole :: ConversationRole
   }
   deriving stock (Eq, Show, Generic)

libs/wire-api/package.yaml

@@ -35,6 +35,7 @@ library:
   - generic-random >=1.2
   - hashable
   - hostname-validate
+  - insert-ordered-containers
   - iproute >=1.5
   - iso3166-country-codes >=0.2
   - iso639 >=0.1

libs/wire-api/src/Wire/API/User.hs

@@ -111,13 +111,15 @@ import qualified Data.Code as Code
 import qualified Data.Currency as Currency
 import Data.Handle (Handle)
 import qualified Data.HashMap.Strict as HashMap
+import qualified Data.HashMap.Strict.InsOrd as InsOrdHashMap
 import Data.Id
 import Data.Json.Util (UTCTimeMillis, (#))
 import qualified Data.List as List
 import Data.Misc (PlainTextPassword (..))
 import Data.Proxy (Proxy (..))
+import Data.Qualified (Qualified)
 import Data.Range
-import Data.Swagger (ToSchema (..), genericDeclareNamedSchema, required, schema)
+import Data.Swagger (ToSchema (..), genericDeclareNamedSchema, properties, required, schema)
 import qualified Data.Swagger.Build.Api as Doc
 import Data.Text.Ascii
 import Data.UUID (UUID, nil)
@@ -205,6 +207,7 @@ instance ToSchema UserProfile where
     pure $
       genericSchema
         & over (schema . required) (List.delete "deleted")
+        & over (schema . properties) (InsOrdHashMap.insert "id" undefined)
 
 modelUser :: Doc.Model
 modelUser = Doc.defineModel "User" $ do

libs/wire-api/wire-api.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: cb5d5f266e2fdd724d4f01f6136992c85aff49fa7ad01f06f8373a1f3c99abbe
+-- hash: 4e9f1f53fb43a39da1366fe060fe0ef8e2b0185847abdc61552ca3262bf25322
 
 name:           wire-api
 version:        0.1.0
@@ -97,6 +97,7 @@ library
     , hashable
     , hostname-validate
     , imports
+    , insert-ordered-containers
     , iproute >=1.5
     , iso3166-country-codes >=0.2
     , iso639 >=0.1