diff --git a/src/graphql/connectors/connectors.js b/src/graphql/connectors/connectors.js index ed0e679d7a4458831f1e52b673017ffd2a040d0b..24f9492776e905d9aeafcc5e9316da6d102a91f7 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 0ba5f15f2b999610a919638547628c8453d9ae42..2ce414fc91a82f87b35016646a6329e1e8393e08 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 53a982caeb0e23860aa0b4ba87f297f85cc7356c..59bf27f93d69e403b0e0f6ebed1145fda9e728f1 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 454dabc24c384d6330983356271208051557a7f7..2b570c5b875645ee9ca16b7ca7afa5a9210fe18f 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