nuttycom/aftok - Change ENNZIQJG4XJ62QCNRMLNAXN7ICTPCHQFZTURX6QSUYYWNADFJHXQC

Use live signup API for client.

Created by Kris Nuttycombe on October 5, 2020

ENNZIQJG4XJ62QCNRMLNAXN7ICTPCHQFZTURX6QSUYYWNADFJHXQC

Dependencies

In channels

main

Change contents

Replacement in aftok.cabal at line 1 [3.1]
B:BD[3.1] → [4.1:20]
```
cabal-version: 2.4
```
[3.1]
[5.37]
```
cabal-version: 3.0
```

Insertion in aftok.cabal at line 19 [3.1]

[4.129]

[6.44]

                    , MultiParamTypeClasses

Insertion in aftok.cabal at line 21 [3.1]
[6.84]
[6.122]
```
                    , RankNTypes
```
Replacement in client/src/Aftok/Api/Account.purs at line 5 [7.149]
B:BD[7.198] → [7.198:239]
```
import Control.Monad.Trans.Class (lift)
```
[7.198]
[7.239]
```
import Data.Argonaut.Core (stringify)
```

Deletion in client/src/Aftok/Api/Account.purs at line 16 [7.149]

B:BD[7.548] → [7.548:857]


import Halogen as H
import Halogen.HTML.Core (ClassName(..))
import Halogen.HTML as HH
import Halogen.HTML.CSS as CSS
import Halogen.HTML.Events as E
import Web.Event.Event as WE
import Halogen.HTML.Properties as P
import CSS (backgroundImage, url)
import Landkit.Card as Card
import Aftok.Types (System)

Insertion in client/src/Aftok/Api/Account.purs at line 73 [7.149]
[7.2595]
[7.2595]
```
  | ServiceError (Maybe StatusCode) String
```

Insertion in client/src/Aftok/Api/Account.purs at line 75 [7.149]

[7.2596]

instance srShow :: Show SignupResponse where
  show r = case r of
    SignupOK -> "SignupOK"
    CaptchaInvalid -> "CaptchaInvalid"
    ZAddrInvalid -> "ZAddrInvalid"
    UsernameTaken -> "UsernameTaken"
    ServiceError _ _ -> "ServiceError"

Replacement in client/src/Aftok/Api/Account.purs at line 88 [7.149]
B:BD[7.2691] → [7.2691:2708]
```
  = ZAddrCheckOK
```
[7.2691]
[7.2708]
```
  = ZAddrCheckValid
```

Replacement in client/src/Aftok/Api/Account.purs at line 97 [7.149]

B:BD[7.2902] → [7.2902:2922]

  pure ZAddrCheckOK

[7.2902]

[7.2922]

  result <- get RF.ignore ("/api/validate_zaddr?zaddr=" <> zaddr) 
  case result of
    Left err -> do
      log ("ZAddr validation failed: " <> printError err)
      pure ZAddrCheckInvalid
    Right r | r.status == StatusCode 200 -> do
      pure ZAddrCheckValid
    Right r -> do
      log ("ZAddr was determined to be invalid: " <> r.statusText)
      pure ZAddrCheckInvalid

Replacement in client/src/Aftok/Api/Account.purs at line 114 [7.149]

B:BD[8.568] → [8.568:974]

                             RecoverByEmail _ => "email"
                             RecoverByZAddr _ => "zaddr"
        , email: case req.recoverBy of
                      RecoverByEmail email -> Just email
                      RecoverByZAddr _ -> Nothing
        , zaddr: case req.recoverBy of
                      RecoverByEmail _ -> Nothing
                      RecoverByZAddr zaddr -> Just zaddr

[8.568]

[2.155]

            RecoverByEmail _ -> "email"
            RecoverByZAddr _ -> "zaddr"
        , recoveryEmail: case req.recoverBy of
            RecoverByEmail email -> Just email
            RecoverByZAddr _     -> Nothing
        , recoveryZAddr: case req.recoverBy of
            RecoverByEmail _     -> Nothing
            RecoverByZAddr zaddr -> Just zaddr

Replacement in client/src/Aftok/Api/Account.purs at line 124 [7.149]

B:BD[8.984] → [2.197:272]

  result <- post RF.ignore "/api/register" (Just <<< RB.Json $ signupJson)

