Merge branch 'master' into BUDI-8281/update-view-column-ui

This commit is contained in:
Adria Navarro 2024-05-29 17:41:13 +02:00 committed by GitHub
commit a289ef31d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 610 additions and 153 deletions

@ -1 +1 @@
Subproject commit c167c331ff9b8161fc18e2ecbaaf1ea5815ba964
Subproject commit 39acfff42a063e5a8a7d58d36721ec3103e16348

View File

@ -32,8 +32,14 @@
onboarding = true
try {
const { password, firstName, lastName } = formData
await users.acceptInvite(inviteCode, password, firstName, lastName)
const user = await users.acceptInvite(
inviteCode,
password,
firstName,
lastName
)
notifications.success("Invitation accepted successfully")
auth.setOrg(user.tenantId)
await login()
} catch (error) {
notifications.error(error.message)
@ -66,7 +72,7 @@
notifications.success("Logged in successfully")
$goto("../portal")
} catch (err) {
notifications.error(err.message ? err.message : "Invalid credentials") //not likely, considering.
notifications.error(err.message ? err.message : "Something went wrong")
}
}
@ -141,12 +147,19 @@
password: e.detail,
}
}}
validateOn="blur"
validate={() => {
let fieldError = {}
fieldError["password"] = !formData.password
? "Please enter a password"
: undefined
function validatePassword() {
if (!formData.password) {
return "Please enter a password"
} else if (formData.password.length < 8) {
return "Please enter at least 8 characters"
}
return undefined
}
fieldError["password"] = validatePassword()
fieldError["confirmationPassword"] =
!passwordsMatch(

View File

@ -92,6 +92,7 @@ export interface AcceptUserInviteResponse {
_id: string
_rev: string
email: string
tenantId: string
}
export interface SyncUserRequest {

View File

@ -35,6 +35,7 @@ import {
} from "@budibase/backend-core"
import { checkAnyUserExists } from "../../../utilities/users"
import { isEmailConfigured } from "../../../utilities/email"
import { BpmStatusKey, BpmStatusValue } from "@budibase/shared-core"
const MAX_USERS_UPLOAD_LIMIT = 1000
@ -444,10 +445,16 @@ export const inviteAccept = async (
await cache.invite.deleteCode(inviteCode)
// make sure onboarding flow is cleared
ctx.cookies.set(BpmStatusKey.ONBOARDING, BpmStatusValue.COMPLETED, {
expires: new Date(0),
})
ctx.body = {
_id: user._id!,
_rev: user._rev!,
email: user.email,
tenantId: user.tenantId,
}
}
)

View File

@ -105,11 +105,6 @@ const NO_TENANCY_ENDPOINTS = [
route: "/api/admin/auth/oidc/callback",
method: "GET",
},
// tenant is determined from code in redis
{
route: "/api/global/users/invite/accept",
method: "POST",
},
// global user search - no tenancy
// :id is user id
// TODO: this should really be `/api/system/users/:id`
@ -117,6 +112,15 @@ const NO_TENANCY_ENDPOINTS = [
route: "/api/global/users/tenant/:id",
method: "GET",
},
// tenant is determined from code in redis
{
route: "/api/global/users/invite/accept",
method: "POST",
},
{
route: "/api/global/users/invite/:code",
method: "GET",
},
]
// most public endpoints are gets, but some are posts

716
yarn.lock

File diff suppressed because it is too large Load Diff