Skip to content
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

Fix nits of #4389 #4420

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Fix nits of #4389 #4420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93fb912
Import OpenApi only once
pcapriotti Jan 24, 2025
e5d00e5
Fix spacing
pcapriotti Jan 24, 2025
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
15 changes: 7 additions & 8 deletions libs/wire-api/src/Wire/API/EnterpriseLogin.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import Data.Default (Default, def)
import Data.Domain
import Data.Id
import Data.Misc
import Data.OpenApi qualified as OpenApi
import Data.OpenApi qualified as S
import Data.Schema
import Data.Text qualified as Text
Expand Down Expand Up @@ -53,7 +52,7 @@ data DomainRedirectTag
| NoRegistrationTag
| PreAuthorizedTag
deriving (Show, Ord, Eq, Enum, Bounded)
deriving (ToJSON, FromJSON, OpenApi.ToSchema) via Schema DomainRedirectTag
deriving (ToJSON, FromJSON, S.ToSchema) via Schema DomainRedirectTag

domainRedirectTag :: DomainRedirect -> DomainRedirectTag
domainRedirectTag None = NoneTag
Expand Down Expand Up @@ -108,7 +107,7 @@ deriving via (Schema DomainRedirect) instance FromJSON DomainRedirect

deriving via (Schema DomainRedirect) instance ToJSON DomainRedirect

deriving via (Schema DomainRedirect) instance OpenApi.ToSchema DomainRedirect
deriving via (Schema DomainRedirect) instance S.ToSchema DomainRedirect

data TeamInvite
= Allowed
Expand All @@ -127,7 +126,7 @@ data TeamInviteTag
| NotAllowedTag
| TeamTag
deriving (Show, Ord, Eq, Enum, Bounded)
deriving (ToJSON, FromJSON, OpenApi.ToSchema) via Schema TeamInviteTag
deriving (ToJSON, FromJSON, S.ToSchema) via Schema TeamInviteTag

instance ToSchema TeamInviteTag where
schema =
Expand Down Expand Up @@ -167,11 +166,11 @@ deriving via (Schema TeamInvite) instance FromJSON TeamInvite

deriving via (Schema TeamInvite) instance ToJSON TeamInvite

deriving via (Schema TeamInvite) instance OpenApi.ToSchema TeamInvite
deriving via (Schema TeamInvite) instance S.ToSchema TeamInvite

newtype DnsVerificationToken = DnsVerificationToken {unDnsVerificationToken :: Ascii}
deriving stock (Ord, Eq, Show)
deriving (ToJSON, FromJSON, OpenApi.ToSchema) via Schema DnsVerificationToken
deriving (ToJSON, FromJSON, S.ToSchema) via Schema DnsVerificationToken

instance ToSchema DnsVerificationToken where
schema = DnsVerificationToken <$> unDnsVerificationToken .= schema
Expand All @@ -181,7 +180,7 @@ data DomainRegistrationUpdate = DomainRegistrationUpdate
teamInvite :: TeamInvite
}
deriving stock (Eq, Show)
deriving (ToJSON, FromJSON, OpenApi.ToSchema) via Schema DomainRegistrationUpdate
deriving (ToJSON, FromJSON, S.ToSchema) via Schema DomainRegistrationUpdate

instance Arbitrary DomainRegistrationUpdate where
arbitrary = do
Expand Down Expand Up @@ -212,7 +211,7 @@ data DomainRegistration = DomainRegistration
dnsVerificationToken :: Maybe DnsVerificationToken
}
deriving stock (Eq, Show)
deriving (ToJSON, FromJSON, OpenApi.ToSchema) via Schema DomainRegistration
deriving (ToJSON, FromJSON, S.ToSchema) via Schema DomainRegistration

instance ToSchema DomainRegistration where
schema =
Expand Down
2 changes: 1 addition & 1 deletion libs/wire-subsystems/test/unit/Wire/MockInterpreters/SparAPIAccess.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ import Wire.SparAPIAccess
-- | interprets galley by statically returning the values passed
miniSparAPIAccess :: InterpreterFor SparAPIAccess r
miniSparAPIAccess = interpret $ \case
GetIdentityProviders _ -> error "GetIdentityProviders not implemented in miniSparAPIAccess"
GetIdentityProviders _ -> error "GetIdentityProviders not implemented in miniSparAPIAccess"
Loading