From 43cff60e9532f130816d8a20c9c703f7fd0f30b4 Mon Sep 17 00:00:00 2001 From: Matias Date: Wed, 27 Mar 2019 22:18:58 +0100 Subject: [PATCH 1/2] Changing authorization on the update execution --- .../schema/mutations/UpdateExecutionSummary.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/server/src/schema/mutations/UpdateExecutionSummary.js b/server/src/schema/mutations/UpdateExecutionSummary.js index de5729f6d..876f2b07d 100644 --- a/server/src/schema/mutations/UpdateExecutionSummary.js +++ b/server/src/schema/mutations/UpdateExecutionSummary.js @@ -8,8 +8,6 @@ import { import { OperationsError } from '../../errors' import { Clone } from '../../models' import logger from '../../config/logger' -import teamQuery from '../../graphQLCalls/teamQuery' -import cloneDetails from '../cloneDetails' import { isDefined } from '../../config/utils' const args = { @@ -25,15 +23,20 @@ const args = { } const resolve = async (parent, - { id, summaryDate, buyAverage, sellAverage, marketRate, combinedProfitsA, - combinedProfitsB, assetA, assetB - }, context) => { + { id, summaryDate, buyAverage, sellAverage, marketRate, combinedProfitsA, + combinedProfitsB, assetA, assetB + }, context) => { logger.debug('UpdateExecutionSummary -> Entering Function.') if (!context.userId) { throw new AuthentificationError() } + if (!(context.userId === process.env.AACLOUD_ID)) { + logger.debug('User %s is not authorized to manage team %s.', authId, team.slug) + throw new AutorizationError() + } + try { let clone = await Clone.findOne({ _id: id, @@ -44,10 +47,6 @@ const resolve = async (parent, return 'Clone not found.' } - let allUserBotsResponse = await teamQuery(context.authorization, clone.botId) - let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node - clone = cloneDetails(bot, clone) - const query = { _id: id } const options = { new: true } const update = { From 8f6c7d7cf1dcd067ab7dea18aba8bb9e7b159c09 Mon Sep 17 00:00:00 2001 From: Matias Date: Wed, 27 Mar 2019 23:03:02 +0100 Subject: [PATCH 2/2] Extraction Type --- server/src/enums/BotTypes.js | 4 ++-- server/src/kubernetes/createClone.js | 4 ++-- server/src/schema/cloneDetails.js | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server/src/enums/BotTypes.js b/server/src/enums/BotTypes.js index 5c716da7d..02145b032 100644 --- a/server/src/enums/BotTypes.js +++ b/server/src/enums/BotTypes.js @@ -1,11 +1,11 @@ export const Trading = 'Trading' export const Indicator = 'Indicator' -export const Sensor = 'Extraction' +export const Extraction = 'Extraction' export const BotTypesEnum = [ Trading, Indicator, - Sensor + Extraction ] export default BotTypesEnum diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js index cf5927177..ccab8aa6d 100644 --- a/server/src/kubernetes/createClone.js +++ b/server/src/kubernetes/createClone.js @@ -4,7 +4,7 @@ import { KubernateError } from '../errors' import { Client, config } from 'kubernetes-client' import deploymentManifest from '../config/clone-deployment.json' import { BACKTEST, COMPETITION, LIVE, NO_TIME } from '../enums/CloneMode' -import { Trading, Indicator, Sensor } from '../enums/BotTypes' +import { Trading, Indicator, Extraction } from '../enums/BotTypes' const createClone = async (clone) => { try { @@ -130,7 +130,7 @@ const createClone = async (clone) => { 'value': clone.keyId }) } - } else if (clone.botType === Indicator || clone.botType === Sensor) { + } else if (clone.botType === Indicator || clone.botType === Extraction) { if (clone.mode === NO_TIME) { if (!clone.resumeExecution) { env.push({ diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js index d0dff70b3..1d8acc9f6 100644 --- a/server/src/schema/cloneDetails.js +++ b/server/src/schema/cloneDetails.js @@ -10,7 +10,6 @@ const cloneDetails = (selectedBot, clone) => { clone.teamSlug = selectedBot.team.slug clone.teamAvatar = selectedBot.team.profile.avatar clone.userLoggedIn = selectedBot.team.members[0].member.alias - clone.botType = selectedBot.kind } return clone }