check new pin length

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/auth.js b/lib/auth.js
index 0533de31..55de6df0 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -37,7 +37,7 @@ export const jwtStrategy = new jwt.Strategy(
     let user;
     if (payload.id) {
       user = await g(`user:${payload.id}`);
-      if (typeof user === "string") await g(`user:${user}`);
+      if (typeof user === "string") user = await g(`user:${user}`);
     }
 
     next(null, user);
diff --git a/routes/users.js b/routes/users.js
index 0c4e8484..158a61b1 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -186,7 +186,7 @@ export default {
       let { confirm, password, pin, newpin, username, shopifyToken, shopifyStore } = body;
 
       if (user.pin && !(pin === user.pin)) throw new Error("Pin required");
-      if (typeof newpin !== "undefined") user.pin = newpin;
+      if (typeof newpin !== "undefined" && newpin.length === 6) user.pin = newpin;
       if (!user.pin || user.pin === "undefined") delete user.pin;
 
       let exists;
@@ -238,6 +238,7 @@ export default {
         `user:${user.username.toLowerCase().replace(/\s/g, "")}`,
         user.id
       );
+      
       await s(`user:${user.id}`, user);
 
       emit(user.id, "user", user);