fix(ui): unverified user (#122)

smarcet · smarcet · commit 0508f6021423 · 2026-04-16T10:41:39.000-03:00
* fix(ui): unverified user

* fix(auth): null check before calling getId() in verifyEmail

Split combined null/inactive check into separate guards to prevent
"Call to a member function getId() on null" when no user is found
for the verification token.
diff --git a/app/Services/Auth/UserService.php b/app/Services/Auth/UserService.php
@@ -225,7 +225,12 @@ public function verifyEmail(string $token): User
         return $this->tx_service->transaction(function () use ($token) {
             $user = $this->user_repository->getByVerificationEmailToken($token);
 
-            if (is_null($user) || !$user->isActive()) {
+            if (is_null($user)) {
+                Log::warning("UserService::verifyEmail no user found for token");
+                throw new EntityNotFoundException();
+            }
+
+            if (!$user->isActive()) {
                 Log::warning(sprintf("UserService::verifyEmail user with id %s is not active", $user->getId()));
                 throw new EntityNotFoundException();
             }
diff --git a/resources/js/login/login.js b/resources/js/login/login.js
@@ -617,7 +617,7 @@ class LoginPage extends React.Component {
             }, function () {
                 //Once the state is updated, it's now possible to trigger emitOtpAction.
                 //No need to wait for the component to update.
-                if (!response.has_password_set) {
+                if (!response.has_password_set && response.is_verified !== false) {
                     this.emitOtpAction();
                 }
             });

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ class LoginPage extends React.Component {`
`617`	`617`	`}, function () {`
`618`	`618`	`//Once the state is updated, it's now possible to trigger emitOtpAction.`
`619`	`619`	`//No need to wait for the component to update.`
`620`		`- if (!response.has_password_set) {`
	`620`	`+ if (!response.has_password_set && response.is_verified !== false) {`
`621`	`621`	`this.emitOtpAction();`
`622`	`622`	`}`
`623`	`623`	`});`