nuttycom/aftok - Change PT4276XCOP5NJ3GRFJLIBZKVNVAOATAY5PLWV7FWK6RZW5FTEP5AC

Add logout functionality.

Created by Kris Nuttycombe on August 18, 2020

PT4276XCOP5NJ3GRFJLIBZKVNVAOATAY5PLWV7FWK6RZW5FTEP5AC

Dependencies

In channels

main

Change contents

Insertion in client/dev/index.html at line 7 [3.2486]

[3.2649]

    <link rel="stylesheet" type="text/css" href="./assets/css/spinner.css" />

Deletion in client/src/Aftok/Login.purs at line 9 [5.20]
B:BD[4.618] → [3.295343:295382]
```
import Data.HTTP.Method (Method(POST))
```
Replacement in client/src/Aftok/Login.purs at line 13 [5.20]
∅:D[6.30] → [3.295408:295460]
B:BD[3.295408] → [3.295408:295460]
```
import Affjax (request, defaultRequest, printError)
```
[6.30]
[3.295460]
```
import Affjax (post, get, printError)
```
Insertion in client/src/Aftok/Login.purs at line 16 [5.20]
[3.295534]
[5.154]
```
import Affjax.ResponseFormat as RF
```
Insertion in client/src/Aftok/Login.purs at line 56 [5.20]
[3.296080]
[3.296080]
```
  , checkLogin :: m LoginResponse
  , logout :: m Unit
```

Replacement in client/src/Aftok/Login.purs at line 178 [5.20]

∅:D[7.320] → [3.300621:300846]

B:BD[5.2736] → [3.300621:300846]

  result <- request $ 
    defaultRequest { method = Left POST
                   , url = "/api/login"
                   , content = Just <<< RB.Json <<< encodeJson $ { username: user, password : pass }
                   }

[7.320]

[7.321]

  result <- post RF.ignore "/api/login" (Just <<< RB.Json <<< encodeJson $ { username: user, password : pass })

Replacement in client/src/Aftok/Login.purs at line 180 [5.20]

B:BD[7.338] → [7.338:434]

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

[7.338]

[3.300846]

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

Insertion in client/src/Aftok/Login.purs at line 188 [5.20]

[3.301097]

[5.3162]


checkLogin :: Aff LoginResponse
checkLogin = do
  log "Sending login check to /api/login/check ..."
  result <- get RF.ignore "/api/login/check"
  case result of
    Left err -> do
      log ("Login failed: " <> printError err)
      pure $ Error { status: Nothing, message: printError err }
    Right r -> do
      log ("Login status: " <> show r.status)
      pure $ case r.status of
        StatusCode 200 -> OK
        StatusCode _   -> Forbidden

Insertion in client/src/Aftok/Login.purs at line 203 [5.20]

[5.3163]

[3.301098]

logout :: Aff Unit
logout = do
  log "Logging out on server with  /api/logout ..."
  result <- get RF.ignore "/api/logout"
  case result of
    Left err -> log ("Logout failed: " <> printError err)
    Right r ->  log ("Logout status: " <> show r.status)

Replacement in client/src/Aftok/Login.purs at line 212 [5.20]
B:BD[3.301130] → [3.301130:301156]
```
apiCapability = { login }
```
[3.301130]
[5.3163]
```
apiCapability = { login, checkLogin, logout }
```

Replacement in client/src/Aftok/Login.purs at line 215 [5.20]

∅:D[7.493] → [3.301190:301234]

B:BD[3.301190] → [3.301190:301234]

mockCapability = { login: \_ _ -> pure OK }

[7.493]

mockCapability = 
  { login: \_ _ -> pure OK 
  , checkLogin: pure OK
  , logout: pure unit
  }

Deletion in client/src/Main.purs at line 7 [9.410]
B:BD[8.493] → [2.3722:3754]
```
import Data.Either (Either(..))
```

Insertion in client/src/Main.purs at line 15 [9.410]

[3.307659]

import Halogen.VDom.Driver (runUI)
import Halogen.HTML.Core (ClassName(..))

Replacement in client/src/Main.purs at line 19 [9.410]
∅:D[3.307685] → [4.7000:7035]
B:BD[4.7000] → [4.7000:7035]
```
import Halogen.VDom.Driver (runUI)
```
[3.307685]
[8.1094]
```
-- import Halogen.HTML.CSS as CSS
import Halogen.HTML.Events as E
import Halogen.HTML.Properties as P
```
Deletion in client/src/Main.purs at line 26 [9.410]
∅:D[2.3787] → [3.307786:307824]
B:BD[3.307786] → [3.307786:307824]
```
-- import Effect.Class.Console (info)
```

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

B:BD[2.3826] → [2.3826:3897]

      mainc = component login timeline project
  runUI mainc unit body

[2.3826]

