fix(com-api): user new crypto pre configs and new env names

Alwatr · May 18, 2023 · 244b418 · 244b418
1 parent e4d1a55
commit 244b418
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/uniquely/com-api/src/lib/config.ts b/uniquely/com-api/src/lib/config.ts
@@ -1,19 +1,26 @@
-import {TokenGeneratorConfig} from '@alwatr/crypto';
 import {createLogger} from '@alwatr/logger';
 
 export const logger = createLogger('com-api');
 
+if (process.env.NODE_ENV === 'production') {
+  if (process.env.STORAGE_TOKEN == null) {
+    throw new Error('STORAGE_TOKEN is required in production');
+  }
+
+  if (process.env.TOKEN_GENERATOR_SECRET == null) {
+    throw new Error('TOKEN_GENERATOR_SECRET is required in production');
+  }
+}
+
 export const config = {
   storageClient: {
     host: process.env.STORAGE_HOST ?? '127.0.0.1',
     port: process.env.STORAGE_PORT != null ? +process.env.STORAGE_PORT : 9000,
-    token: process.env.STORAGE_TOKEN ?? 'YOUR_SECRET_TOKEN',
+    token: process.env.STORAGE_TOKEN ?? 'YOUR_SECRET',
   },
 
-  token: <TokenGeneratorConfig>{
-    secret: process.env.SECRET ?? 'YOUR_SECRET',
-    algorithm: 'sha224',
-    encoding: 'base64url',
+  token: {
+    secret: process.env.TOKEN_GENERATOR_SECRET ?? 'YOUR_SECRET',
     duration: '6M',
   },
 

diff --git a/uniquely/com-api/src/lib/crypto.ts b/uniquely/com-api/src/lib/crypto.ts
@@ -1,5 +1,11 @@
-import {AlwatrUserFactory} from '@alwatr/crypto';
+import {AlwatrUserFactory, userIdGeneratorPreConfig, userTokenGeneratorPreConfig} from '@alwatr/crypto';
 
 import {config} from './config.js';
 
-export const userFactory = new AlwatrUserFactory(config.token);
+export const userFactory = new AlwatrUserFactory(
+    userIdGeneratorPreConfig,
+    {
+      ...userTokenGeneratorPreConfig,
+      ...config.token,
+    },
+);