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

Merge remote-tracking branch 'upstream/release-7.5.0' into dev

Browse source
This commit is contained in:
Taranto 2021-01-05 10:54:56 +00:00
commit 9ed3bc50e4
36 changed files with 320 additions and 198 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 {
@ -276,7 +276,7 @@ const typeDefs = gql`
saveAccounts(accounts: JSONObject): JSONObject
resetAccounts(schemaVersion: Int): JSONObject
migrateConfigAndAccounts: JSONObject
revokeToken(token: String!): UserToken
# revokeToken(token: String!): UserToken
deleteBlacklistRow(cryptoCode: String!, address: String!): Blacklist
insertBlacklistRow(cryptoCode: String!, address: String!): Blacklist
}
@ -328,7 +328,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 }),
@ -350,7 +350,7 @@ const resolvers = {
blacklist.deleteFromBlacklist(cryptoCode, address),
insertBlacklistRow: (...[, { cryptoCode, address }]) =>
blacklist.insertIntoBlacklist(cryptoCode, address),
revokeToken: (...[, { token }]) => tokenManager.revokeToken(token)
// revokeToken: (...[, { token }]) => tokenManager.revokeToken(token)
}
}