liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: core improvements + local fs provider + UI fixes

Browse Source
This commit is contained in:
NGPixel
2018-07-29 22:23:33 -04:00
parent 803d86ff63
commit 2817c72ec3
65 changed files with 482 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/graph/resolvers/user.js
View File

@@ -10,18 +10,18 @@ module.exports = {
},
UserQuery: {
async list(obj, args, context, info) {
return WIKI.db.users.query()
return WIKI.models.users.query()
.select('id', 'email', 'name', 'provider', 'role', 'createdAt', 'updatedAt')
},
async search(obj, args, context, info) {
return WIKI.db.users.query()
return WIKI.models.users.query()
.where('email', 'like', `%${args.query}%`)
.orWhere('name', 'like', `%${args.query}%`)
.limit(10)
.select('id', 'email', 'name', 'provider', 'role', 'createdAt', 'updatedAt')
},
async single(obj, args, context, info) {
let usr = await WIKI.db.users.query().findById(args.id)
let usr = await WIKI.models.users.query().findById(args.id)
usr.password = ''
usr.tfaSecret = ''
return usr
@@ -29,13 +29,13 @@ module.exports = {
},
UserMutation: {
create(obj, args) {
return WIKI.db.users.query().insertAndFetch(args)
return WIKI.models.users.query().insertAndFetch(args)
},
delete(obj, args) {
return WIKI.db.users.query().deleteById(args.id)
return WIKI.models.users.query().deleteById(args.id)
},
update(obj, args) {
return WIKI.db.users.query().patch({
return WIKI.models.users.query().patch({
email: args.email,
name: args.name,
provider: args.provider,