Add definition for submitted provider data.

Author: adewes

src/interfaces/provider.ts

@@ -10,7 +10,7 @@ export interface ProviderBackupReferenceData {
 
 export interface EncryptedProviderData {
     encryptedData: ECDHData
-    data?: ProviderData
+    data?: SubmittedProviderData
 }
 
 export interface EncryptedConfirmedProviderData {
@@ -40,16 +40,17 @@ export interface ProviderData {
     email: string
     accessible?: boolean
     website?: string
-    publicKeys: ProviderPublicKeys
     submittedAt?: string
     version?: string
     id?: string
 }
 
-export interface VerifiedProviderData extends ProviderData {
-
+export interface SubmittedProviderData extends ProviderData {
+    publicKeys?: ProviderPublicKeys
 }
 
+export interface VerifiedProviderData extends ProviderData {}
+
 export interface ProviderKeyPairs {
     signing: KeyPair
     encryption: KeyPair

src/mediator/confirm-provider.ts

@@ -13,8 +13,8 @@ export async function confirmProvider(
     const data = providerData.data!
 
     const keyHashesData = {
-        signing: data.publicKeys.signing,
-        encryption: data.publicKeys.encryption,
+        signing: data.publicKeys!.signing,
+        encryption: data.publicKeys!.encryption,
         queueData: {
             zipCode: data.zipCode,
             accessible: data.accessible,

src/mediator/providers.ts

@@ -10,7 +10,7 @@ import {
     ErrorType,
     EncryptedProviderData,
     KeyPair,
-    ProviderData,
+    SubmittedProviderData,
 } from "../interfaces"
 import { Mediator } from "./"
 
@@ -50,7 +50,7 @@ export async function pendingProviders(
 
         // to do: verify provider data!
 
-        pd.data = JSON.parse(decryptedData) as ProviderData
+        pd.data = JSON.parse(decryptedData) as SubmittedProviderData
     }
 
     return {
@@ -91,7 +91,7 @@ export async function verifiedProviders(
 
         // to do: verify provider data!
 
-        pd.data = JSON.parse(decryptedData) as ProviderData
+        pd.data = JSON.parse(decryptedData) as SubmittedProviderData
     }
 
     return {

src/provider/store-data.ts

@@ -3,7 +3,7 @@
 // README.md contains license information.
 
 import { ecdhEncrypt, generateECDHKeyPair, sign } from "../crypto"
-import { ProviderData, PublicKeys, Status, OK } from "../interfaces"
+import { SubmittedProviderData, PublicKeys, Status, OK } from "../interfaces"
 import { Provider } from "./"
 
 // store the provider data for validation in the backend
@@ -15,7 +15,7 @@ export async function storeData(this: Provider, code?: string) {
     const keys = publicKeys.keys
     const data = this.data!
 
-    const dataToEncrypt = Object.assign({}, data)
+    const dataToEncrypt: SubmittedProviderData = Object.assign({}, data)
 
     dataToEncrypt.publicKeys = {
         signing: this.keyPairs!.signing.publicKey,

src/testing/fixtures/unverified-provider.ts

@@ -23,10 +23,6 @@ export async function unverifiedProvider(
         zipCode: "10707",
         description: "",
         email: "[email protected]",
-        publicKeys: {
-            encryption: provider.keyPairs!.encryption.publicKey,
-            signing: provider.keyPairs!.signing.publicKey,
-        },
     }
 
     provider.data = providerData

src/testing/fixtures/verified-provider.ts

@@ -26,7 +26,8 @@ export async function verifiedProvider(
 
     const pendingProvider = pendingProviders.data.find(
         (pr: EncryptedProviderData) =>
-            pr.data!.publicKeys.signing === provider.keyPairs!.signing.publicKey
+            pr.data!.publicKeys!.signing ===
+            provider.keyPairs!.signing.publicKey
     )
 
     const result = await mediator.confirmProvider(pendingProvider!)