mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-09-28 17:49:07 +00:00
* badges: webapp (#7433) * badges: service migrations, store and catalog * badges: BTCPay provider and settlement poller * badges: web listener and /api endpoints * web: checkout single-page app * badges: tests and BTCPay fixtures * badges: README and ini reference * badges: fix hex16 build on GHC 8.10.7 * badges: Stripe card lane * badges: fix Stripe card checkout, add theming * badges: add a discount row to the order summary * badges: site navbar, embedding, theme, Forget move * badges: use SB code prefix in web checkout * badges: rename sxb app namespace to sb * badges: embed checkout nav via site; keep original app navbar * badges: post iframe height, apply site background when embedded * badges: embed dark surfaces, steadier iframe height * badges: hide app footer when embedded * badges: size embedded body to content, not viewport * badges: declare color-scheme to stop reload flash * badges: fade shell in on load, no reload blank * badges: prerender app shell into index.html * badges: pre-paint theme, hide shell on deep reload * badges: logo returns to landing client-side * badges: embedded wizard back, buy-a-code, resume * badges: signal app-managed screens, resume across reload * badges: rebuild wizard history on deep load so Back walks it * badges: carry welcome-page height as the iframe floor * badges: keep selection on Buy a code; rename to Your codes * badges: read web shell as UTF-8, not locale * badges: resume the exact paid order after Stripe card redirect * badges: move docker deploy under scripts * badges: add serve_webapp toggle and webapp export * badges: wire split webapp deploy in docker config * badges: quiet agent logs by default * badges: resume card redirect in the embedded frame * badges: migrate Stripe adapter to PaymentIntents * badges: correct Stripe restricted key scopes in ini example * badges: card via Payment Element and PaymentIntents * badges: fix stale Checkout Session wording in Stripe adapter * badges: fix stale CheckoutActions reference in card comment * badges: order shell stylesheet before bootstrap script * badges: remove development card stand-in * badges: theme the Stripe card form with the site palette * badges: exclude web from the Haskell build stage * badges: unify invoice cancel and mark canceled * badges: default log level to info * badges: unify closed-invoice buy-again button * badges: mute agent connection logs at info level * badges: show purchase time in local timezone in Your codes * badges: log service events on own channel, quiet agent * badges: fold service migrations into one baseline * badges: run compose on postgres over host network * badges: use high-res hero art * badges: add web CI to catch stale builds * badges: rebuild web shell from committed source * badges: normalize invoice-code link and columns * badges: drop unused columns, rename index * badges: note deferred receipt_hash in migrations * badges: apply code-review fixes * badges: reduce comments across service and web --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com> Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * badges: improve web page (#7546) * badges: improve web page * improve layout * improve layout * fix * small changes --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * badges: read one issuer key from the ini * badges: move and group the service tests * badges: service fixes (#7567) * badges: match the redeem error wording in tests * badges: drop unused imports in the bot tests * badges: cancel Stripe orders when they expire * badges: correct the Stripe config and docs * badges: refuse to revoke a redeemed code * badges: make the fake Stripe cancel like Stripe * badges: limit replayed webhook deliveries --------- Co-authored-by: sh <37271604+shumvgolove@users.noreply.github.com> Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> Co-authored-by: shum <github.shum@liber.li> Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
128 lines
4.0 KiB
Haskell
128 lines
4.0 KiB
Haskell
{-# LANGUAGE ApplicativeDo #-}
|
|
{-# LANGUAGE DuplicateRecordFields #-}
|
|
{-# LANGUAGE NamedFieldPuns #-}
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
module BadgeService.Options
|
|
( BadgeServiceOpts (..),
|
|
getBadgeServiceOpts,
|
|
badgeServiceOpts,
|
|
mkChatOpts,
|
|
)
|
|
where
|
|
|
|
import BadgeService.Config (BadgeIssuerKey (..))
|
|
import qualified Data.ByteString.Char8 as B
|
|
import qualified Data.Text as T
|
|
import Options.Applicative
|
|
import Simplex.Chat.Controller (updateStr, versionNumber, versionString)
|
|
import Simplex.Chat.Options (ChatCmdLog (..), ChatOpts (..), CoreChatOpts, CreateBotOpts (..), coreChatOptsP)
|
|
import Simplex.Messaging.Encoding.String (strDecode)
|
|
|
|
data BadgeServiceOpts = BadgeServiceOpts
|
|
{ coreOptions :: CoreChatOpts,
|
|
serviceName :: T.Text,
|
|
clientService :: Bool,
|
|
noAddress :: Bool,
|
|
runCLI :: Bool,
|
|
serviceConfigFile :: Maybe FilePath,
|
|
issuerKey :: Either String (Maybe BadgeIssuerKey),
|
|
testing :: Bool
|
|
}
|
|
|
|
badgeServiceOpts :: FilePath -> FilePath -> Parser BadgeServiceOpts
|
|
badgeServiceOpts appDir defaultDbName = do
|
|
coreOptions <- coreChatOptsP appDir defaultDbName
|
|
serviceName <-
|
|
strOption
|
|
( long "service-name"
|
|
<> metavar "SERVICE_NAME"
|
|
<> help "The display name of the badge service bot, without *'s and spaces (SimpleX Badges)"
|
|
<> value "SimpleX Badges"
|
|
)
|
|
clientService <-
|
|
switch
|
|
( long "client-service"
|
|
<> help "Use client service certificate"
|
|
)
|
|
noAddress <-
|
|
switch
|
|
( long "no-address"
|
|
<> help "skip checking and creating service address"
|
|
)
|
|
runCLI <-
|
|
switch
|
|
( long "run-cli"
|
|
<> help "Run badge service as CLI"
|
|
)
|
|
serviceConfigFile <-
|
|
optional
|
|
( strOption
|
|
( long "service-config"
|
|
<> metavar "INI_FILE"
|
|
<> help "Path to badge_service.ini: parsed in full in every mode, but --run-cli starts no web listener"
|
|
)
|
|
)
|
|
issuerKeyIdx <-
|
|
optional $
|
|
option
|
|
auto
|
|
( long "issuer-key-idx"
|
|
<> metavar "KEY_IDX"
|
|
<> help "Index of the issuer key in the app config (required with --issuer-secret)"
|
|
)
|
|
issuerSecret <-
|
|
optional $
|
|
option
|
|
(eitherReader $ strDecode . B.pack)
|
|
( long "issuer-secret"
|
|
<> metavar "ISSUER_SECRET"
|
|
<> help "Issuer secret from `simplex-chat badge keygen` (base64url)"
|
|
)
|
|
pure
|
|
BadgeServiceOpts
|
|
{ coreOptions,
|
|
serviceName = T.pack serviceName,
|
|
clientService,
|
|
noAddress,
|
|
runCLI,
|
|
serviceConfigFile,
|
|
issuerKey = case (issuerKeyIdx, issuerSecret) of
|
|
(Just idx, Just secret) -> Right (Just (BadgeIssuerKey idx secret))
|
|
(Nothing, Nothing) -> Right Nothing
|
|
_ -> Left "--issuer-key-idx and --issuer-secret are given together or not at all",
|
|
testing = False
|
|
}
|
|
|
|
getBadgeServiceOpts :: FilePath -> FilePath -> IO BadgeServiceOpts
|
|
getBadgeServiceOpts appDir defaultDbName =
|
|
execParser $
|
|
info
|
|
(helper <*> versionOption <*> badgeServiceOpts appDir defaultDbName)
|
|
(header versionStr <> fullDesc <> progDesc "Start SimpleX Badge Service with DB_FILE options")
|
|
where
|
|
versionStr = versionString versionNumber
|
|
versionOption = infoOption versionAndUpdate (long "version" <> short 'v' <> help "Show version")
|
|
versionAndUpdate = versionStr <> "\n" <> updateStr
|
|
|
|
mkChatOpts :: BadgeServiceOpts -> ChatOpts
|
|
mkChatOpts BadgeServiceOpts {coreOptions, serviceName, clientService} =
|
|
ChatOpts
|
|
{ coreOptions,
|
|
chatCmd = "",
|
|
chatCmdDelay = 3,
|
|
chatCmdLog = CCLNone,
|
|
chatServerPort = Nothing,
|
|
optFilesFolder = Nothing,
|
|
optTempDirectory = Nothing,
|
|
showReactions = False,
|
|
showFullLinks = False,
|
|
allowInstantFiles = True,
|
|
autoAcceptFileSize = 0,
|
|
muteNotifications = True,
|
|
markRead = False,
|
|
createBot = Just CreateBotOpts {botDisplayName = serviceName, allowFiles = False, clientService},
|
|
userDisplayName = Nothing,
|
|
userImageFile = Nothing
|
|
}
|