Adds correct checks after types has been fixed

Author: ondrej-langr

demos/taco-chat/src/hooks/useTeam.tsx

@@ -5,7 +5,7 @@ import { type AlertInfo, type PeerState } from '../types.js'
 import { assert } from '@localfirst/shared'
 import { ConnectionManager } from 'ConnectionManager.js'
 import { teamContext } from 'components/TeamProvider.js'
-import { randomTeamName } from 'util/randomTeamName.js'
+import { randomTeamName } from '../util/randomTeamName.js'
 
 // TODO: make this an environment var
 const relayUrls = ['ws://localhost:8080']

packages/auth-provider-automerge-repo/src/AuthProvider.ts

@@ -8,7 +8,7 @@ import type {
 import { EventEmitter } from '@herbcaudill/eventemitter42'
 import * as Auth from '@localfirst/auth'
 import { hash } from '@localfirst/crypto'
-import { debug, memoize, pause } from '@localfirst/shared'
+import { assert, debug, memoize, pause } from '@localfirst/shared'
 import { type AbstractConnection } from './AbstractConnection.js'
 import { AnonymousConnection } from './AnonymousConnection.js'
 import { buildServerUrl } from './buildServerUrl.js'
@@ -211,7 +211,11 @@ export class AuthProvider extends EventEmitter<AuthProviderEvents> {
    * Creates a team and registers it with all of our sync servers.
    */
   public async createTeam(teamName: string) {
-    const team = await Auth.createTeam(teamName, {
+    if (!this.#user) {
+      throw new Error('Cannot create team as user is missing on AuthProvider')
+    }
+
+    const team = Auth.createTeam(teamName, {
       device: this.#device,
       user: this.#user,
     })
@@ -661,6 +665,10 @@ export class AuthProvider extends EventEmitter<AuthProviderEvents> {
 
     const savedShares = unpack(serializedState) as SerializedState
 
+    if (!this.#user) {
+      throw new Error('Cannot load state as user is missing on AuthProvider')
+    }
+
     await Promise.all(
       Object.values(savedShares).map(async share => {
         if ('encryptedTeam' in share) {
@@ -672,9 +680,12 @@ export class AuthProvider extends EventEmitter<AuthProviderEvents> {
             this.#device.keys.secretKey
           ) as Auth.KeysetWithSecrets
 
-          const context = { device: this.#device, user: this.#user }
+          // By this point it is defined
+          assert(this.#user)
+
+          const context: Auth.LocalContext = { device: this.#device, user: this.#user }
 
-          const team = await Auth.loadTeam(encryptedTeam, context, teamKeys)
+          const team = Auth.loadTeam(encryptedTeam, context, teamKeys)
           return this.addTeam(team)
         } else {
           return this.joinPublicShare(share.shareId)

packages/auth-provider-automerge-repo/src/types.ts

@@ -134,7 +134,12 @@ export type AuthProviderEvents = {
    * this is how we get the user's keys.) This event gives the application a chance to persist the
    * team graph and the user's info.
    */
-  joined: (payload: { shareId: ShareId; peerId: PeerId; team: Auth.Team; user: Auth.User }) => void
+  joined: (payload: {
+    shareId: ShareId
+    peerId: PeerId
+    team: Auth.Team
+    user: Auth.UserWithSecrets
+  }) => void
 
   /**
    * We're connected to a peer and have been mutually authenticated.

packages/auth/src/connection/getDeviceUserFromGraph.ts

@@ -42,7 +42,12 @@ export const getDeviceUserFromGraph = ({
 
   const userKeyring = select.keyring(state, { type: USER, name: userId }, starterKeys)
   const keys = getLatestGeneration(userKeyring)
-  const user = { userName, userId, keys }
+
+  if (!keys) {
+    throw new Error('Failed to get device user from graph as there are no keys for user keyring')
+  }
+
+  const user: UserWithSecrets = { userName, userId, keys }
 
   return { user, userKeyring }
 }

packages/auth/src/connection/test/identity.test.ts

@@ -1,7 +1,7 @@
 import { challenge, prove, verify } from '../identity.js'
 import { ADMIN_SCOPE, TEAM_SCOPE } from '../../team/index.js'
 import { setup } from '../../util/testing/index.js'
-import 'util/testing/expect/toBeValid.js'
+import '../../util/testing/expect/toBeValid.js'
 import { type KeyScope, KeyType, createKeyset, redactKeys } from '@localfirst/crdx'
 import { describe, expect, it } from 'vitest'
 

packages/auth/src/team/test/members.test.ts

@@ -1,6 +1,6 @@
 import { ADMIN } from '../../role/index.js'
 import { setup } from '../../util/testing/index.js'
-import 'util/testing/expect/toLookLikeKeyset.js'
+import '../../util/testing/expect/toLookLikeKeyset.js'
 import { describe, expect, it } from 'vitest'
 
 describe('Team', () => {

packages/crdx/src/graph/test/append.test.ts

@@ -2,7 +2,7 @@ import { TEST_GRAPH_KEYS as keys, setup } from '../../util/testing/setup.js'
 import { describe, expect, test } from 'vitest'
 import { append, createGraph, getHead, getRoot } from '../index.js'
 import { validate } from '../../validator/index.js'
-import 'util/testing/expect/toBeValid'
+import '../../util/testing/expect/toBeValid'
 
 const { alice } = setup('alice')
 const defaultUser = alice

packages/crdx/src/graph/test/create.test.ts

@@ -2,7 +2,7 @@ import { TEST_GRAPH_KEYS as keys, setup } from '../../util/testing/setup.js'
 import { describe, expect, test } from 'vitest'
 import { createGraph, deserialize, getHead, getRoot, serialize } from '../index.js'
 import { validate } from '../../validator/index.js'
-import 'util/testing/expect/toBeValid.js'
+import '../../util/testing/expect/toBeValid.js'
 
 const { alice } = setup('alice')
 const defaultUser = alice

packages/crdx/src/graph/test/merge.test.ts

@@ -1,6 +1,6 @@
 import { TEST_GRAPH_KEYS as keys, setup } from '../../util/testing/setup.js'
 import { clone } from 'lodash-es'
-import 'util/testing/expect/toBeValid'
+import '../../util/testing/expect/toBeValid'
 import { describe, expect, test } from 'vitest'
 import { append, createGraph, merge } from '../index.js'
 

packages/crdx/src/store/test/createStore.test.ts

@@ -2,7 +2,7 @@ import { asymmetric } from '@localfirst/crypto'
 import { createGraph, getRoot, serialize } from '../../graph/index.js'
 import { createStore } from '../index.js'
 import { createUser } from '../../user/index.js'
-import 'util/testing/expect/toBeValid'
+import '../../util/testing/expect/toBeValid'
 import { TEST_GRAPH_KEYS as keys } from '../../util/testing/setup.js'
 import { describe, expect, test } from 'vitest'
 import {