Merge pull request #22 from aayush-05/frontendFixes

Changes required for frontend

Author: vaibhavdaren

config/testVariables.js

@@ -47,8 +47,17 @@ module.exports = {
         }
         email
         phone
+        info {
+          about {
+            shortDescription
+            designation
+          }
+        }
         isAdmin
         isModerator
+        isBlocked
+        isRemoved
+        token
       }}`,
       })
       .set("Accept", "application/json");
@@ -62,10 +71,23 @@ module.exports = {
         email: "abc${userNo}@email.com"
         password: "password"
       ) {
+        _id
         name {
           firstName
           lastName
         }
+        email
+        phone
+        info {
+          about {
+            shortDescription
+            designation
+          }
+        }
+        isAdmin
+        isModerator
+        isBlocked
+        isRemoved
         token
       } }`,
       })

graphql/resolvers/auth.js

@@ -10,7 +10,7 @@ const {
 module.exports = {
   login: async (args) => {
     try {
-      const user = await User.findOne({ email: args.email });
+      const user = await User.findOne({ email: args.email }).lean();
       if (!user) {
         throw new Error(noUserError);
       }
@@ -20,7 +20,8 @@ module.exports = {
       }
       const token = jwt.sign(
         {
-          id: user.id,
+          id: user._id,
+          name: user.name,
         },
         `${process.env.JWT_SECRET}`,
         {
@@ -29,8 +30,7 @@ module.exports = {
         }
       );
       return {
-        _id: user._id,
-        name: user.name,
+        ...user,
         token: token,
       };
     } catch (err) {

graphql/resolvers/category.js

@@ -28,7 +28,7 @@ module.exports = {
     if (!req.isAuth) {
       throw new Error(authenticationError);
     }
-    if ((req.currentUser.isBlocked || req.currentUser.isRemoved)) {
+    if ((req.currentUser.isBlocked || req.currentUser.isBlocked)) {
       throw new Error(blockRemoveUserError);
     }
     try {
@@ -52,7 +52,7 @@ module.exports = {
     try {
       const category = await Category.findById(
         args.categoryFindInput._id
-      ).populate('topics', ['name', 'description', 'tags', 'isArchived', 'createdBy']);
+      ).populate('topics', ['name', 'description', 'tags', 'isArchived', 'createdBy', 'parentCategory', 'chats']);
       if (!category) {
         throw new Error(categoryRemovedError);
       }

graphql/resolvers/organization.js

@@ -39,7 +39,15 @@ module.exports = {
   getOrganization: async () => {
     try {
       const organization = await Organization.findOne().lean();
-      return organization;
+      if (organization == null) {
+        return {
+          exists: false,
+        };
+      }
+      return {
+        ...organization,
+        exists: true,
+      };
     } catch (err) {
       console.log(err);
       throw err;

graphql/resolvers/user.js

@@ -14,6 +14,7 @@ const {
   userBlockResult,
   userRemoveResult,
 } = require("../variables/resultMessages");
+const { login } = require("./auth");
 
 module.exports = {
   users: async (args, req) => {
@@ -24,7 +25,7 @@ module.exports = {
       if (req.currentUser.isAdmin) {
         const users = await User.find(
           { isRemoved: false },
-          "name email info isAdmin isModerator isActivated isRemoved"
+          "name email info isAdmin isModerator isBlocked isRemoved"
         );
         return users;
       } else {
@@ -77,7 +78,11 @@ module.exports = {
       const saveUser = await user.save();
       organization.totalUsers += 1;
       await organization.save();
-      return { ...saveUser._doc };
+      const loginResponse = await login({
+        email: args.userInput.email,
+        password: args.userInput.password
+      });
+      return loginResponse;
     } catch (err) {
       console.log(err);
       throw err;
@@ -127,7 +132,7 @@ module.exports = {
         if (user.isFirstAdmin) {
           throw new Error(firstAdminBlockError);
         }
-        user.isActivated = false;
+        user.isBlocked = true;
         await user.save();
         const organization = await Organization.findOne();
         organization.blockedUsers.push(user);

graphql/schema/index.js

@@ -37,7 +37,7 @@ type RootQuery {
 }
 
 type RootMutation {
-  createUser(userInput: userInput!): user!
+  createUser(userInput: userInput!): authData!
   updateUser(userInput: userInput!): user!
   blockUser(userFindInput: userFindInput!): resultData!
   removeUser(userFindInput: userFindInput!): resultData!

graphql/schema/organization.js

@@ -10,13 +10,14 @@ type organizationInfo {
 }
 
 type organization {
-  _id: String!
-  name: String!
-  description: organizationDescription!
-  contactInfo: organizationInfo!
-  isArchived: Boolean!
-  isUnderMaintenance: Boolean!
-  totalUsers: Int!
+  _id: String
+  name: String
+  description: organizationDescription
+  contactInfo: organizationInfo
+  isArchived: Boolean
+  isUnderMaintenance: Boolean
+  totalUsers: Int
+  exists: Boolean
 }
 
 input organizationDescriptionInput {

graphql/schema/user.js

@@ -32,7 +32,7 @@ type user {
   isFirstAdmin: Boolean!
   isAdmin: Boolean!
   isModerator: Boolean!
-  isActivated: Boolean!
+  isBlocked: Boolean!
   isRemoved: Boolean!
 }
 
@@ -76,6 +76,15 @@ input userFindInput {
 type authData {
   _id: String!
   name: userName!
+  email: String!
+  phone: String
+  socialMedia: userSocialMedia
+  info: userInfo!
+  isFirstAdmin: Boolean!
+  isAdmin: Boolean!
+  isModerator: Boolean!
+  isBlocked: Boolean!
+  isRemoved: Boolean!
   token: String!
 }
 `;

models/user.js

@@ -115,9 +115,9 @@ const userSchema = new Schema({
     type: Boolean,
     default: false,
   },
-  isActivated: {
+  isBlocked: {
     type: Boolean,
-    default: true,
+    default: false,
   },
   isRemoved: {
     type: Boolean,