Merge pull request #36 from cisagov/bugfix/move-export-anonymize-to-d…

…one-state-on-error Small fix for anonymization & export error state
cisagov · Nov 9, 2022 · e401fc9 · e401fc9
2 parents 6ef20f0 + 1d19e76
commit e401fc9
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 43 deletions.
diff --git a/applications/client/src/views/Campaigns/AnonymizeDialog/AnonymizeDialog.tsx b/applications/client/src/views/Campaigns/AnonymizeDialog/AnonymizeDialog.tsx
@@ -79,6 +79,10 @@ export const AnonymizeDialog = observer<AnonymizeDialogProps>(({ campaign, onClo
 							),
 						},
 					});
+				if (!fileName) {
+					this.error = 'Error anonymizing campaign';
+					return (this.isLoading = false);
+				}
 				const res: Response = yield store.auth.protectedFetch(
 					`${store.auth.serverUrl}/api/campaign/download/${fileName.anonymizeCampaign}`,
 					{

diff --git a/applications/server/src/machines/anonymization/anonymization.machine.ts b/applications/server/src/machines/anonymization/anonymization.machine.ts
@@ -43,7 +43,7 @@ export interface AnonymizationMachineContext extends AnonymizationInput {
 	error?: string;
 }
 
-type AnonymizationMachineEvent = { type: 'ANONYMIZE' } | { type: 'SET_ERROR'; error: Error };
+type AnonymizationMachineEvent = { type: 'ANONYMIZE' };
 
 export const anonymizationMachine = createMachine(
 	{
@@ -67,13 +67,8 @@ export const anonymizationMachine = createMachine(
 						target: 'finished',
 					},
 					onError: {
-						target: 'idle',
-						actions: ['setError'],
-					},
-				},
-				on: {
-					SET_ERROR: {
-						actions: ['setError'],
+						actions: 'setError',
+						target: 'finished',
 					},
 				},
 			},
@@ -85,7 +80,7 @@ export const anonymizationMachine = createMachine(
 	{
 		actions: {
 			setError: assign((_, event) => ({
-				error: 'error' in event ? event.error.message : undefined,
+				error: 'data' in event ? (event.data as Error)?.message : undefined,
 			})),
 		},
 		services: {

diff --git a/applications/server/src/machines/anonymization/anonymization.machine.typegen.ts b/applications/server/src/machines/anonymization/anonymization.machine.typegen.ts
@@ -2,9 +2,6 @@
 
 export interface Typegen0 {
 	'@@xstate/typegen': true;
-	eventsCausingActions: {
-		setError: 'error.platform.ANONYMIZATION.anonymizing:invocation[0]' | 'SET_ERROR';
-	};
 	internalEvents: {
 		'error.platform.ANONYMIZATION.anonymizing:invocation[0]': {
 			type: 'error.platform.ANONYMIZATION.anonymizing:invocation[0]';
@@ -21,11 +18,14 @@ export interface Typegen0 {
 		guards: never;
 		delays: never;
 	};
+	eventsCausingActions: {
+		setError: 'error.platform.ANONYMIZATION.anonymizing:invocation[0]';
+	};
 	eventsCausingServices: {
 		anonymizeService: 'ANONYMIZE';
 	};
 	eventsCausingGuards: {};
 	eventsCausingDelays: {};
-	matchesStates: 'idle' | 'anonymizing' | 'finished';
+	matchesStates: 'anonymizing' | 'finished' | 'idle';
 	tags: never;
 }
diff --git a/applications/server/src/store/campaign-resolvers.ts b/applications/server/src/store/campaign-resolvers.ts
@@ -96,41 +96,41 @@ export class CampaignResolvers {
 
 	@Authorized()
 	@Mutation(() => String, { description: 'Anonymize campaign for export' })
-	anonymizeCampaign(
+	async anonymizeCampaign(
 		@Ctx() ctx: GraphQLContext,
 		@Arg('campaignId', () => String) campaignId: string,
 		@Arg('anonymizeOptions') anonymizeOptions: AnonymizationInput
 	): Promise<string | void> {
-		return new Promise(async (resolve, reject) => {
-			if (ctx.config.blueTeam) return reject(new AuthenticationError('Blue team cannot export'));
-			const tempCampaignFolder = `campaign-${randomUUID()}`;
-			const dbPath = path.join(getDbPath(ctx.config.databaseMode), 'campaign', campaignId);
-			const anonymizedDbPath = path.join(getDbPath(ctx.config.databaseMode), 'anonymized-campaigns', tempCampaignFolder);
-			const exists = existsSync(dbPath);
-			if (!exists) {
-				return reject(Error('Database not found'));
-			} else {
-				try {
-					const filePath = path.join(anonymizedDbPath, 'db.redeye');
-
-					await fs.copy(dbPath, anonymizedDbPath);
-					const orm = await MikroORM.init({ ...getProjectMikroOrmConfig(filePath) });
-					await orm.em.getDriver().execute('PRAGMA wal_checkpoint');
-					await orm.close();
+		if (ctx.config.blueTeam) throw new AuthenticationError('Blue team cannot export');
+		const tempCampaignFolder = `campaign-${randomUUID()}`;
+		const dbPath = path.join(getDbPath(ctx.config.databaseMode), 'campaign', campaignId);
+		const anonymizedDbPath = path.join(getDbPath(ctx.config.databaseMode), 'anonymized-campaigns', tempCampaignFolder);
+		const exists = existsSync(dbPath);
+		if (!exists) {
+			throw Error('Database not found');
+		} else {
+			try {
+				const filePath = path.join(anonymizedDbPath, 'db.redeye');
 
-					const machine = interpret(
-						anonymizationMachine.withContext({
-							database: filePath,
-							...anonymizeOptions,
-						})
-					).start();
-					machine.send('ANONYMIZE');
+				await fs.copy(dbPath, anonymizedDbPath);
+				const orm = await MikroORM.init({ ...getProjectMikroOrmConfig(filePath) });
+				await orm.em.getDriver().execute('PRAGMA wal_checkpoint');
+				await orm.close();
 
+				const machine = interpret(
+					anonymizationMachine.withContext({
+						database: filePath,
+						...anonymizeOptions,
+					})
+				).start();
+				machine.send('ANONYMIZE');
+				return new Promise(async (resolve, reject) => {
 					machine.onDone(() => {
 						// If there is an error during anonymization delete copy and return the error
 						if (machine.state.context.error) {
+							console.debug('Error during export & anonymization ', machine.state.context.error);
 							fs.rmSync(anonymizedDbPath, { recursive: true });
-							return reject(Error(machine.state.context.error));
+							return reject(new Error(machine.state.context.error));
 						} else {
 							// After a minute, delete the folder if it still exists
 							setTimeout(() => {
@@ -141,11 +141,11 @@ export class CampaignResolvers {
 							return resolve(tempCampaignFolder);
 						}
 					});
-				} catch (e) {
-					fs.rmSync(anonymizedDbPath, { recursive: true });
-					return reject(Error((e as Error).message));
-				}
+				});
+			} catch (e) {
+				fs.rmSync(anonymizedDbPath, { recursive: true });
+				throw Error((e as Error).message);
 			}
-		});
+		}
 	}
 }