fix: server fixes

This commit is contained in:
Wyatt Johnson
2018-09-17 17:16:10 -06:00
parent 5bf6161e46
commit 9044fc2400
4 changed files with 3 additions and 5 deletions
@@ -3,7 +3,6 @@ import Context from "talk-server/graph/tenant/context";
import { retrieveManyUsers, User } from "talk-server/models/user";
export default (ctx: Context) => ({
me: ctx.user,
user: new DataLoader<string, User | null>(ids =>
retrieveManyUsers(ctx.mongo, ctx.tenant.id, ids)
),
@@ -5,7 +5,7 @@ const Query: GQLQueryTypeResolver<void> = {
comment: (source, { id }, ctx) =>
id ? ctx.loaders.Comments.comment.load(id) : null,
settings: (source, args, ctx) => ctx.tenant,
me: (source, args, ctx) => ctx.loaders.Users.me,
me: (source, args, ctx) => ctx.user,
};
export default Query;
@@ -2,8 +2,7 @@ import { GQLUserTypeResolver } from "talk-server/graph/tenant/schema/__generated
import { User } from "talk-server/models/User";
const User: GQLUserTypeResolver<User> = {
comments: (_, input, ctx) =>
ctx.user ? ctx.loaders.Comments.forUser(ctx.user.id, input) : [],
comments: (user, input, ctx) => ctx.loaders.Comments.forUser(user.id, input),
};
export default User;
@@ -554,7 +554,7 @@ type User {
first: Int = 10
orderBy: COMMENT_SORT = CREATED_AT_DESC
after: Cursor
): CommentsConnection!
): CommentsConnection! @auth(roles: [ADMIN, MODERATOR], userIDField: "id")
}
################################################################################