MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename and move type check

This commit is contained in:
Adria Navarro 2023-01-13 13:36:35 +00:00
parent 50565dc226
commit c853d2c78e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/types/src/documents/global/user.ts
View File

@ -69,3 +69,7 @@ export interface AdminUser extends User {
global: boolean global: boolean
} }
} }
export function isUser(user: User | ThirdPartyUser): user is User {
return !!(user as User).roles
}

7
packages/worker/src/sdk/users/users.ts
View File

@ -31,6 +31,7 @@ import {
SearchUsersRequest, SearchUsersRequest,
User, User,
ThirdPartyUser, ThirdPartyUser,
isUser,
} from "@budibase/types" } from "@budibase/types"
import { sendEmail } from "../../utilities/email" import { sendEmail } from "../../utilities/email"
import { EmailTemplatePurpose } from "../../constants" import { EmailTemplatePurpose } from "../../constants"
@ -188,10 +189,6 @@ const validateUniqueUser = async (email: string, tenantId: string) => {
} }
} }
function instanceOfUser(user: User | ThirdPartyUser): user is User {
return !!(user as User).roles
}
export const save = async ( export const save = async (
user: User | ThirdPartyUser, user: User | ThirdPartyUser,
opts: SaveUserOpts = {} opts: SaveUserOpts = {}
@ -262,7 +259,7 @@ export const save = async (
} }
let appsToRemove: string[] = [] let appsToRemove: string[] = []
if (dbUser && instanceOfUser(user)) { if (dbUser && isUser(user)) {
const newRoles = Object.keys(user.roles) const newRoles = Object.keys(user.roles)
const existingRoles = Object.keys(dbUser.roles) const existingRoles = Object.keys(dbUser.roles)