[10.1116]

      mainComponent = component login timeline project
  runUI mainComponent unit body

Replacement in client/src/Main.purs at line 38 [9.410]
B:BD[3.308035] → [3.308035:308049]
```
  = LoggedIn 
```
[3.308035]
[3.308049]
```
  = Loading
```
Insertion in client/src/Main.purs at line 40 [9.410]
[3.308063]
[3.308063]
```
  | LoggedIn 
```
Insertion in client/src/Main.purs at line 45 [9.410]
[2.3951]
[10.1118]
```
  | Logout
```

Insertion in client/src/Main.purs at line 74 [9.410]

[3.308688]

      Loading ->
        HH.div [P.classes [ClassName "loader"]] [HH.text "Loading..."]

Replacement in client/src/Main.purs at line 78 [9.410]

B:BD[3.308708] → [11.1832:1929]

        HH.div_ [ HH.slot _login unit (Login.component loginCap) unit (Just <<< LoginComplete) ]

[3.308708]

[3.308805]

        HH.div_ 
          [ HH.slot _login unit (Login.component loginCap) unit (Just <<< LoginComplete) ]

Replacement in client/src/Main.purs at line 82 [9.410]

B:BD[3.308824] → [2.4141:4240]

        HH.div_ [ HH.slot _timeline unit (Timeline.component tlCap { width: 600.0 }) unit absurd ]

[3.308824]

[3.308924]

        withNavBar $ HH.div_ 
          [ HH.slot _timeline unit (Timeline.component tlCap { width: 600.0 }) unit absurd ]

Replacement in client/src/Main.purs at line 88 [9.410]

B:BD[2.4264] → [2.4264:4407]

        projects <- lift pCap.listProjects
        case projects of 
          Left err -> H.put LoggedOut
          Right _ -> H.put LoggedIn

[2.4264]

[2.4407]

        result <- lift loginCap.checkLogin
        case result of 
          Login.Forbidden -> H.put LoggedOut
          _ -> H.put LoggedIn

Replacement in client/src/Main.purs at line 95 [9.410]

B:BD[2.4480] → [2.4480:4489]

[2.4480]


      Logout -> do
        lift loginCap.logout
        H.put LoggedOut
withNavBar :: forall s m. H.ComponentHTML MainAction s m -> H.ComponentHTML MainAction s m
withNavBar body =
  HH.div_ 
    [HH.nav
      [P.classes (ClassName <$> ["navbar", "navbar-expand-lg", "navbar-light", "bg-white"])]
      [HH.div
        [P.classes (ClassName <$> ["container-fluid"])]
        [brand, logout]
      ]
    ,body 
    ]      
brand :: forall a s m. H.ComponentHTML a s m
brand = HH.div
  [P.classes (ClassName <$> ["navbar-brand"])]
  [HH.h4
    [P.classes (ClassName <$> ["font-weight-bold"])]
    [HH.text "Aftok"]
  ]
logout :: forall s m. H.ComponentHTML MainAction s m
logout = HH.button
  [P.classes (ClassName <$> ["btn", "navbar-btn", "btn-sm", "btn-primary", "lift", "ml-auto"])
  ,E.onClick \_ -> Just Logout 
  ]
  [HH.text "Logout"]
