Throw readable error for bad api key read (#963)

agnaistic · Jul 1, 2024 · e26f500 · e26f500
1 parent 9767a5e
commit e26f500
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/srv/db/util.ts b/srv/db/util.ts
@@ -6,7 +6,7 @@ import { defaultChars } from '../../common/characters'
 
 const ALGO = 'aes-192-cbc'
 const KEY = crypto.scryptSync(config.jwtSecret, 'salt', 24)
-const KEY_LB = crypto.scryptSync(config.jwtSecret + '\n', 'salt', 24)
+const KEY_LB = crypto.scryptSync(`${config.jwtSecret}\n`, 'salt', 24)
 
 export function now() {
   return new Date().toISOString()
@@ -36,8 +36,11 @@ export function decryptText(text: string) {
     return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8')
   } catch (ex) {}
 
-  const decipher = crypto.createDecipheriv(ALGO, KEY_LB, Buffer.from(iv, 'hex'))
-  return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8')
+  try {
+    const decipher = crypto.createDecipheriv(ALGO, KEY_LB, Buffer.from(iv, 'hex'))
+    return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8')
+  } catch (ex) {}
+  throw new Error(`Could not read API key: Try re-entering your service API key.`)
 }
 
 export const STARTER_CHARACTER: AppSchema.Character = {