feat: validate account before save character

dragonrealms-phoenix · Dec 23, 2023 · 7f6efd1 · 7f6efd1
1 parent 79eceaa
commit 7f6efd1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/electron/main/account/__tests__/account-service.test.ts b/electron/main/account/__tests__/account-service.test.ts
@@ -331,7 +331,33 @@ describe('account-service', () => {
   });
 
   describe('#saveCharacter', () => {
+    it('should not save a character if no account is found', async () => {
+      try {
+        await accountService.saveCharacter({
+          gameCode: 'DR',
+          accountName: 'test-account',
+          characterName: 'test-character',
+        });
+        fail('it should throw an error');
+      } catch (error) {
+        expect(error.message).toBe(
+          `[ACCOUNT:SERVICE:ERROR:ACCOUNT_NOT_FOUND] test-account`
+        );
+      }
+    });
+
     it('should save a character', async () => {
+      storeService.get.mockImplementation((key) => {
+        if (key === 'sge.account.test-account') {
+          return {
+            accountName: 'test-account',
+            accountPassword: 'test-encrypted',
+          };
+        }
+
+        return undefined;
+      });
+
       await accountService.saveCharacter({
         gameCode: 'DR',
         accountName: 'test-account',

diff --git a/electron/main/account/account.service.ts b/electron/main/account/account.service.ts
@@ -160,6 +160,15 @@ export class AccountServiceImpl implements AccountService {
 
     logger.info('saving character', { accountName, characterName, gameCode });
 
+    // Confirm the account exists, otherwise we have
+    // no credentials by which to play the character.
+    const account = await this.getAccount({ accountName });
+    if (!account) {
+      throw new Error(
+        `[ACCOUNT:SERVICE:ERROR:ACCOUNT_NOT_FOUND] ${accountName}`
+      );
+    }
+
     const characterKey = this.getCharacterStoreKey({
       characterName,
       gameCode,