--     <!-- Navigation -->
--     <ul class="navbar-nav ml-auto">
--       <li class="nav-item dropdown">
--         <a class="nav-link dropdown-toggle" id="navbarAccount" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">
--           Guidebook
--         </a>
--         <ul class="dropdown-menu" aria-labelledby="navbarAccount">
--           <li class="dropdown-item dropright">
--             <a class="dropdown-link dropdown-toggle" data-toggle="dropdown" href="#">
--               Getting Started
--             </a>
--             <div class="dropdown-menu">
--               <a class="dropdown-item" href="@@webRoot/guide-foundation.html">
--                 Foundational Principles
--               </a>
--               <a class="dropdown-item" href="@@webRoot/guide-time.html">
--                 Measuring Contributions
--               </a>
--               <a class="dropdown-item" href="@@webRoot/guide-revenue.html">
--                 Revenue Sharing
--               </a>
--               <a class="dropdown-item" href="@@webRoot/guide-tithing.html">
--                 Varying Compensation
--               </a>
--             </div>
--           </li>
-- 					<!--
--           <li class="dropdown-item dropright">
--             <a class="dropdown-link dropdown-toggle" data-toggle="dropdown" href="#">
--               Up And Running
--             </a>
--             <div class="dropdown-menu">
--               <a class="dropdown-item" href="@@webRoot/guide-voting.html">
--                 Share-Weighted Voting
--               </a>
--               <a class="dropdown-item" href="@@webRoot/guide-auctions.html">
--                 Expense Auctions
--               </a>
--               <a class="dropdown-item" href="@@webRoot/guide-forks.html">
--                 Project Forks & Merges
--               </a>
--             </div>
--           </li>
--           <li class="dropdown-item dropright">
--             <a class="dropdown-link dropdown-toggle" data-toggle="dropdown" href="#">
--               Coming Soon!
--             </a>
--             <div class="dropdown-menu">
--               <a class="dropdown-item" href="@@webRoot/guide-debt-contracts.html">
--                 3rd-party Contracts
--               </a>
--               <a class="dropdown-item" href="@@webRoot/guide-delegative-voting.html">
--                 Delegative Voting
--               </a>
--             </div>
--           </li>
-- 					<li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/blog.html">
--               Blog
--             </a>
--           </li>
-- 				  -->
--         </ul>
--       </li>
--       <li class="nav-item dropdown">
--         <a class="nav-link dropdown-toggle" id="navbarAccount" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">
--           My Account
--         </a>
--         <ul class="dropdown-menu" aria-labelledby="navbarAccount">
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" data-toggle="modal" href="#modalSigninHorizontal">
--               Sign In
--             </a>
--           </li>
-- 					<!--
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/account-revenue.html">
--               Revenue Dashboard
--             </a>
--           </li>
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/account-auctions.html">
--               Active Expense Auctions
--             </a>
--           </li>
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/account-general.html">
--               Project List
--             </a>
--           </li>
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/account-tithes.html">
--               My Tithes
--             </a>
--           </li>
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/account-keys.html">
--               Manage Payment Keys
--             </a>
--           </li>
--           <li class="dropdown-item dropright">
--             <a class="dropdown-item" href="@@webRoot/account-billing.html">
--               Billing Center
--             </a>
--           </li>
-- 					-->
--         </ul>
--       </li>
--       <li class="nav-item dropdown">
--         <a class="nav-link dropdown-toggle" id="navbarDocumentation" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">
--           Documentation
--         </a>
--         <div class="dropdown-menu dropdown-menu-md" aria-labelledby="navbarDocumentation">
--           <div class="list-group list-group-flush">
--             <a class="list-group-item" href="@@webRoot/docs/index.html">
-- 
--               <!-- Icon -->
--               <div class="icon icon-sm text-primary">
--                 @@include("../assets/img/icons/duotone-icons/General/Clipboard.svg")
--               </div>
-- 
--               <!-- Content -->
--               <div class="ml-4">
-- 
--                 <!-- Heading -->
--                 <h6 class="font-weight-bold text-uppercase text-primary mb-0">
--                   Documentation
--                 </h6>
-- 
--                 <!-- Text -->
--                 <p class="font-size-sm text-gray-700 mb-0">
--                   CLI & API user guide
--                 </p>
-- 
--               </div>
-- 
--             </a>
--             <a class="list-group-item" href="@@webRoot/faq.html">
-- 
--               <!-- Icon -->
--               <div class="icon icon-sm text-primary">
--                 @@include("../assets/img/icons/duotone-icons/Code/Question-circle.svg")
--               </div>
-- 
--               <!-- Content -->
--               <div class="ml-4">
-- 
--                 <!-- Heading -->
--                 <h6 class="font-weight-bold text-uppercase text-primary mb-0">
--                   FAQ
--                 </h6>
-- 
--                 <!-- Text -->
--                 <p class="font-size-sm text-gray-700 mb-0">
--                   Common problems & solutions
--                 </p>
-- 
--               </div>
-- 
--             </a>
--             <a class="list-group-item" href="https://discord.gg/wbhCGjw" target="_blank">
-- 
--               <!-- Icon -->
--               <div class="icon icon-sm text-primary">
--                 @@include("../assets/img/icons/social/discord.svg")
--               </div>
-- 
--               <!-- Content -->
--               <div class="ml-4">
-- 
--                 <!-- Heading -->
--                 <h6 class="font-weight-bold text-uppercase text-primary mb-0">
--                   Community
--                 </h6>
-- 
--                 <!-- Text -->
--                 <p class="font-size-sm text-gray-700 mb-0">
--                   Join our Discord chat
--                 </p>
-- 
--               </div>
-- 
--             </a>
-- 						<!--
--             <a class="list-group-item" href="@@webRoot/docs/changelog.html">
-- 
--               <div class="icon icon-sm text-primary">
--                 @@include("../assets/img/icons/duotone-icons/Files/File.svg")
--               </div>
-- 
--               <div class="ml-4">
-- 
--                 <h6 class="font-weight-bold text-uppercase text-primary mb-0">
--                   Changelog
--                 </h6>
-- 
--                 <p class="font-size-sm text-gray-700 mb-0">
--                   Project history
--                 </p>
--               </div>
--             </a>
-- 						-->
--           </div>
--         </div>
--       </li>
--     </ul>

