Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️
PHP attendize-alternativedoor-managementevent-check-inevent-managementevent-registrationevent-ticketingeventbrite-alternativeeventslaravelopen-sourcephpreactself-hostedsell-ticketssell-tickets-onlineticket-sellingticketing-systemtickettailor-alternativetito-alternative
Fix multi-account login
Dave Earleyee4371125f87
diff --git a/backend/app/Http/Actions/Auth/BaseAuthAction.php b/backend/app/Http/Actions/Auth/BaseAuthAction.phpindex be2a23cf1..d11699a1e 100644--- a/backend/app/Http/Actions/Auth/BaseAuthAction.php+++ b/backend/app/Http/Actions/Auth/BaseAuthAction.php@@ -4,7 +4,7 @@ namespace HiEvents\Http\Actions\Auth;use HiEvents\Http\Actions\BaseAction;use HiEvents\Resources\Auth\AuthenticatedResponseResource;-use HiEvents\Services\Handlers\Auth\DTO\AuthenicatedResponseDTO;+use HiEvents\Services\Handlers\Auth\DTO\AuthenticatedResponseDTO;use Illuminate\Http\JsonResponse;use Illuminate\Http\Response;use Illuminate\Support\Collection;@@ -23,8 +23,12 @@ abstract class BaseAuthAction extends BaseAction);}- protected function addTokenToResponse(JsonResponse|Response $response, string $token): JsonResponse+ protected function addTokenToResponse(JsonResponse|Response $response, ?string $token): JsonResponse{+ if (!$token) {+ return $response;+ }+$response = $response->withCookie($this->getAuthCookie($token));$response->header('X-Auth-Token', $token);@@ -37,7 +41,7 @@ abstract class BaseAuthAction extends BaseAction$user = $this->getAuthenticatedUser();return $this->addTokenToResponse(- response: $this->jsonResponse(new AuthenticatedResponseResource(new AuthenicatedResponseDTO(+ response: $this->jsonResponse(new AuthenticatedResponseResource(new AuthenticatedResponseDTO(token: $token,expiresIn: auth()->factory()->getTTL() * 60,accounts: $accounts,diff --git a/backend/app/Resources/Auth/AuthenticatedResponseResource.php b/backend/app/Resources/Auth/AuthenticatedResponseResource.phpindex 480b65082..f1603441b 100644--- a/backend/app/Resources/Auth/AuthenticatedResponseResource.php+++ b/backend/app/Resources/Auth/AuthenticatedResponseResource.php@@ -4,11 +4,11 @@ namespace HiEvents\Resources\Auth;use HiEvents\Resources\Account\AccountResource;use HiEvents\Resources\User\UserResource;-use HiEvents\Services\Handlers\Auth\DTO\AuthenicatedResponseDTO;+use HiEvents\Services\Handlers\Auth\DTO\AuthenticatedResponseDTO;use Illuminate\Http\Resources\Json\JsonResource;/**- * @mixin AuthenicatedResponseDTO+ * @mixin AuthenticatedResponseDTO*/class AuthenticatedResponseResource extends JsonResource{diff --git a/backend/app/Services/Handlers/Auth/DTO/AuthenicatedResponseDTO.php b/backend/app/Services/Handlers/Auth/DTO/AuthenticatedResponseDTO.phpsimilarity index 89%rename from backend/app/Services/Handlers/Auth/DTO/AuthenicatedResponseDTO.phprename to backend/app/Services/Handlers/Auth/DTO/AuthenticatedResponseDTO.phpindex d3d240539..45987890c 100644--- a/backend/app/Services/Handlers/Auth/DTO/AuthenicatedResponseDTO.php+++ b/backend/app/Services/Handlers/Auth/DTO/AuthenticatedResponseDTO.php@@ -6,7 +6,7 @@ use HiEvents\DataTransferObjects\BaseDTO;use HiEvents\DomainObjects\UserDomainObject;use Illuminate\Support\Collection;-class AuthenicatedResponseDTO extends BaseDTO+class AuthenticatedResponseDTO extends BaseDTO{public function __construct(public ?string $token,diff --git a/frontend/src/components/routes/auth/Login/index.tsx b/frontend/src/components/routes/auth/Login/index.tsxindex 2827c5ea9..c193369d5 100644--- a/frontend/src/components/routes/auth/Login/index.tsx+++ b/frontend/src/components/routes/auth/Login/index.tsx@@ -22,7 +22,7 @@ const Login = () => {});const [showChooseAccount, setShowChooseAccount] = useState(false);- const {mutate: loginUser, isLoading, data} = useMutation({+ const {mutate: loginUser, isPending, data} = useMutation({mutationFn: (userData: LoginData) => authClient.login(userData),onSuccess: (response: LoginResponse) => {@@ -62,8 +62,8 @@ const Login = () => {{t`Forgot password?`}</NavLink></p>- <Button type="submit" fullWidth loading={isLoading} disabled={isLoading}>- {isLoading ? t`Logging in` : t`Log in`}+ <Button type="submit" fullWidth loading={isPending} disabled={isPending}>+ {isPending ? t`Logging in` : t`Log in`}</Button></form></Card>