CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-02 18:44:54 +12:00
Code Issues Projects Releases Wiki Activity

fixing tests

Browse source
This commit is contained in:
Martin McKeaveney 2022-09-14 14:22:53 +01:00
parent c4f424cb80
commit be396dc3c0
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/backend-core/src/tenancy/tenancy.ts
View file

@ -9,6 +9,7 @@ import {
getTenantIDFromAppID,
} from "../context"
import env from "../environment"
import { PlatformUser, PlatformUserByEmail } from "@budibase/types"
const TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants
const PLATFORM_INFO_DB = StaticDatabases.PLATFORM_INFO.name
@ -108,13 +109,15 @@ export const lookupTenantId = async (userId: string) => {
}
// lookup, could be email or userId, either will return a doc
export const getTenantUser = async (identifier: string) => {
export const getTenantUser = async (
identifier: string
): Promise<PlatformUser | null> => {
// use the view here and allow to find anyone regardless of casing
// Use lowercase to ensure email login is case insensitive
const response = await queryPlatformView(ViewName.PLATFORM_USERS_LOWERCASE, {
const response = queryPlatformView(ViewName.PLATFORM_USERS_LOWERCASE, {
keys: [identifier.toLowerCase()],
include_docs: true,
})
}) as Promise<PlatformUser>
return response
}

9
packages/types/src/documents/platform/users.ts
View file

@ -7,3 +7,12 @@ export interface PlatformUserByEmail extends Document {
tenantId: string
userId: string
}
/**
* doc id is userId
*/
export interface PlatformUserById extends Document {
tenantId: string
}
export type PlatformUser = PlatformUserByEmail | PlatformUserById

2
packages/worker/src/api/routes/global/tests/users.spec.ts
View file

@ -248,7 +248,7 @@ describe("/api/global/users", () => {
await api.users.saveUser(user)
user.email = user.email.toUpperCase()
await api.users.saveUser(user)
await api.users.saveUser(user, 400)
expect(events.user.created).toBeCalledTimes(1)
})

2
packages/worker/src/sdk/users/users.ts
View file

@ -164,7 +164,7 @@ const buildUser = async (
const validateUniqueUser = async (email: string, tenantId: string) => {
// check budibase users in other tenants
if (env.MULTI_TENANCY) {
const tenantUser = (await tenancy.getTenantUser(email)) as User | undefined
const tenantUser = await tenancy.getTenantUser(email)
if (tenantUser != null && tenantUser.tenantId !== tenantId) {
throw `Unavailable`
}