Merge pull request #1464 from digitallyinduced/basic-master

Added DataSync messages for handling login
digitallyinduced · May 23, 2022 · 620482b · 620482b
2 parents af5a4cf + 894f0fa
commit 620482b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/IHP/AuthSupport/Lockable.hs b/IHP/AuthSupport/Lockable.hs
@@ -15,8 +15,11 @@ lockDuration = let timeInSecs = 60 * 60 in secondsToNominalDiffTime timeInSecs
 isLocked :: forall user. (HasField "lockedAt" user (Maybe UTCTime)) => user -> IO Bool
 isLocked user = do
     now <- getCurrentTime
-    let currentLockedAt :: Maybe UTCTime = getField @"lockedAt" user
-    pure $! case currentLockedAt of
+    pure (isLocked' now user)
+
+isLocked' :: forall user. (HasField "lockedAt" user (Maybe UTCTime)) => UTCTime -> user -> Bool
+isLocked' now user =
+    case getField @"lockedAt" user of
         Just lockedAt ->
             let diff = diffUTCTime now lockedAt
             in diff < lockDuration

diff --git a/IHP/DataSync/Controller.hs b/IHP/DataSync/Controller.hs
@@ -49,5 +49,5 @@ instance (
     run = do
         ensureRLSEnabled <- makeCachedEnsureRLSEnabled
         installTableChangeTriggers <- ChangeNotifications.makeCachedInstallTableChangeTriggers
-        runDataSyncController ensureRLSEnabled installTableChangeTriggers (receiveData @ByteString) sendJSON
+        runDataSyncController ensureRLSEnabled installTableChangeTriggers (receiveData @ByteString) sendJSON (\_ _ -> pure ())
     onClose = cleanupAllSubscriptions
diff --git a/IHP/DataSync/ControllerImpl.hs b/IHP/DataSync/ControllerImpl.hs
@@ -47,8 +47,8 @@ runDataSyncController ::
     , Typeable CurrentUserRecord
     , HasNewSessionUrl CurrentUserRecord
     , Show (PrimaryKey (GetTableName CurrentUserRecord))
-    ) => _ -> _ -> _ -> _ -> IO ()
-runDataSyncController ensureRLSEnabled installTableChangeTriggers receiveData sendJSON = do
+    ) => _ -> _ -> _ -> _ -> _ -> IO ()
+runDataSyncController ensureRLSEnabled installTableChangeTriggers receiveData sendJSON handleCustomMessage = do
         setState DataSyncReady { subscriptions = HashMap.empty, transactions = HashMap.empty, asyncs = [] }
 
         let pgListener = ?applicationContext |> get #pgListener
@@ -318,7 +318,7 @@ runDataSyncController ensureRLSEnabled installTableChangeTriggers receiveData se
 
                 sendJSON DidCommitTransaction { requestId, transactionId = id }
 
-
+            handleMessage otherwise = handleCustomMessage sendJSON otherwise
 
         forever do
             message <- Aeson.eitherDecodeStrict' <$> receiveData

diff --git a/IHP/DataSync/Types.hs b/IHP/DataSync/Types.hs
@@ -24,6 +24,8 @@ data DataSyncMessage
     | StartTransaction { requestId :: !Int }
     | RollbackTransaction { requestId :: !Int, id :: !UUID }
     | CommitTransaction { requestId :: !Int, id :: !UUID }
+    | LoginWithEmailAndPassword { requestId :: !Int, email :: !Text, password :: !Text }
+    | LoginWithJWT { requestId :: !Int, jwt :: !Text }
     deriving (Eq, Show)
 
 data DataSyncResponse
@@ -45,6 +47,11 @@ data DataSyncResponse
     | DidRollbackTransaction { requestId :: !Int, transactionId :: !UUID }
     | DidCommitTransaction { requestId :: !Int, transactionId :: !UUID }
 
+    | LoginSuccessful { requestId :: !Int, userId :: !UUID, jwt :: !Text }
+    | UserLocked { requestId :: !Int }
+    | UserUnconfirmed { requestId :: !Int }
+    | InvalidCredentials { requestId :: !Int }
+
 data GraphQLResult = GraphQLResult { graphQLResult :: !UndecodedJSON, requestId :: !Int }
 
 data DataSyncTransaction