[8.984]

[2.272]

  log ("Sending JSON request: " <> stringify signupJSON)
  result <- post RF.ignore "/api/register" (Just <<< RB.Json $ signupJSON)

Replacement in client/src/Aftok/Api/Account.purs at line 127 [7.149]

B:BD[2.289] → [2.289:422]

       Left err -> log ("Registration failed: " <> printError err)
       Right r  -> log ("Registration status: " <> show r.status)

[2.289]

[2.422]

    Left err -> do
      log ("Registration failed: " <> printError err)
      pure (ServiceError Nothing $ printError err)
    Right r | r.status == StatusCode 200 -> do
      log "Registration succeeded!"
      pure SignupOK
    Right r | r.status == StatusCode 403 -> do
      log ("Registration failed: Capcha Invalid")
      pure CaptchaInvalid
    Right r | r.status == StatusCode 400 -> do
      log ("Registration failed: Z-Address Invalid")
      pure ZAddrInvalid
    Right r -> do
      log ("Registration failed: " <> r.statusText)
      pure $ ServiceError (Just r.status) r.statusText

Insertion in client/src/Aftok/Signup.purs at line 222 [9.1]
[7.6997]
[7.6997]
```
        lift $ system.log "Switching to signin..."
```
Replacement in client/src/Aftok/Signup.purs at line 226 [9.1]
B:BD[7.7114] → [7.7114:7154]
```
          Acc.ZAddrCheckOK -> pure unit
```
[7.7114]
[7.7154]
```
          Acc.ZAddrCheckValid -> pure unit
```
Insertion in client/src/Aftok/Signup.purs at line 230 [9.1]
[7.7261]
[7.7261]
```
        lift $ system.log "Switching to signin..."
```
Insertion in client/src/Aftok/Signup.purs at line 247 [9.1]
[7.8103]
[7.8103]
```
        lift $ system.log "Sending signup request..."
```

Replacement in client/src/Aftok/Signup.purs at line 255 [9.1]

B:BD[7.8503] → [7.8503:8529]

          Left errors ->

[7.8503]

[7.8529]

          Left errors -> do
            lift $ system.log "Got signup HTTP error."

Insertion in client/src/Aftok/Signup.purs at line 260 [9.1]

[7.8654]

            lift <<< system.log $ "Got signup response " <> show response

Replacement in client/src/Aftok/Signup.purs at line 262 [9.1]

B:BD[7.8683] → [7.8683:9003]

              Acc.SignupOK -> H.raise (SignupComplete $ req.username)
              Acc.CaptchaInvalid -> H.modify_ (_ { signupErrors = [CaptchaError] })
              Acc.ZAddrInvalid -> H.modify_ (_ { signupErrors = [ZAddrInvalid] })
              Acc.UsernameTaken -> H.modify_ (_ { signupErrors = [UsernameTaken] })

[7.8683]

[9.6157]

              Acc.SignupOK         -> H.raise (SignupComplete $ req.username)
              Acc.CaptchaInvalid   -> H.modify_ (_ { signupErrors = [CaptchaError] })
              Acc.ZAddrInvalid     -> H.modify_ (_ { signupErrors = [ZAddrInvalid] })
              Acc.UsernameTaken    -> H.modify_ (_ { signupErrors = [UsernameTaken] })
              Acc.ServiceError c m -> H.modify_ (_ { signupErrors = [APIError { status: c, message: m }]})

Insertion in client/src/Aftok/Signup.purs at line 337 [9.1]

[9.8397]


apiCapability :: Capability Aff
apiCapability = 
  { checkUsername: \_ -> pure Acc.UsernameCheckOK
  , checkZAddr: Acc.checkZAddr
  , signup: Acc.signup
  , getRecaptchaResponse: liftEffect <<< getRecaptchaResponse 
  }

