From 61a8eeda6090ec0fb1acb95f62b1869b42dee524 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <atheartengineer@gmail.com>
Date: Mon, 16 Oct 2023 14:05:44 -0400
Subject: [PATCH] checkpoint identity restoration updated to encrypted stores

---
 src/lib/components/BackupIdentity.svelte      |  9 ++++++--
 src/lib/utils/identity.ts                     | 10 ++++++++-
 .../settings/identity/RestoreIdentity.svelte  | 21 +++++++++++--------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/BackupIdentity.svelte b/src/lib/components/BackupIdentity.svelte
index 8f9947d..a092fb4 100644
--- a/src/lib/components/BackupIdentity.svelte
+++ b/src/lib/components/BackupIdentity.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { identityExists } from '$lib/stores';
+	import { configStore, identityExists } from '$lib/stores';
 	import { getIdentityBackup } from '$lib/utils/';
 
 	$: id = getIdentityBackup();
@@ -8,6 +8,7 @@
 	let revealIdentity = false;
 
 	function reveal() {
+		$configStore.signUpStatus.identityBackedUp = true;
 		id = getIdentityBackup();
 		if (id === undefined || id === null) {
 			id = 'No Identity Backup Found';
@@ -27,7 +28,11 @@
 
 <div class="m-2 sm:m-3 flex flex-col gap-4">
 	{#if $identityExists == 'safe' || $identityExists == 'unsafe'}
-		<a class="btn variant-ghost-success" href={encodedIdentity} download="Discreetly_Identity.json"
+		<a
+			class="btn variant-ghost-success"
+			href={encodedIdentity}
+			download="Discreetly_Identity.json"
+			on:click={() => ($configStore.signUpStatus.identityBackedUp = true)}
 			>Download Identity Backup as JSON</a
 		>
 		{#if !revealIdentity}
diff --git a/src/lib/utils/identity.ts b/src/lib/utils/identity.ts
index dde9e36..7a03eee 100644
--- a/src/lib/utils/identity.ts
+++ b/src/lib/utils/identity.ts
@@ -9,7 +9,7 @@ import {
 	lockStateStore
 } from '../stores';
 import { Identity } from '@semaphore-protocol/identity';
-import type { IdentityStoreI } from '$lib/types';
+import { IdentityStoreE, type IdentityStoreI } from '$lib/types';
 
 export function createIdentity(regenerate = false): 'created' | 'exists' | 'unsafe' | 'error' {
 	const identityStatus = get(identityExists);
@@ -24,6 +24,10 @@ export function createIdentity(regenerate = false): 'created' | 'exists' | 'unsa
 				try {
 					identityKeyStore.set(identity);
 					if (get(identityExists) === 'safe') {
+						configStore.update((state) => {
+							state.identityStore = IdentityStoreE.localStorageEncrypted;
+							return state;
+						});
 						alertQueue.enqueue('Identity Created! Congrats on your new journey');
 						return 'created';
 					} else {
@@ -43,6 +47,10 @@ export function createIdentity(regenerate = false): 'created' | 'exists' | 'unsa
 				'For your security please set a password with /password or click on the lock in the corner'
 			);
 			identityStore.set(identity);
+			configStore.update((state) => {
+				state.identityStore = IdentityStoreE.localStorage;
+				return state;
+			});
 			return 'unsafe';
 		}
 	} else {
diff --git a/src/routes/settings/identity/RestoreIdentity.svelte b/src/routes/settings/identity/RestoreIdentity.svelte
index 8526ec7..7c0f60f 100644
--- a/src/routes/settings/identity/RestoreIdentity.svelte
+++ b/src/routes/settings/identity/RestoreIdentity.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { alertQueue, identityKeyStore, keyStore } from '$lib/stores';
+	import { alertQueue, identityKeyStore, lockStateStore } from '$lib/stores';
 	import { FileDropzone } from '@skeletonlabs/skeleton';
 	import { poseidon2 } from 'poseidon-lite/poseidon2';
 	import { poseidon1 } from 'poseidon-lite/poseidon1';
@@ -8,7 +8,6 @@
 
 	function restoreBackup(backup: any) {
 		console.debug('Attempting restore of identity from backup file...');
-		console.debug(backup);
 		let id;
 		try {
 			id = JSON.parse(backup);
@@ -43,15 +42,19 @@
 			alertQueue.enqueue('Commitment does not match commitment backup');
 		}
 		console.log('Restoring identity from backup file...');
-		if ($keyStore !== undefined || $keyStore !== null) {
+		if ($lockStateStore == 'unlocked') {
 			$identityKeyStore = id;
-		} else {
-			alertQueue.enqueue('Please set a password or unlock before restoring your identity');
-		}
-		alertQueue.enqueue(
-			`Identity restored from backup file with identity commitment:
+			alertQueue.enqueue(
+				`Identity restored from backup file with identity commitment:
 			${$identityKeyStore._commitment}`
-		);
+			);
+		} else if ($lockStateStore == 'locked') {
+			alertQueue.enqueue('Please 🔑 UNLOCK before restoring your identity');
+		} else {
+			alertQueue.enqueue(
+				'Please set a password using the padlock icon before restoring your identity'
+			);
+		}
 	}
 
 	function onChangeHandler(e: Event): void {