First pass at a session handler

bluesky-social · Nov 9, 2023 · 6aaa6fe · 6aaa6fe
1 parent bd531f2
commit 6aaa6fe
Show file tree

Hide file tree

Showing 6 changed files with 342 additions and 26 deletions.
diff --git a/src/App.web.tsx b/src/App.web.tsx
@@ -21,20 +21,29 @@ import {Provider as ModalStateProvider} from 'state/modals'
 import {Provider as MutedThreadsProvider} from 'state/muted-threads'
 import {Provider as InvitesStateProvider} from 'state/invites'
 import {Provider as PrefsStateProvider} from 'state/preferences'
+import {
+  Provider as SessionProvider,
+  useSession,
+  useSessionApi,
+} from 'state/session'
 
 const InnerApp = observer(function AppImpl() {
+  const session = useSession()
+  console.log('session', session)
+  const {resumeSession} = useSessionApi()
   const colorMode = useColorMode()
   const [rootStore, setRootStore] = useState<RootStoreModel | undefined>(
     undefined,
   )
 
   // init
   useEffect(() => {
+    resumeSession()
     setupState().then(store => {
       setRootStore(store)
       analytics.init(store)
     })
-  }, [])
+  }, [resumeSession])
 
   // show nothing prior to init
   if (!rootStore) {
@@ -71,17 +80,19 @@ function App() {
   }
 
   return (
-    <ShellStateProvider>
-      <PrefsStateProvider>
-        <MutedThreadsProvider>
-          <InvitesStateProvider>
-            <ModalStateProvider>
-              <InnerApp />
-            </ModalStateProvider>
-          </InvitesStateProvider>
-        </MutedThreadsProvider>
-      </PrefsStateProvider>
-    </ShellStateProvider>
+    <SessionProvider>
+      <ShellStateProvider>
+        <PrefsStateProvider>
+          <MutedThreadsProvider>
+            <InvitesStateProvider>
+              <ModalStateProvider>
+                <InnerApp />
+              </ModalStateProvider>
+            </InvitesStateProvider>
+          </MutedThreadsProvider>
+        </PrefsStateProvider>
+      </ShellStateProvider>
+    </SessionProvider>
   )
 }
 

diff --git a/src/state/persisted/legacy.ts b/src/state/persisted/legacy.ts
@@ -35,7 +35,7 @@ type LegacySchema = {
     description: string
     avatar: string
   }
-  onboarding: {
+  onboarding?: {
     step: string
   }
   preferences: {
@@ -56,12 +56,12 @@ type LegacySchema = {
     pinnedFeeds: string[]
     requireAltTextEnabled: boolean
   }
-  invitedUsers: {
+  invitedUsers?: {
     seenDids: string[]
     copiedInvites: string[]
   }
-  mutedThreads: {uris: string[]}
-  reminders: {lastEmailConfirm: string}
+  mutedThreads?: {uris: string[]}
+  reminders?: {lastEmailConfirm: string}
 }
 
 const DEPRECATED_ROOT_STATE_STORAGE_KEY = 'root'
@@ -77,7 +77,7 @@ export function transform(legacy: LegacySchema): Schema {
     },
     reminders: {
       lastEmailConfirm:
-        legacy.reminders.lastEmailConfirm ||
+        legacy.reminders?.lastEmailConfirm ||
         defaults.reminders.lastEmailConfirm,
     },
     languagePrefs: {
@@ -96,13 +96,13 @@ export function transform(legacy: LegacySchema): Schema {
     requireAltTextEnabled:
       legacy.preferences.requireAltTextEnabled ||
       defaults.requireAltTextEnabled,
-    mutedThreads: legacy.mutedThreads.uris || defaults.mutedThreads,
+    mutedThreads: legacy.mutedThreads?.uris || defaults.mutedThreads,
     invites: {
       copiedInvites:
-        legacy.invitedUsers.copiedInvites || defaults.invites.copiedInvites,
+        legacy.invitedUsers?.copiedInvites || defaults.invites.copiedInvites,
     },
     onboarding: {
-      step: legacy.onboarding.step || defaults.onboarding.step,
+      step: legacy.onboarding?.step || defaults.onboarding.step,
     },
   }
 }

diff --git a/src/state/persisted/schema.ts b/src/state/persisted/schema.ts
@@ -2,14 +2,15 @@ import {z} from 'zod'
 import {deviceLocales} from '#/platform/detection'
 
 // only data needed for rendering account page
+// TODO agent.resumeSession requires the following fields
 const accountSchema = z.object({
   service: z.string(),
   did: z.string(),
-  refreshJwt: z.string().optional(),
-  accessJwt: z.string().optional(),
-  handle: z.string().optional(),
-  displayName: z.string().optional(),
-  aviUrl: z.string().optional(),
+  handle: z.string(),
+  refreshJwt: z.string().optional(), // optional because it can expire
+  accessJwt: z.string().optional(), // optional because it can expire
+  // displayName: z.string().optional(),
+  // aviUrl: z.string().optional(),
 })
 
 export const schema = z.object({