From 70ff49ec4f01fda771185d106b2e8ba7e750fa92 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 11 Jul 2018 16:49:54 -0600 Subject: [PATCH] fix: missed users service --- src/core/server/app/handlers/auth/local.ts | 2 +- src/core/server/app/middleware/passport/oidc.ts | 2 +- src/core/server/services/users/index.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/server/app/handlers/auth/local.ts b/src/core/server/app/handlers/auth/local.ts index 656b3cb57..3bd3d2eb7 100644 --- a/src/core/server/app/handlers/auth/local.ts +++ b/src/core/server/app/handlers/auth/local.ts @@ -67,7 +67,7 @@ export const signup = ({ db }: SignupOptions): RequestHandler => async ( }; // Create the new user. - const user = await create(db, tenant.id, { + const user = await create(db, tenant, { email, username, displayName, diff --git a/src/core/server/app/middleware/passport/oidc.ts b/src/core/server/app/middleware/passport/oidc.ts index c6be6d6c6..4892cd918 100644 --- a/src/core/server/app/middleware/passport/oidc.ts +++ b/src/core/server/app/middleware/passport/oidc.ts @@ -63,7 +63,7 @@ export async function findOrCreateOIDCUser( // FIXME: implement rules. // Create the new user, as one didn't exist before! - user = await create(db, tenant.id, { + user = await create(db, tenant, { username: null, role: GQLUSER_ROLE.COMMENTER, email, diff --git a/src/core/server/services/users/index.ts b/src/core/server/services/users/index.ts index 08d18ab94..6906a7d3b 100644 --- a/src/core/server/services/users/index.ts +++ b/src/core/server/services/users/index.ts @@ -1,11 +1,12 @@ import { Db } from "mongodb"; +import { Tenant } from "talk-server/models/tenant"; import { createUser, CreateUserInput } from "talk-server/models/user"; export type CreateUser = CreateUserInput; -export async function create(db: Db, tenantID: string, input: CreateUser) { - const user = await createUser(db, tenantID, input); +export async function create(db: Db, tenant: Tenant, input: CreateUser) { + const user = await createUser(db, tenant.id, input); return user; }