Replacement in client/src/Aftok/Signup.purs at line 349 [9.1]
B:BD[7.9088] → [7.9088:9132]
```
  , checkZAddr: \_ -> pure Acc.ZAddrCheckOK
```
[7.9088]
[7.9132]
```
  , checkZAddr: \_ -> pure Acc.ZAddrCheckValid
```
Replacement in client/src/Main.purs at line 34 [12.410]
B:BD[10.1617] → [11.1572:1609]
```
      signup = Signup.mockCapability
```
[10.1617]
[13.7682]
```
      signup = Signup.apiCapability
```
Deletion in daemon/AftokD/AftokM.hs at line 35 [16.1458]
B:BD[14.1781] → [15.131:191]
```
import           Haskoin.Address                ( Address )
```

Deletion in daemon/AftokD/AftokM.hs at line 48 [16.1458]

B:BD[14.2506] → [14.2506:2566]

                                                , userEmail

Deletion in daemon/AftokD/AftokM.hs at line 49 [16.1458]

B:BD[14.2623] → [14.2623:2791]

                                                )
import           Aftok.Currency.Bitcoin         ( NetworkId
                                                , satoshi

Insertion in daemon/AftokD/AftokM.hs at line 50 [16.1458]
[14.2841]
[14.2841]
```
import           Aftok.Currency.Bitcoin         ( satoshi )
```

Insertion in daemon/AftokD/AftokM.hs at line 55 [16.1458]

[14.3077]

                                                , ContactChannel(..)
                                                , contactChannel

Replacement in daemon/AftokD/AftokM.hs at line 160 [16.1458]

B:BD[14.5418] → [14.5418:5558]

  -> P.PaymentRequest'
       ( Subscription'
           (User (NetworkId, Address))
           (Billable' Project UserId Satoshi)
       )

[14.5418]

[14.5558]

  -> P.PaymentRequest' (Subscription' User (Billable' Project UserId Satoshi))

Replacement in daemon/AftokD/AftokM.hs at line 173 [16.1458]

∅:D[14.5817] → [17.1349:1370]

B:BD[16.6526] → [17.1349:1370]

    Just template ->

[14.5817]

[16.6548]

    Just template -> do
      toEmail <- case req ^. (subscription . contactChannel) of
        EmailChannel email -> pure email
        -- TODO: other channels

Deletion in daemon/AftokD/AftokM.hs at line 178 [16.1458]
B:BD[16.6596] → [14.5818:5885]
```
          toEmail   = req ^. (subscription . customer . userEmail)
```
Replacement in daemon/AftokD/AftokM.hs at line 191 [16.1458]
∅:D[17.1603] → [16.7345:7417]
∅:D[18.57711] → [16.7345:7417]
B:BD[16.7345] → [16.7345:7417]
```
      in  pure $ SMTP.simpleMail fromAddr [toAddr] [] [] subject [body]
```
[18.57711]
[16.7417]
```
      pure $ SMTP.simpleMail fromAddr [toAddr] [] [] subject [body]
```

Replacement in lib/Aftok/Billables.hs at line 16 [19.760]

B:BD[19.915] → [17.3389:3443]

B:BD[17.3443] → [18.57798:57837]

import           Aftok.Types      (UserId, ProjectId)
import           Bippy.Types (Satoshi)

[19.915]

[19.981]

import           Aftok.Types      (UserId, ProjectId, Email)
import           Bippy.Types      (Satoshi)

Insertion in lib/Aftok/Billables.hs at line 77 [19.760]
[20.62]
[21.1423]
```
data ContactChannel
  = EmailChannel Email
```

Replacement in lib/Aftok/Billables.hs at line 82 [19.760]

B:BD[22.149] → [22.149:189]

∅:D[22.189] → [21.1480:1508]

∅:D[23.659] → [21.1480:1508]

B:BD[21.1480] → [21.1480:1508]

B:BD[21.1508] → [23.660:694]

  { _customer  :: u
  , _billable  :: b
  , _startTime :: C.UTCTime
  , _endTime   :: Maybe C.UTCTime

[22.149]

[17.3491]

  { _customer       :: u
  , _billable       :: b
  , _contactChannel :: ContactChannel
  , _startTime      :: C.UTCTime
  , _endTime        :: Maybe C.UTCTime

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 246 [24.456]
[14.18233]
[14.18233]
```
    <*> (B.EmailChannel . Email <$> field)
```

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 678 [24.456]

B:BD[14.24347] → [14.24347:24400]

  [sql| SELECT id, billable_id, start_date, end_date

[14.24347]

[17.16985]

  [sql| SELECT id, billable_id, contact_email, start_date, end_date

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 685 [24.456]

B:BD[14.24543] → [14.24543:24607]

  [sql| SELECT s.id, user_id, billable_id, start_date, end_date

[14.24543]

[17.17151]

  [sql| SELECT s.id, user_id, billable_id, contact_email, start_date, end_date

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 742 [24.456]

B:BD[17.18176] → [17.18176:18247]

                   s.user_id, s.billable_id, s.start_date, s.end_date,

[17.18176]

[17.18247]

                   s.user_id, s.billable_id, s.contact_email, s.start_date, s.end_date,

Insertion in lib/Aftok/Database.hs at line 8 [3.4936]
[25.427]
[5.1442]
```
-- brittany --disable-next-binding
```

Replacement in lib/Aftok/Users.hs at line 14 [2.4049]

B:BD[2.4308] → [2.4308:4365]

  { parseZAddr :: Text -> m (Either RegisterError ZAddr)

[2.4308]

[2.4365]

  { parseZAddr :: Text -> m (Either ZAddrError ZAddr)

Replacement in server/Aftok/Snaplet/Users.hs at line 6 [6.3234]
∅:D[5.2560] → [26.3137:3157]
∅:D[27.8604] → [26.3137:3157]
B:BD[26.3137] → [26.3137:3157]
B:BD[26.3157] → [28.449:477]
```
  ( registerHandler
  , acceptInvitationHandler
```
[27.8604]
[7.9796]
```
  ( acceptInvitationHandler
  , checkZAddrHandler
  , registerHandler
```
Insertion in server/Aftok/Snaplet/Users.hs at line 41 [6.3234]
[29.10432]
[2.4786]
```
import           Aftok.Currency.Zcash           ( ZAddr )
```

Replacement in server/Aftok/Snaplet/Users.hs at line 76 [6.3234]

B:BD[8.5684] → [8.5684:5741]

B:BD[8.5741] → [2.5513:5570]

      "email" -> RecoverByEmail . Email <$> v .: "email"
      "zaddr" -> RecoverByZAddr         <$> v .: "zaddr"

[8.5684]

[8.5798]

      "email" -> RecoverByEmail . Email <$> v .: "recoveryEmail"
      "zaddr" -> RecoverByZAddr         <$> v .: "recoveryZAddr"

Insertion in server/Aftok/Snaplet/Users.hs at line 94 [6.3234]

[6.4425]

[2.5802]

checkZAddrHandler :: RegisterOps IO -> S.Handler App App ZAddr
checkZAddrHandler ops = do
  params <- S.getParams
  zaddrBytes <- maybe (snapError 400 "zaddr parameter is required")
                       pure
                       (listToMaybe =<< M.lookup "zaddr" params)
  zaddrEither <- liftIO $ parseZAddr ops (T.decodeUtf8 zaddrBytes)
  case zaddrEither of
    Left _  ->
      snapError 400 "The Z-Address provided for account recovery was invalid."
    Right zaddr ->
      pure zaddr

Insertion in server/Aftok/Snaplet/Users.hs at line 113 [6.3234]
[8.6412]
[8.6412]

Replacement in server/Aftok/Snaplet/Users.hs at line 125 [6.3234]

B:BD[2.6330] → [2.6330:6465]

        Left _  -> snapError 400 "The Z-Address provided for account recovery was invalid."
        Right r -> pure $ RecoverByZAddr r

[2.6330]

[2.6465]

        Left _  ->
          snapError 400 "The Z-Address provided for account recovery was invalid."
        Right r ->
          pure $ RecoverByZAddr r

Deletion in server/Aftok/Snaplet/Users.hs at line 142 [6.3234]
B:BD[2.6677] → [2.6677:6678]
Deletion in server/Main.hs at line 22 [30.5188]
B:BD[27.11390] → [2.6847:6917]
```
import           Aftok.Users                    ( RegisterError(..) )
```

Replacement in server/Main.hs at line 51 [30.5188]

B:BD[2.7004] → [2.7004:7109]

  { parseZAddr =
      (pure . first ZAddrParseError)
      <=< rpcValidateZAddr mgr (_zcashdConfig cfg)

[2.7004]

[2.7109]

  { parseZAddr = rpcValidateZAddr mgr (_zcashdConfig cfg)

Insertion in server/Main.hs at line 77 [30.5188]

[29.12971]

[2.7246]

    checkZAddrRoute   = void $ method GET  (checkZAddrHandler rops)

Insertion in server/Main.hs at line 133 [30.5188]
[15.16973]
[15.16973]
```
    , ("validate_zaddr", checkZAddrRoute)
```

Use live signup API for client.

Dependencies

In channels

Change contents

Replacement in aftok.cabal at line 1 [3.1]

Insertion in aftok.cabal at line 19 [3.1]

Insertion in aftok.cabal at line 21 [3.1]

Replacement in client/src/Aftok/Api/Account.purs at line 5 [7.149]

Deletion in client/src/Aftok/Api/Account.purs at line 16 [7.149]

Insertion in client/src/Aftok/Api/Account.purs at line 73 [7.149]

Insertion in client/src/Aftok/Api/Account.purs at line 75 [7.149]

Replacement in client/src/Aftok/Api/Account.purs at line 88 [7.149]

Replacement in client/src/Aftok/Api/Account.purs at line 97 [7.149]

Replacement in client/src/Aftok/Api/Account.purs at line 114 [7.149]

Replacement in client/src/Aftok/Api/Account.purs at line 124 [7.149]

Replacement in client/src/Aftok/Api/Account.purs at line 127 [7.149]

Insertion in client/src/Aftok/Signup.purs at line 222 [9.1]

Replacement in client/src/Aftok/Signup.purs at line 226 [9.1]

Insertion in client/src/Aftok/Signup.purs at line 230 [9.1]

Insertion in client/src/Aftok/Signup.purs at line 247 [9.1]

Replacement in client/src/Aftok/Signup.purs at line 255 [9.1]

Insertion in client/src/Aftok/Signup.purs at line 260 [9.1]

Replacement in client/src/Aftok/Signup.purs at line 262 [9.1]

Insertion in client/src/Aftok/Signup.purs at line 337 [9.1]

Replacement in client/src/Aftok/Signup.purs at line 349 [9.1]

Replacement in client/src/Main.purs at line 34 [12.410]

Deletion in daemon/AftokD/AftokM.hs at line 35 [16.1458]

Deletion in daemon/AftokD/AftokM.hs at line 48 [16.1458]

Deletion in daemon/AftokD/AftokM.hs at line 49 [16.1458]

Insertion in daemon/AftokD/AftokM.hs at line 50 [16.1458]

Insertion in daemon/AftokD/AftokM.hs at line 55 [16.1458]

Replacement in daemon/AftokD/AftokM.hs at line 160 [16.1458]

Replacement in daemon/AftokD/AftokM.hs at line 173 [16.1458]

Deletion in daemon/AftokD/AftokM.hs at line 178 [16.1458]

Replacement in daemon/AftokD/AftokM.hs at line 191 [16.1458]

Replacement in lib/Aftok/Billables.hs at line 16 [19.760]

Insertion in lib/Aftok/Billables.hs at line 77 [19.760]

Replacement in lib/Aftok/Billables.hs at line 82 [19.760]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 246 [24.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 678 [24.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 685 [24.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 742 [24.456]

Insertion in lib/Aftok/Database.hs at line 8 [3.4936]

Replacement in lib/Aftok/Users.hs at line 14 [2.4049]

Replacement in server/Aftok/Snaplet/Users.hs at line 6 [6.3234]

Insertion in server/Aftok/Snaplet/Users.hs at line 41 [6.3234]

Replacement in server/Aftok/Snaplet/Users.hs at line 76 [6.3234]

Insertion in server/Aftok/Snaplet/Users.hs at line 94 [6.3234]

Insertion in server/Aftok/Snaplet/Users.hs at line 113 [6.3234]

Replacement in server/Aftok/Snaplet/Users.hs at line 125 [6.3234]

Deletion in server/Aftok/Snaplet/Users.hs at line 142 [6.3234]

Deletion in server/Main.hs at line 22 [30.5188]

Replacement in server/Main.hs at line 51 [30.5188]

Insertion in server/Main.hs at line 77 [30.5188]

Insertion in server/Main.hs at line 133 [30.5188]