updates

resolvers/query.resolver.js

@@ -6,21 +6,21 @@ const Query = {
     if (!userId) throw new Error("unable to query");
     return prisma.user({ id: userId });
   },
-  users: (parent, args, { prisma }, info) =>
-    prisma.users({
+  users: (parent, args, { prisma }, info) =>{
+    return prisma.users({
       where: {
         OR: [
           { name_contains: args.query },
           {
-            // email_contains: args.query
+            id: args.query
           }
         ]
       },
       first: args.first,
       skip: args.skip,
       orderBy: args.orderBy
-    }),
-  posts: (parent, args, { prisma, req }, info) => 
+    })},
+  posts: (parent, args, { prisma, req }, info) =>
     prisma.posts({
       where: {
         AND: [
@@ -33,7 +33,7 @@ const Query = {
       first: args.first,
       skip: args.skip,
       orderBy: args.orderBy
-  }),
+    }),
   myPosts: (parent, args, { prisma, req }, info) => {
     const userId = getUserId(req);
     return prisma.posts({

src/utils/generateToken.js

@@ -1,7 +1,7 @@
 const jwt = require("jsonwebtoken");
 
 const generateToken = userId => {
-  return jwt.sign({ userId }, process.env.JWT_SECRET, { expiresIn: "7 days" });
+  return jwt.sign({ userId }, process.env.JWT_SECRET, { expiresIn: "500 ms" });
 };
 
 module.exports = {

src/utils/getUserId.js

@@ -2,12 +2,12 @@ const jwt = require("jsonwebtoken");
 const secret = process.env.JWT_SECRET;
 
 const getUserId = (req, authRequired = true) => {
-
-  const token = req.req
+  const token = req.req.headers.authorization
     ? req.req.headers.authorization
     : req.connection.context.Authorization;
-
-  if (token) {
+  console.log(token);
+
+  if (token !== "null") {
     const decoded = jwt.verify(token, secret);
     return decoded.userId;
   }
@@ -16,7 +16,7 @@ const getUserId = (req, authRequired = true) => {
     throw new Error("Authentication required");
   }
 
-  return undefined;
+  return null;
 };
 
 module.exports = {