Change LoginController to be cleaner

- Remove separate LoginPageController
- Only attempt login on POST request
- Show Login page for other request

Author: Potherca

src/Controller/LoginController.php

@@ -12,37 +12,46 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
         $postBody = $request->getParsedBody();
         $response = $this->getResponse();
 
-        // var_dump($_SESSION);
-        if (isset($_SESSION['userid'])) {
-          $user = $_SESSION['userid'];
-		  if ($request->getQueryParams()['returnUrl']) {
-			$response = $response->withStatus(302, "Redirecting");
-			$response = $response->withHeader("Location", $request->getQueryParams()['returnUrl']);
-			return $response;
-		  }
-          $response->getBody()->write("<h1>Already logged in as $user</h1>");
-        } else if (
-			($postBody['username'] == $_ENV['USERNAME'] && $postBody['password'] == $_ENV['PASSWORD']) ||
-			($postBody['username'] == $_SERVER['USERNAME'] && $postBody['password'] == $_SERVER['PASSWORD'])
-		) {
-          $user = $postBody['username'];
-          $_SESSION['userid'] =  $user;
-		  if ($request->getQueryParams()['returnUrl']) {
-			$response = $response->withStatus(302, "Redirecting");
-			$response = $response->withHeader("Location", $request->getQueryParams()['returnUrl']);
-			return $response;
-		  }
-          $response->getBody()->write("<h1>Welcome $user</h1>\n");
-          // echo("session started\n");
-          //var_dump($_SESSION);
+        if ($request->getMethod() === 'POST') {
+            if (isset($_SESSION['userid'])) {
+              $user = $_SESSION['userid'];
+
+              if (isset($request->getQueryParams()['returnUrl'])) {
+                return $response
+                    ->withHeader("Location", $request->getQueryParams()['returnUrl'])
+                    ->withStatus(302)
+                ;
+              }
+
+              $response->getBody()->write("<h1>Already logged in as $user</h1>");
+            } elseif ($postBody['username'] && $postBody['password']) {
+                $user = $postBody['username'];
+                $password = $postBody['password'];
+
+                if (
+                    ($user === $_ENV['USERNAME'] && $password === $_ENV['PASSWORD'])
+                    || ($user === $_SERVER['USERNAME'] && $password === $_SERVER['PASSWORD'])
+                ) {
+                    $_SESSION['userid'] =  $user;
+
+                    if (isset($request->getQueryParams()['returnUrl'])) {
+                        return $response
+                            ->withHeader("Location", $request->getQueryParams()['returnUrl'])
+                            ->withStatus(302)
+                        ;
+                    }
+
+                    $response->getBody()->write("<h1>Welcome $user</h1>\n");
+                } else {
+                    $response->getBody()->write("<h1>Login as $user failed</h1>\n");
+                }
+            } else {
+              $response->getBody()->write("<h1>Login failed</h1>\n");
+            }
         } else {
-          // var_dump($postBody);
-          //echo("cookie:\n");
-          //var_dump($_COOKIE);
-          //echo("session:\n");
-          //var_dump($_SESSION);
-          $response->getBody()->write("<h1>No (try posting username=alice&password=alice123)</h1>\n");
+            return $this->createTemplateResponse('login.html');
         }
+
         return $response;
     }
 }

src/Controller/LoginPageController.php

@@ -26,7 +26,6 @@
 use Pdsinterop\Solid\Controller\HttpToHttpsController;
 use Pdsinterop\Solid\Controller\JwksController;
 use Pdsinterop\Solid\Controller\LoginController;
-use Pdsinterop\Solid\Controller\LoginPageController;
 use Pdsinterop\Solid\Controller\OpenidController;
 use Pdsinterop\Solid\Controller\Profile\CardController;
 use Pdsinterop\Solid\Controller\Profile\ProfileController;
@@ -128,7 +127,6 @@
     HttpToHttpsController::class,
     JwksController::class,
     LoginController::class,
-    LoginPageController::class,
     OpenidController::class,
     ProfileController::class,
     RegisterController::class,
@@ -190,7 +188,7 @@
 $router->map('GET', '/profile', AddSlashToPathController::class);
 $router->map('GET', '/.well-known/openid-configuration', OpenidController::class);
 $router->map('GET', '/jwks', JwksController::class);
-$router->map('GET', '/login/', LoginPageController::class);
+$router->map('GET', '/login/', LoginController::class);
 $router->map('POST', '/login', LoginController::class);
 $router->map('POST', '/login/', LoginController::class);
 $router->map('POST', '/register', RegisterController::class);