fu

Author: sneko

config/tsconfig/tsconfig.base.json

@@ -3,6 +3,23 @@
   "compilerOptions": {
     // Type checking
     "strict": true,
+    "baseUrl": ".",
+    "paths": {
+      "@socialgouv/e2esdk-api": ["../../packages/api/src"],
+      "@socialgouv/e2esdk-api/*": ["../../packages/api/src/*"],
+      "@socialgouv/e2esdk-client": ["../../packages/client/src"],
+      "@socialgouv/e2esdk-client/*": ["../../packages/client/src/*"],
+      "@socialgouv/e2esdk-crypto": ["../../packages/crypto/src"],
+      "@socialgouv/e2esdk-crypto/*": ["../../packages/crypto/src/*"],
+      "@socialgouv/e2esdk-devtools": ["../../packages/devtools/src"],
+      "@socialgouv/e2esdk-devtools/*": ["../../packages/devtools/src/*"],
+      "@socialgouv/e2esdk-generator": ["../../packages/generator/src"],
+      "@socialgouv/e2esdk-generator/*": ["../../packages/generator/src/*"],
+      "@socialgouv/e2esdk-react": ["../../packages/react/src"],
+      "@socialgouv/e2esdk-react/*": ["../../packages/react/src/*"],
+      "@socialgouv/e2esdk-server": ["../../packages/server/src"],
+      "@socialgouv/e2esdk-server/*": ["../../packages/server/src/*"]
+    },
 
     // Modules
     "module": "ESNext",

packages/crypto/src/form/state.ts

@@ -1,5 +1,4 @@
 import { thirtyTwoBytesBase64Schema } from '@socialgouv/e2esdk-api'
-import type { KeyPair } from 'libsodium-wrappers'
 import { base64UrlDecode, base64UrlEncode } from '../shared/codec'
 import { Sodium, sodium } from '../sodium/sodium'
 
@@ -61,7 +60,10 @@ export type EncryptedFormLocalState = {
   /**
    * Signature key pair to authenticate response submissions
    */
-  identity: Omit<KeyPair, 'keyType'>
+  identity: {
+    publicKey: Uint8Array
+    privateKey: Uint8Array
+  }
 }
 
 const storageKey = (namespace: string) => `e2esdk:forms:localState:${namespace}`

packages/crypto/src/sodium/files.ts

@@ -111,9 +111,10 @@ export function decryptFileContents(
     const ciphertextSlice = ciphertext.slice(start, end)
     const clearText = sodium.crypto_secretstream_xchacha20poly1305_pull(
       state,
-      ciphertextSlice
+      ciphertextSlice,
+      null
     )
-    if (!clearText.message) {
+    if (!clearText || !clearText.message) {
       throw new Error('Failed to decrypt file')
     }
     clearTextBuffer.set(clearText.message, chunkIndex * chunkSize)

packages/crypto/src/sodium/identity.ts

@@ -1,4 +1,3 @@
-import type { KeyPair } from 'libsodium-wrappers'
 import {
   multipartSignature,
   verifyMultipartSignature,
@@ -14,8 +13,14 @@ export function generateMainKey(sodium: Sodium) {
 type ClientIdentity = {
   userId: string
   keychainBaseKey: Uint8Array
-  sharing: Omit<KeyPair, 'keyType'>
-  signature: Omit<KeyPair, 'keyType'>
+  sharing: {
+    publicKey: Uint8Array
+    privateKey: Uint8Array
+  }
+  signature: {
+    publicKey: Uint8Array
+    privateKey: Uint8Array
+  }
   proof: string
 }