mirror of
https://github.com/strapi/strapi.git
synced 2025-12-24 05:34:33 +00:00
Merge branch 'master' into mongo-docs-upgrade
This commit is contained in:
commit
a894acd004
@ -6,7 +6,7 @@ module.exports = {
|
||||
},
|
||||
definition: `
|
||||
type UsersPermissionsMe {
|
||||
_id: ID!
|
||||
id: ID!
|
||||
username: String!
|
||||
email: String!
|
||||
confirmed: Boolean
|
||||
@ -15,7 +15,7 @@ module.exports = {
|
||||
}
|
||||
|
||||
type UsersPermissionsMeRole {
|
||||
_id: ID!
|
||||
id: ID!
|
||||
name: String!
|
||||
description: String
|
||||
type: String
|
||||
@ -25,6 +25,11 @@ module.exports = {
|
||||
me: UsersPermissionsMe
|
||||
`,
|
||||
resolver: {
|
||||
UsersPermissionsMe: {
|
||||
id(obj) {
|
||||
return obj.id || obj._id;
|
||||
},
|
||||
},
|
||||
Query: {
|
||||
me: {
|
||||
resolverOf: 'User.me',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user