Merge branch 'develop' of github.com:thedevs-network/kutt into develop

README.md

@@ -64,8 +64,6 @@ You need to have [Node.js](https://nodejs.org/), [PostgreSQL](https://www.postgr
 4. Run for development: `npm run dev`.
 5. Run for production: `npm run build` then `npm start`.
 
-**[Visit our wiki for a more complete setup and development guide.](https://github.com/thedevs-network/kutt/wiki/Setup-and-deployment)**
-
 ### Docker
 
 You can use Docker to start the app. The simplest way is to just run `docker-compose up` command and then the app should be ready on port "3000".

server/db/domain.ts

@@ -58,8 +58,8 @@ export const setDomain = async (
     domain = response;
   }
 
-  redis.del(user.email);
-  redis.del(user.email);
+  redis.del(getRedisKey.user(user.email));
+  redis.del(getRedisKey.user(user.apikey));
   redis.del(getRedisKey.domain(updateDate.address));
 
   return domain;
@@ -75,8 +75,8 @@ export const deleteDomain = async (user: UserJoined) => {
     redis.del(getRedisKey.domain(domain.address));
   }
 
-  redis.del(user.email);
-  redis.del(user.apikey);
+  redis.del(getRedisKey.user(user.email));
+  redis.del(getRedisKey.user(user.apikey));
 
   return domain;
 };

server/db/user.ts

@@ -59,8 +59,8 @@ export const createUser = async (
 
   if (user) {
     await knex<User>("users")
-      .where({ email, updated_at: new Date().toISOString() })
-      .update(data);
+      .where({ email })
+      .update({ ...data, updated_at: new Date().toISOString() });
   } else {
     await knex<User>("users").insert(data);
   }