Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Minor improvements

Blue Mousee34c34fcf956
diff --git a/backend/apps/cloud/src/user/user.controller.ts b/backend/apps/cloud/src/user/user.controller.ts
index 21329fe68..2e644bfdf 100644
--- a/backend/apps/cloud/src/user/user.controller.ts
+++ b/backend/apps/cloud/src/user/user.controller.ts
@@ -9,6 +9,7 @@ import {
Delete,
HttpCode,
BadRequestException,
+ ForbiddenException,
UseGuards,
ConflictException,
Headers,
@@ -786,6 +787,12 @@ export class UserController {
async completeOnboarding(@CurrentUserId() userId: string): Promise<void> {
this.logger.log({ userId }, 'POST /user/onboarding/complete')
+ const user = await this.userService.findOne({ where: { id: userId } })
+
+ if (!user?.isActive) {
+ throw new ForbiddenException('Please, verify your email address first')
+ }
+
await this.userService.update(userId, {
onboardingStep: OnboardingStep.COMPLETED,
hasCompletedOnboarding: true,
diff --git a/web/app/pages/Onboarding/Onboarding.tsx b/web/app/pages/Onboarding/Onboarding.tsx
index 232483781..1ed7e47da 100644
--- a/web/app/pages/Onboarding/Onboarding.tsx
+++ b/web/app/pages/Onboarding/Onboarding.tsx
@@ -554,8 +554,23 @@ const Onboarding = () => {
setSelectedLanguage(lng)
}
- const handleLanguageConfirm = () => {
+ const handleLanguageConfirm = async () => {
if (selectedLanguage !== i18n.language) {
+ const nextStep = STEPS[currentStepIndex + 1]
+ if (nextStep) {
+ const formData = new FormData()
+ formData.set('intent', 'update-step')
+ formData.set('step', nextStep)
+ try {
+ await fetch(routes.onboarding, {
+ method: 'post',
+ body: formData,
+ credentials: 'same-origin',
+ })
+ } catch {
+ // Best effort: continue with language change even if this fails.
+ }
+ }
changeLanguage(selectedLanguage)
} else {
goNext()
@@ -1159,7 +1174,13 @@ const Onboarding = () => {
onClick={async () => {
setIsCheckingVerification(true)
try {
- await loadUser()
+ const loadedUser = await loadUser()
+ if (!loadedUser?.isActive) {
+ toast.error(
+ 'Please, verify your email address first',
+ )
+ return
+ }
handleCompleteOnboarding(false)
} finally {
setIsCheckingVerification(false)
diff --git a/web/app/providers/AuthProvider.tsx b/web/app/providers/AuthProvider.tsx
index af7ef35e7..5520f03cb 100644
--- a/web/app/providers/AuthProvider.tsx
+++ b/web/app/providers/AuthProvider.tsx
@@ -21,7 +21,7 @@ interface AuthContextType {
mergeUser: (newUser: Partial<User>) => void
setTotalMonthlyEvents: (totalMonthlyEvents: number) => void
setIsAuthenticated: (isAuthenticated: boolean) => void
- loadUser: (signal?: AbortSignal) => Promise<void>
+ loadUser: (signal?: AbortSignal) => Promise<User | null>
}
const AuthContext = createContext<AuthContextType | undefined>(undefined)
@@ -110,12 +110,14 @@ export const AuthProvider = ({
setUserState(user)
setTotalMonthlyEvents(totalMonthlyEvents)
setIsAuthenticated(true)
+ return user
} catch (error) {
if (error instanceof Error && error.name === 'AbortError') {
- return
+ return null
}
logout()
setIsAuthenticated(false)
+ return null
}
},
[logout, authMe],