Insertion in server/Aftok/Snaplet/Auth.hs at line 1 [12.203]
[12.203]
[13.2136]
```
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TypeApplications #-}
```
Insertion in server/Aftok/Snaplet/Auth.hs at line 13 [12.203]
[14.47590]
[12.423]
```
import           Data.Text                      ( Text )
```

Insertion in server/Aftok/Snaplet/Auth.hs at line 35 [12.203]

[12.1227]

[14.47767]

  requireLoginWith (const throwChallenge)
requireLoginWith :: (forall a. () -> S.Handler App App a) -> S.Handler App App AU.AuthUser
requireLoginWith throwMissingAuth = do

Replacement in server/Aftok/Snaplet/Auth.hs at line 40 [12.203]

∅:D[14.47796] → [12.1247:1323]

B:BD[12.1247] → [12.1247:1323]

  rawHeader    <- maybe throwChallenge pure $ getHeader "Authorization" req

[14.47796]

[14.47797]

  rawHeader    <- maybe (throwMissingAuth ()) pure $ getHeader "Authorization" req

Replacement in server/Aftok/Snaplet/Auth.hs at line 60 [12.203]

B:BD[12.1644] → [12.1644:1682]

  maybe requireLogin pure currentUser

[12.1644]

[12.1682]

  maybe (requireLoginWith $ const (throwDenied $ AU.AuthError "Not Authenticated")) pure currentUser

Replacement in server/Aftok/Snaplet/Auth.hs at line 66 [12.203]

B:BD[15.33577] → [15.33577:33653]

    (snapError 403 "Unable to retrieve user record for authenticated user")

[15.33577]

[15.33653]

    (snapError 500 "Unable to retrieve user record for authenticated user")

Replacement in server/Aftok/Snaplet/Auth.hs at line 80 [12.203]
B:BD[14.48184] → [14.48184:48232]
```
  writeText $ "Access Denied: " <> show failure
```
[14.48184]
[14.48232]
```
  logError (encodeUtf8 $ "Access Denied: " <> show @Text failure)
```
Insertion in server/Main.hs at line 34 [17.5188]
[16.11663]
[16.11724]
```
import qualified Snap.Snaplet.Auth as AU
```

Replacement in server/Main.hs at line 49 [17.5188]

B:BD[18.12436] → [14.62674:62847]

  sesss <- nestSnaplet "sessions" sess $ initCookieSessionManager
    (cfg ^. authSiteKey . to encodeString)
    "quookie"
    (Just "aftok.com")
    (cfg ^. cookieTimeout)

[18.12436]

[19.26670]

  let cookieKey = cfg ^. authSiteKey . to encodeString
  sesss <- nestSnaplet "sessions" sess $ initCookieSessionManager cookieKey "quookie" Nothing (cfg ^. cookieTimeout)

Replacement in server/Main.hs at line 57 [17.5188]

B:BD[15.38518] → [14.62916:62984]

    loginRoute        = method GET requireLogin >> redirect "/home"

[15.38518]

[3.311217]

    loginRoute        = method GET requireLogin >> redirect "/app"

Insertion in server/Main.hs at line 59 [17.5188]

[3.311276]

[14.63040]

    checkLoginRoute   = void $ method GET requireUser
    logoutRoute       = method GET (with auth AU.logout)

Insertion in server/Main.hs at line 110 [17.5188]

[14.65091]

    , ("logout"                             , logoutRoute)
    , ("login/check"                        , checkLoginRoute)

Add logout functionality.

Dependencies

In channels

Change contents

Insertion in client/dev/index.html at line 7 [3.2486]

Deletion in client/src/Aftok/Login.purs at line 9 [5.20]

Replacement in client/src/Aftok/Login.purs at line 13 [5.20]

Insertion in client/src/Aftok/Login.purs at line 16 [5.20]

Insertion in client/src/Aftok/Login.purs at line 56 [5.20]

Replacement in client/src/Aftok/Login.purs at line 178 [5.20]

Replacement in client/src/Aftok/Login.purs at line 180 [5.20]

Insertion in client/src/Aftok/Login.purs at line 188 [5.20]

Insertion in client/src/Aftok/Login.purs at line 203 [5.20]

Replacement in client/src/Aftok/Login.purs at line 212 [5.20]

Replacement in client/src/Aftok/Login.purs at line 215 [5.20]

Deletion in client/src/Main.purs at line 7 [9.410]

Insertion in client/src/Main.purs at line 15 [9.410]

Replacement in client/src/Main.purs at line 19 [9.410]

Deletion in client/src/Main.purs at line 26 [9.410]

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

Replacement in client/src/Main.purs at line 38 [9.410]

Insertion in client/src/Main.purs at line 40 [9.410]

Insertion in client/src/Main.purs at line 45 [9.410]