Merge pull request #38 from avolabs-io/pf/auth-db-web3-split

avolabs-io · Mar 16, 2021 · 24def13 · 24def13
2 parents 4627433 + 635c9c4
commit 24def13
Show file tree

Hide file tree

Showing 12 changed files with 309 additions and 94 deletions.
diff --git a/dApp/user/src/Apollo.bs.js b/dApp/user/src/Apollo.bs.js
diff --git a/dApp/user/src/Apollo.res b/dApp/user/src/Apollo.res
@@ -3,26 +3,6 @@ let graphqlEndpoint = "localhost:8080/v1/graphql"
 let headers = {"x-hasura-admin-secret": "testing"}
 
 
-type clientHeaders = {
-    @as("eth-address")
-    ethAddress: string,
-    @as("eth-signature")
-    ethSignature: string,
-}
-
-let getAuthHeaders = (~user) => {
-  open Ethers.Utils
-    switch(user){
-      | None => None
-      | Some(u) => {
-          let getUserSignature = Dom.Storage2.getItem(_, u->ethAdrToLowerStr)
-          switch(getUserSignature(Dom.Storage2.localStorage)){
-            | None => None
-            | Some(uS) => Some({ethAddress: u->ethAdrToStr, ethSignature: uS})
-          }
-      }
-    }
-}
 
 let httpLink = ApolloClient.Link.HttpLink.make(
   ~uri=_ => "http://" ++ graphqlEndpoint,
@@ -33,7 +13,7 @@ let httpLink = ApolloClient.Link.HttpLink.make(
 let makeHttpLink = (~user) => ApolloClient.Link.HttpLink.make(
     ~uri= _ => "http://" ++ graphqlEndpoint, 
     ~headers={
-    switch(getAuthHeaders(~user)){
+    switch(Auth.Headers.makeFromOpt(~optUser=user)){
       | Some(headers) => headers->Obj.magic
       | None => Js.Obj.empty->Obj.magic
     }

diff --git a/dApp/user/src/App.bs.js b/dApp/user/src/App.bs.js
diff --git a/dApp/user/src/App.res b/dApp/user/src/App.res
@@ -12,7 +12,20 @@ module OnlyLoggedIn = {
 module Main = {
   @react.component
   let make = () => {
-    <OnlyLoggedIn> <h1> {"Main component"->React.string} </h1> <Dapp /> </OnlyLoggedIn>
+    open AuthProvider
+    let { loggedInStatus } = useAuthStatus()
+    <>
+    <h3>
+      {"Auth Status" -> React.string}
+    </h3>
+    <div>
+      { loggedInStatus->loggedInStatusToStr->React.string }
+    </div>
+    <OnlyLoggedIn> 
+      <h1> {"Main component"->React.string} </h1>
+      <Dapp />
+    </OnlyLoggedIn>
+    </>
   }
 }
 module NotFound = {
@@ -38,22 +51,37 @@ module Router = {
 module GraphQl = {
   @react.component
   let make = (~children) => {
-    let user = RootProvider.useCurrentUser()
+    let optWeb3User = RootProvider.useCurrentUser()
+    let { loggedInStatus } = AuthProvider.useAuthStatus()
+    let optDbOnlyUser = switch(loggedInStatus){
+      | DbOnly(user) => Some(user)
+      | _ => None
+    }
+
+    let optUser = if(Option.isSome(optWeb3User)){
+      optWeb3User
+    }else if(Option.isSome(optDbOnlyUser)){
+      optDbOnlyUser
+    } else{
+      None
+    }
+
+
     let client = React.useMemo1(() =>
       Apollo.makeClient(
-        ~user
+        ~user=optUser
       )
-    , [user])
+    , [optUser])
 
     <ApolloClient.React.ApolloProvider client> children </ApolloClient.React.ApolloProvider>
   }
 }
 @react.component
 let make = () =>
   <RootProvider>
-    <GraphQl>
     <AuthProvider>
-      <Router /> 
+      <GraphQl>
+        <Router /> 
+      </GraphQl>
     </AuthProvider>
-    </GraphQl>
-  </RootProvider>
+  </RootProvider>
diff --git a/dApp/user/src/Dapp.bs.js b/dApp/user/src/Dapp.bs.js
diff --git a/dApp/user/src/Dapp.res b/dApp/user/src/Dapp.res
@@ -3,7 +3,7 @@ let make = () => {
   let optWeb3Provider = RootProvider.useWeb3()
   let optSigner = RootProvider.useSigner()
 
-  let { isAuthorized } = AuthProvider.useAuthStatus()
+  let { loggedInStatus } = AuthProvider.useAuthStatus()
 
   React.useEffect2(() => {
     switch (optWeb3Provider, optSigner) {
@@ -16,10 +16,10 @@ let make = () => {
   }, (optWeb3Provider, optSigner))
   <div> 
     {
-      if(!isAuthorized){
-        <AuthenticateButton/>
-      }else{
-        <SignUp/>
+      switch(loggedInStatus){
+        | Web3Only => <AuthenticateButton/>
+        | NotLoggedIn => React.null
+        | _ => <SignUp/>
       }
     }
     <p>

diff --git a/dApp/user/src/components/Auth/AuthenticateButton.bs.js b/dApp/user/src/components/Auth/AuthenticateButton.bs.js
diff --git a/dApp/user/src/components/Auth/AuthenticateButton.res b/dApp/user/src/components/Auth/AuthenticateButton.res
@@ -6,18 +6,21 @@ let setSignInData = (~ethAddress: string, ~ethSignature: string) => Dom.Storage2
 let make = () => {
     let signer = RootProvider.useSignerExn()
     let userAddress = RootProvider.useCurrentUserExn()
-    let { setIsAuthorized } = AuthProvider.useAuthStatus()
+    let { setLoggedInStatus } = AuthProvider.useAuthStatus()
     <button
         onClick={(_) => {
             let _ = Ethers.Wallet.signMessage(
             signer,
             `flows.finance-signin-string:${userAddress->ethAdrToStr}`,
             )->JsPromise.map(result => {
-                setSignInData(~ethAddress=userAddress->ethAdrToLowerStr, ~ethSignature=result->Js.String2.make)
-                setIsAuthorized(_ => true)
+                Auth.LocalStorage.setSignInData(
+                    ~ethAddress=userAddress, 
+                    ~ethSignature=result->Js.String2.make)
+                Auth.LocalStorage.setCurrentUser(~ethAddress=userAddress)
+                setLoggedInStatus(_ => Web3AndDb)
             })
         }}
     >
     {"Authenticate"->React.string}
     </button>
-}
+}
diff --git a/dApp/user/src/lib/Auth/Auth.bs.js b/dApp/user/src/lib/Auth/Auth.bs.js