Merge pull request #173 from HiEventsDev/develop

Fix multi-account login

Author: daveearley

backend/app/Http/Actions/Auth/BaseAuthAction.php

@@ -4,7 +4,7 @@
 
 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 @@ protected function getAuthCookie(string $token): SymfonyCookie
         );
     }
 
-    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 @@ protected function respondWithToken(?string $token, Collection $accounts): JsonR
         $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,

backend/app/Resources/Auth/AuthenticatedResponseResource.php

@@ -4,11 +4,11 @@
 
 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
 {

…ers/Auth/DTO/AuthenicatedResponseDTO.php …rs/Auth/DTO/AuthenticatedResponseDTO.phpbackend/app/Services/Handlers/Auth/DTO/AuthenicatedResponseDTO.php renamed to backend/app/Services/Handlers/Auth/DTO/AuthenticatedResponseDTO.php backend/app/Services/Handlers/Auth/DTO/AuthenicatedResponseDTO.php renamed to backend/app/Services/Handlers/Auth/DTO/AuthenticatedResponseDTO.php

@@ -6,7 +6,7 @@
 use HiEvents\DomainObjects\UserDomainObject;
 use Illuminate\Support\Collection;
 
-class AuthenicatedResponseDTO extends BaseDTO
+class AuthenticatedResponseDTO extends BaseDTO
 {
     public function __construct(
         public ?string          $token,

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>