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

Merge branch 'master' into feature/js-logging

This commit is contained in:
Michael Drury 2025-01-21 12:02:09 +00:00 committed by GitHub
parent c5e4edcc97 655332715d
commit 866677a3fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/pages/builder/auth/reset.svelte
View File

@ -30,10 +30,16 @@
try { try {
loading = true loading = true
if (forceResetPassword) { if (forceResetPassword) {
const email = $auth.user.email
const tenantId = $auth.user.tenantId
await auth.updateSelf({ await auth.updateSelf({
password, password,
forceResetPassword: false, forceResetPassword: false,
}) })
if (!$auth.user) {
// Update self will clear the platform user, so need to login
await auth.login(email, password, tenantId)
}
$goto("../portal/") $goto("../portal/")
} else { } else {
await auth.resetPassword(password, resetCode) await auth.resetPassword(password, resetCode)

4
packages/builder/src/stores/portal/auth.ts
View File

@ -121,8 +121,8 @@ class AuthStore extends BudiStore<PortalAuthStore> {
} }
} }
async login(username: string, password: string) { async login(username: string, password: string, targetTenantId?: string) {
const tenantId = get(this.store).tenantId const tenantId = targetTenantId || get(this.store).tenantId
await API.logIn(tenantId, username, password) await API.logIn(tenantId, username, password)
await this.getSelf() await this.getSelf()
} }