[fix] fix the schema

wireapp · Oct 9, 2023 · 293b6f6 · 293b6f6
1 parent 35a21f1
commit 293b6f6
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/libs/wire-api/src/Wire/API/Routes/Internal/Brig.hs b/libs/wire-api/src/Wire/API/Routes/Internal/Brig.hs
@@ -42,7 +42,6 @@ where
 
 import Control.Lens ((.~))
 import Data.Aeson (FromJSON, ToJSON)
-import Data.Aeson qualified as Aeson
 import Data.Code qualified as Code
 import Data.CommaSeparatedList
 import Data.Domain (Domain)
@@ -696,13 +695,13 @@ type InvitationCode =
         :> Get '[Servant.JSON] FoundInvitationCode
     )
 
-newtype FoundInvitationCode = FoundInvitationCode User.InvitationCode
+newtype FoundInvitationCode = FoundInvitationCode {getFoundInvitationCode :: User.InvitationCode}
   deriving stock (Eq, Show, Generic)
-  -- TODO: is this correct?
-  deriving newtype (S.ToSchema)
+  deriving (FromJSON, ToJSON, S.ToSchema) via (Schema FoundInvitationCode)
 
-instance ToJSON FoundInvitationCode where
-  toJSON (FoundInvitationCode c) = Aeson.object ["code" Aeson..= c]
+instance ToSchema FoundInvitationCode where
+  schema = FoundInvitationCode <$>
+    getFoundInvitationCode .=  object "FoundInvitationCode" (field "code" (schema @User.InvitationCode)) 
 
 type SuspendTeam =
   Named