From 92cc9975e58f744a2d7491b99ce29230d4e4ce9e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 31 Oct 2018 19:52:12 +0100 Subject: [PATCH] Fix #48 --- AABrowserAPI/TeamSetup.js | 24 ++++++++++++------------ server.js | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AABrowserAPI/TeamSetup.js b/AABrowserAPI/TeamSetup.js index f9051bfdc..fb251677d 100644 --- a/AABrowserAPI/TeamSetup.js +++ b/AABrowserAPI/TeamSetup.js @@ -18,7 +18,7 @@ storage.initialize(undefined, pServerConfig); } - function newTeam(pTeamCodeName, pTeamDisplayName, pUserName, pBotCodeName, pBotDisplayName, pAuthId, callBackFunction) { + function newTeam(pTeamCodeName, pTeamDisplayName, pUserName, pBotCodeName, pBotDisplayName, pUserId, callBackFunction) { try { @@ -524,8 +524,8 @@ const graphqlClient = require('graphql-client') const usersModuleAPI = graphqlClient({ - //url: 'http://localhost:4000/graphql' - url: 'https://users-api.advancedalgos.net/graphql', + url: 'http://localhost:4000/graphql' + //url: 'https://users-api.advancedalgos.net/graphql', //headers: { // Authorization: 'Bearer ' + authToken //} @@ -533,13 +533,13 @@ let variables = { - authId: pAuthId, + userId: pUserId, sessionToken: pSessionToken }; usersModuleAPI.query(` - mutation($authId: String, $sessionToken: String){ - updateSessionToken(authId: $authId, sessionToken: $sessionToken){ + mutation($userId: String, $sessionToken: String){ + updateSessionToken(userId: $userId, sessionToken: $sessionToken){ id alias } @@ -660,7 +660,7 @@ } } - function deleteTeam(pTeamCodeName, pUserName, pBotCodeName, pAuthId, callBackFunction) { + function deleteTeam(pTeamCodeName, pUserName, pBotCodeName, pUserId, callBackFunction) { try { @@ -1017,8 +1017,8 @@ const graphqlClient = require('graphql-client') const usersModuleAPI = graphqlClient({ - //url: 'http://localhost:4000/graphql' - url: 'https://users-api.advancedalgos.net/graphql', + url: 'http://localhost:4000/graphql' + //url: 'https://users-api.advancedalgos.net/graphql', //headers: { // Authorization: 'Bearer ' + authToken //} @@ -1026,13 +1026,13 @@ let variables = { - authId: pAuthId, + userId: pUserId, sessionToken: pSessionToken }; usersModuleAPI.query(` - mutation($authId: String, $sessionToken: String){ - updateSessionToken(authId: $authId, sessionToken: $sessionToken){ + mutation($userId: String, $sessionToken: String){ + updateSessionToken(userId: $userId, sessionToken: $sessionToken){ id alias } diff --git a/server.js b/server.js index c7c041cde..a99e6dbc6 100644 --- a/server.js +++ b/server.js @@ -590,9 +590,9 @@ function onBrowserRequest(request, response) { let userName = decodeURI(requestParameters[5]); let botCodeName = decodeURI(requestParameters[6]); let botDisplayName = decodeURI(requestParameters[7]); - let authId = decodeURI(requestParameters[8]); + let userId = decodeURI(requestParameters[8]); - teamSetup.newTeam(devTeamCodeName, devTeamDisplayName, userName, botCodeName, botDisplayName, authId, onSetupFinished); + teamSetup.newTeam(devTeamCodeName, devTeamDisplayName, userName, botCodeName, botDisplayName, userId, onSetupFinished); function onSetupFinished(err) { @@ -619,9 +619,9 @@ function onBrowserRequest(request, response) { let devTeamCodeName = decodeURI(requestParameters[3]); let userName = decodeURI(requestParameters[4]); let botCodeName = decodeURI(requestParameters[5]); - let authId = decodeURI(requestParameters[6]); + let userId = decodeURI(requestParameters[6]); - teamSetup.deleteTeam(devTeamCodeName, userName, botCodeName, authId, onSetupFinished); + teamSetup.deleteTeam(devTeamCodeName, userName, botCodeName, userId, onSetupFinished); function onSetupFinished(err) {