From 6c18bcf77d3f782e086d7f1caf7c90fed7429420 Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@gmail.com>
Date: Thu, 8 Mar 2018 17:23:05 +0100
Subject: [PATCH] Nazification

---
 src/graphql/connectors/connectors.js | 20 ++++++++++----------
 src/graphql/resolvers.js             |  3 +--
 src/graphql/typeDefs/actions.js      |  2 +-
 src/graphql/typeDefs/objects.js      |  4 ++--
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/graphql/connectors/connectors.js b/src/graphql/connectors/connectors.js
index ed0e679..24f9492 100644
--- a/src/graphql/connectors/connectors.js
+++ b/src/graphql/connectors/connectors.js
@@ -267,7 +267,7 @@ export async function getAllVisibleGroups(user){
 export async function isMember(user, groupUID){
     let member_list = await getGroupMemberUsers(user, groupUID);
     return member_list && member_list.indexOf(groupUID) != -1;
-};
+}
 
 /**
  * @summary Attribue un UID qui n'a pas encore été utilisé à un groupe
@@ -485,7 +485,7 @@ export async function getMetaGroupMembersCallback(user, metaGroupUID){
             .innerJoin('meta_group_membership', 'groups.uid', 'meta_group_membership.member_uid')
             .where('meta_group_membership.union_uid', '=', metaGroupUID);
     };
-};
+}
 
 /**
  * @summary Renvoie un callback qui génère tous les membres admin d'un meta-groupe.
@@ -502,7 +502,7 @@ export async function getMetaGroupAdminMembersCallback(user, metaGroupUID){
             .where('meta_group_membership.union_uid', '=', metaGroupUID)
             .where('meta_group_membership.status', '=', 'admin');
     };
-};
+}
 
 /**
  * @summary Renvoie les membres d'un groupe quelquonque.
@@ -521,7 +521,7 @@ export async function getGroupMemberUsers(user, GroupUID){
     default:
         return undefined;
     }
-};
+}
 
 /**
  * @summary Renvoie les membres d'un meta groupe.
@@ -534,10 +534,10 @@ export async function getGroupMemberUsers(user, GroupUID){
 export async function getMetaGroupMemberUsers(user, metaGroupUID){
     let member_group_list = await getMetaGroupMembersCallback(user, metaGroupUID).then(cb => cb(knex));
     let members = [];
-    for(memberGroup of await member_group_list){
+    for(let memberGroup of await member_group_list){
         members = members.concat(getGroupMemberUsers(user, metaGroupUID));
     }
-};
+}
 
 
 /*
@@ -553,9 +553,9 @@ function smartUserObject(user, uid){
 
     let attributeDictionnary = {
         givenName : "givenName"
-    }
+    };
 
-    for(attribute in attributeDictionnary){
+    for(let attribute in attributeDictionnary){
         this[attribute] = function(){
             return new Promise((resolve, reject) => {
                 resolutionAlias[attributeDictionnary[attribute]] = resolve;
@@ -565,8 +565,8 @@ function smartUserObject(user, uid){
 
     this.resolve = async function(){
         let userObject = await renseignerSurUtilisateur(this.user, this.uid);
-        for(attribute in this.resolution){
+        for(let attribute in this.resolution){
             this.resolution[attribute](userObject.attribute);
         }
-    }
+    };
 }
\ No newline at end of file
diff --git a/src/graphql/resolvers.js b/src/graphql/resolvers.js
index 0ba5f15..2ce414f 100644
--- a/src/graphql/resolvers.js
+++ b/src/graphql/resolvers.js
@@ -25,8 +25,7 @@ export const resolvers = {
         },
 
         asMember: async function (obj, args, context){
-            if(await connectors.isMember(context.user, args.groupUID) 
-                || connectors.hasAdminRights(context.user, args.groupUID))
+            if(await connectors.isMember(context.user, args.groupUID) || connectors.hasAdminRights(context.user, args.groupUID))
                 return {groupUID : args.groupUID};
             else
                 throw "You do not have member rights over this group";
diff --git a/src/graphql/typeDefs/actions.js b/src/graphql/typeDefs/actions.js
index 53a982c..59bf27f 100644
--- a/src/graphql/typeDefs/actions.js
+++ b/src/graphql/typeDefs/actions.js
@@ -133,4 +133,4 @@ const subQueries = `
 `;
 
 const actionDefs = [RootTypes, subQueries ];
-export default typeDefs;
+export default actionDefs;
diff --git a/src/graphql/typeDefs/objects.js b/src/graphql/typeDefs/objects.js
index 454dabc..2b570c5 100644
--- a/src/graphql/typeDefs/objects.js
+++ b/src/graphql/typeDefs/objects.js
@@ -183,5 +183,5 @@ const Requests = `
 
 `;
 
-const objectDefs = [Group, User, Message, Post, Announcement, Event, subMutations, Requests];
-export default typeDefs;
\ No newline at end of file
+const objectDefs = [Group, User, Message, Post, Announcement, Event, Requests];
+export default objectDefs;
\ No newline at end of file
-- 
GitLab