Merge Auth and App provider (#126)

Author: nikgraf

apps/events/src/Boot.tsx

@@ -1,6 +1,6 @@
 import { RouterProvider, createRouter } from '@tanstack/react-router';
 
-import { Auth } from '@graphprotocol/hypergraph-react';
+import { Hypergraph } from '@graphprotocol/hypergraph-react';
 import { PrivyProvider } from '@privy-io/react-auth';
 
 import { routeTree } from './routeTree.gen';
@@ -33,9 +33,9 @@ export function Boot() {
         },
       }}
     >
-      <Auth.HypergraphAuthProvider storage={localStorage}>
+      <Hypergraph.HypergraphAppProvider storage={localStorage}>
         <RouterProvider router={router} />
-      </Auth.HypergraphAuthProvider>
+      </Hypergraph.HypergraphAppProvider>
     </PrivyProvider>
   );
 }

apps/events/src/components/logout.tsx

@@ -1,10 +1,10 @@
-import { Auth } from '@graphprotocol/hypergraph-react';
+import { Hypergraph } from '@graphprotocol/hypergraph-react';
 import { usePrivy } from '@privy-io/react-auth';
 import { useRouter } from '@tanstack/react-router';
 import { Button } from './ui/button';
 
 export function Logout() {
-  const { logout: graphLogout } = Auth.useHypergraphAuth();
+  const { logout: graphLogout } = Hypergraph.useHypergraphApp();
   const { logout: privyLogout } = usePrivy();
   const router = useRouter();
   const disconnectWallet = async () => {

apps/events/src/routes/__root.tsx

@@ -1,14 +1,13 @@
 import { Logout } from '@/components/logout';
-import { Auth, Hypergraph } from '@graphprotocol/hypergraph-react';
+import { Hypergraph } from '@graphprotocol/hypergraph-react';
 import { Link, Outlet, createRootRoute, useLayoutEffect, useRouter } from '@tanstack/react-router';
 import { TanStackRouterDevtools } from '@tanstack/router-devtools';
 
 export const Route = createRootRoute({
   component: () => {
-    const { authenticated, getIdentity, getSessionToken } = Auth.useHypergraphAuth();
+    const { authenticated, getIdentity } = Hypergraph.useHypergraphApp();
 
     const graphIdentity = getIdentity();
-    const loggedInSessionToken = getSessionToken();
 
     const router = useRouter();
 
@@ -44,20 +43,7 @@ export const Route = createRootRoute({
           </header>
           <hr />
 
-          {authenticated && graphIdentity && loggedInSessionToken ? (
-            <Hypergraph.HypergraphAppProvider
-              accountId={graphIdentity.accountId}
-              sessionToken={loggedInSessionToken}
-              encryptionPublicKey={graphIdentity.encryptionPublicKey}
-              encryptionPrivateKey={graphIdentity.encryptionPrivateKey}
-              signaturePrivateKey={graphIdentity.signaturePrivateKey}
-              signaturePublicKey={graphIdentity.signaturePublicKey}
-            >
-              <Outlet />
-            </Hypergraph.HypergraphAppProvider>
-          ) : (
-            <Outlet />
-          )}
+          <Outlet />
 
           <TanStackRouterDevtools />
 

apps/events/src/routes/login.lazy.tsx

@@ -1,5 +1,5 @@
 import type { Identity } from '@graphprotocol/hypergraph';
-import { Auth } from '@graphprotocol/hypergraph-react';
+import { Hypergraph } from '@graphprotocol/hypergraph-react';
 import { usePrivy, useWallets } from '@privy-io/react-auth';
 import { createLazyFileRoute, useRouter } from '@tanstack/react-router';
 import { Loader2 } from 'lucide-react';
@@ -17,7 +17,7 @@ export const Route = createLazyFileRoute('/login')({
 function Login() {
   const { ready: privyReady, login: privyLogin, signMessage, authenticated: privyAuthenticated } = usePrivy();
   const { ready: walletsReady, wallets } = useWallets();
-  const { setIdentityAndSessionToken, login: hypergraphLogin } = Auth.useHypergraphAuth();
+  const { setIdentityAndSessionToken, login: hypergraphLogin } = Hypergraph.useHypergraphApp();
   const { navigate } = useRouter();
   const [hypergraphLoginStarted, setHypergraphLoginStarted] = useState(false);