lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: small fixes and release prep

Browse source
This commit is contained in:
Taranto 2020-12-24 13:29:32 +00:00 • committed by Josh Harvey
parent 5823485ab7
commit 0ad1ba2f77
20 changed files with 195 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/new-admin/graphql/schema.js
View file

@ -10,7 +10,7 @@ const customers = require('../../customers')
const { machineAction } = require('../machines')
const logs = require('../../logs')
const settingsLoader = require('../../new-settings-loader')
const tokenManager = require('../../token-manager')
// const tokenManager = require('../../token-manager')
const blacklist = require('../../blacklist')
const machineEventsByIdBatch = require("../../postgresql_interface").machineEventsByIdBatch
@ -254,7 +254,7 @@ const typeDefs = gql`
accounts: JSONObject
config: JSONObject
blacklist: [Blacklist]
userTokens: [UserToken]
# userTokens: [UserToken]
}
enum MachineAction {
@ -273,7 +273,7 @@ const typeDefs = gql`
saveConfig(config: JSONObject): JSONObject
createPairingTotem(name: String!): String
saveAccounts(accounts: JSONObject): JSONObject
revokeToken(token: String!): UserToken
# revokeToken(token: String!): UserToken
deleteBlacklistRow(cryptoCode: String!, address: String!): Blacklist
insertBlacklistRow(cryptoCode: String!, address: String!): Blacklist
}
@ -325,7 +325,7 @@ const resolvers = {
config: () => settingsLoader.loadLatestConfigOrNone(),
accounts: () => settingsLoader.loadAccounts(),
blacklist: () => blacklist.getBlacklist(),
userTokens: () => tokenManager.getTokenList()
// userTokens: () => tokenManager.getTokenList()
},
Mutation: {
machineAction: (...[, { deviceId, action, cassette1, cassette2, newName }]) => machineAction({ deviceId, action, cassette1, cassette2, newName }),
@ -344,7 +344,7 @@ const resolvers = {
blacklist.deleteFromBlacklist(cryptoCode, address),
insertBlacklistRow: (...[, { cryptoCode, address }]) =>
blacklist.insertIntoBlacklist(cryptoCode, address),
revokeToken: (...[, { token }]) => tokenManager.revokeToken(token)
// revokeToken: (...[, { token }]) => tokenManager.revokeToken(token)
}
}