Merge pull request 'feature/start-using-authentication-required-interface' (!22) from feature/start-using-authentication-required-interface into master

Reviewed-on: #22

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "esoko/soko-web": "0.1",
+    "esoko/soko-web": "0.3",
     "firebase/php-jwt": "^6.4"
   },
   "require-dev": {

composer.lock

@@ -4,15 +4,15 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f2dcf297a4a619bc5edfe7b4fac0836e",
+    "content-hash": "64c21f0e5181bd39d8977af72e2aeddc",
     "packages": [
         {
             "name": "esoko/soko-web",
-            "version": "v0.1",
+            "version": "v0.3",
             "source": {
                 "type": "git",
                 "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "a17a88e9d44e42cef3d996fc66b4dd1134b85def"
+                "reference": "014a5480967c03c00dda5ee34c7eaf4be224b96e"
             },
             "require": {
                 "phpmailer/phpmailer": "^6.8",
@@ -33,7 +33,7 @@
                 "GNU GPL 3.0"
             ],
             "description": "Lightweight web framework",
-            "time": "2023-04-07T17:32:15+00:00"
+            "time": "2023-04-16T14:54:22+00:00"
         },
         {
             "name": "firebase/php-jwt",

database/migrations/structure/20230412_0037_oauth_audience.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `oauth_tokens`
+ADD `audience` varchar(255) NOT NULL DEFAULT '';

database/migrations/structure/20230412_0203_revert_oauth_audience.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `oauth_tokens`
+DROP `audience`;

database/migrations/structure/20230412_0208_oauth_client_id_longer.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `oauth_clients`
+MODIFY `client_id` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NOT NULL;

database/migrations/structure/20230412_1955_communities.sql

@@ -0,0 +1,20 @@
+CREATE TABLE `communities` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `currency` varchar(3) NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE `community_members` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `community_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `owner` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique_user_for_community` (`community_id`, `user_id`),
+  KEY `community_id` (`community_id`),
+  KEY `user_id` (`user_id`),
+  CONSTRAINT `community_members_community_id` FOREIGN KEY (`community_id`) REFERENCES `communities` (`id`),
+  CONSTRAINT `community_members_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

docker-compose.yml

@@ -19,6 +19,12 @@ services:
             MYSQL_DATABASE: 'rvr'
             MYSQL_USER: 'rvr'
             MYSQL_PASSWORD: 'rvr'
+    adminer:
+        image: adminer:4.8.1-standalone
+        ports:
+        - 9090:8080
+        environment:
+            - ADMINER_DEFAULT_SERVER=mariadb
     mail:
         image: marcopas/docker-mailslurper:latest
         ports:

public/index.php

@@ -1,7 +1,12 @@
 <?php
 
 use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Authorization\ISecured;
 use SokoWeb\Response\Redirect;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
 
 require '../web.php';
 
@@ -22,13 +27,11 @@ if ($match !== null) {
     $handler = $route->getHandler();
     $controller = new $handler[0](Container::$request);
 
-    if ($controller instanceof SokoWeb\Interfaces\Authorization\ISecured) {
-        $authorized = $controller->authorize();
-    } else {
-        $authorized = true;
-    }
-
-    if (!$authorized) {
+    if (
+        $controller instanceof IAuthenticationRequired &&
+        $controller->isAuthenticationRequired() &&
+        Container::$request->user() === null
+    ) {
         Container::$request->session()->set('redirect_after_login', substr($_SERVER['REQUEST_URI'], strlen('/')));
         $response = new Redirect(Container::$routeCollection->getRoute('login')->generateLink(), IRedirect::TEMPORARY);
         header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
@@ -36,23 +39,28 @@ if ($match !== null) {
     }
 
     if ($method === 'post' && !in_array($url, $antiCsrfTokenExceptions) && Container::$request->post('anti_csrf_token') !== Container::$request->session()->get('anti_csrf_token')) {
-        $content = new SokoWeb\Response\JsonContent(['error' => 'no_valid_anti_csrf_token']);
+        $content = new JsonContent(['error' => 'no_valid_anti_csrf_token']);
         header('Content-Type: text/html; charset=UTF-8', true, 403);
         $content->render();
         return;
     }
 
+    if (
+        !($controller instanceof ISecured) ||
+        $controller->authorize()
+    ) {
         $response = call_user_func([$controller, $handler[1]]);
-    if ($response instanceof SokoWeb\Interfaces\Response\IContent) {
+        if ($response instanceof IContent) {
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
             $response->render();
             return;
-    } elseif ($response instanceof SokoWeb\Interfaces\Response\IRedirect) {
+        } elseif ($response instanceof IRedirect) {
             header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
             return;
         }
     }
+}
 
-$content = new SokoWeb\Response\HtmlContent('error/404');
+$content = new HtmlContent('error/404');
 header('Content-Type: text/html; charset=UTF-8', true, 404);
 $content->render();

public/static/css/rvr.css

@@ -88,10 +88,14 @@ sub {
 }
 
 hr {
-    border: solid #bbbbbb 1px;
+    border: solid #bbbbcc 1px;
     margin: 10px 0;
 }
 
+.normal {
+    font-weight: 400;
+}
+
 .bold {
     font-weight: 700;
 }
@@ -418,13 +422,53 @@ div.buttonContainer>button {
 
 div.box {
     width: 576px;
-    background-color: #eeeeee;
+    background-color: #eeeef4;
     border-radius: 3px;
     margin: 10px auto;
     padding: 10px;
     box-sizing: border-box;
 }
 
+div.gridContainer {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
+    grid-gap: 10px;
+}
+
+div.gridContainer > div {
+    background-color: #eeeef4;
+    border-radius: 3px;
+    padding: 5px 10px;
+}
+
+table {
+    border-collapse: separate;
+    border-spacing: 0;
+}
+
+table.fullWidth {
+    width: 100%;
+}
+
+table th {
+    font-weight: bold;
+}
+
+table th, table td {
+    padding: 2px 0;
+    vertical-align: middle;
+}
+
+.choices__inner {
+    box-sizing: border-box;
+}
+
+@media screen and (max-width: 424px) {
+    div.gridContainer {
+        grid-template-columns: auto;
+    }
+}
+
 @media screen and (max-width: 599px) {
     header h1 span {
         display: none;

public/static/js/account/account.js

@@ -3,7 +3,7 @@ var Account = {
     countdown: null,
 
     openGoogleAuthenticate: function () {
-        window.open('/account/googleAuthenticate', 'googleAuthenticate', 'height=600,width=600')
+        window.open(googleAuthenticateUrl, 'googleAuthenticate', 'height=600,width=600')
     },
 
     authenticatedWithGoogleCallback: function (authenticatedWithGoogleUntil) {

public/static/js/communities/community_members.js

@@ -0,0 +1,62 @@
+(function () {
+    const element = document.getElementById('new_member_user_id');
+    const choices = new Choices(element, {
+        noResultsText: 'No users found',
+        noChoicesText: 'Start typing to search users'
+    });
+
+    element.addEventListener('search', RVR.debounce(async function (e) {
+        RVR.httpRequest('GET', searchUserUrl.replace('QUERY', encodeURIComponent(e.detail.value)), function () {
+            choices.setChoices(this.response.results, 'value', 'label', true);
+        });
+    }));
+
+    element.addEventListener('choice', function () {
+        choices.setChoices([], 'value', 'label', true);
+        document.getElementById('new_member_button').disabled = false;
+    });
+
+    document.getElementById('new_member_button').addEventListener('click', function () {
+        document.getElementById('loading').style.visibility = 'visible';
+
+        let data = new FormData();
+        data.append('user_id', document.getElementById('new_member_user_id').value);
+
+        RVR.httpRequest('POST', newMemberUrl, function () {
+            window.location.reload();
+        }, data);
+    });
+
+    const ownerCheckboxesButtons = document.getElementsByClassName('member_owner');
+    for (const ownerCheckboxesButton of ownerCheckboxesButtons) {
+        ownerCheckboxesButton.addEventListener('change', function () {
+            document.getElementById('loading').style.visibility = 'visible';
+
+            let data = new FormData();
+            data.append('community_member_id', this.dataset.id);
+            data.append('owner', this.checked ? 1 : 0);
+
+            RVR.httpRequest('POST', editMemberUrl, function () {
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                if (!this.response.success) {
+                    ownerCheckboxesButton.checked = !ownerCheckboxesButton.checked;
+                }
+            }, data);
+        });
+    };
+
+    const deleteButtons = document.getElementsByClassName('delete_member');
+    for (const deleteButton of deleteButtons) {
+        deleteButton.addEventListener('click', function () {
+            document.getElementById('loading').style.visibility = 'visible';
+
+            let data = new FormData();
+            data.append('community_member_id', this.dataset.id);
+
+            RVR.httpRequest('POST', deleteMemberUrl, function () {
+                window.location.reload();
+            }, data);
+        });
+    };
+})();

public/static/js/rvr.js

@@ -193,6 +193,14 @@ var RVR = {
         form.onreset = function () {
             form.elements.submit.disabled = true;
         }
+    },
+
+    debounce: function(func, timeout = 300) {
+        let timer;
+        return (...args) => {
+            clearTimeout(timer);
+            timer = setTimeout(() => { func.apply(this, args); }, timeout);
+        };
     }
 };
 

public/static/package-lock.json

@@ -0,0 +1,57 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
+      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.11"
+      }
+    },
+    "choices.js": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-10.2.0.tgz",
+      "integrity": "sha512-8PKy6wq7BMjNwDTZwr3+Zry6G2+opJaAJDDA/j3yxvqSCnvkKe7ZIFfIyOhoc7htIWFhsfzF9tJpGUATcpUtPg==",
+      "requires": {
+        "deepmerge": "^4.2.2",
+        "fuse.js": "^6.6.2",
+        "redux": "^4.2.0"
+      }
+    },
+    "deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
+    },
+    "fuse.js": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
+      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="
+    },
+    "leaflet": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz",
+      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ=="
+    },
+    "leaflet.markercluster": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz",
+      "integrity": "sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA=="
+    },
+    "redux": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "requires": {
+        "@babel/runtime": "^7.9.2"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    }
+  }
+}

public/static/package.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "leaflet": "^1.6.0",
-    "leaflet.markercluster": "^1.4.1"
+    "leaflet.markercluster": "^1.4.1",
+    "choices.js": "^10.2.0"
   }
 }

src/Cli/AddOAuthClientCommand.php

@@ -14,12 +14,13 @@ class AddOAuthClientCommand extends Command
     {
         $this->setName('oauth:add-client')
             ->setDescription('Adding of OAuth client.')
+            ->addArgument('client-id', InputArgument::OPTIONAL, 'Client ID')
             ->addArgument('preapproved', InputArgument::OPTIONAL, 'Preapproved');
     }
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $clientId = bin2hex(random_bytes(8));
+        $clientId = $input->getArgument('client-id') ? $input->getArgument('client-id') : bin2hex(random_bytes(8));
         $clientSecret = bin2hex(random_bytes(20));
 
         $oAuthClient = new OAuthClient();
@@ -27,7 +28,7 @@ class AddOAuthClientCommand extends Command
         $oAuthClient->setClientSecret($clientSecret);
         $oAuthClient->setCreatedDate(new DateTime());
 
-        if ($input->hasArgument('preapproved') && $input->getArgument('preapproved')) {
+        if ($input->getArgument('preapproved')) {
             $oAuthClient->setPreapproved($input->getArgument('preapproved'));
         }
 

src/Controller/CommunityController.php

@@ -0,0 +1,216 @@
+<?php namespace RVR\Controller;
+
+use DateTime;
+use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\CommunityMember;
+use RVR\PersistentData\Model\User;
+use RVR\Repository\CommunityRepository;
+use RVR\Repository\CommunityMemberRepository;
+use RVR\Repository\UserRepository;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\PersistentData\PersistentDataManager;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+
+class CommunityController implements IAuthenticationRequired
+{
+    private IRequest $request;
+
+    private PersistentDataManager $pdm;
+
+    private UserRepository $userRepository;
+
+    private CommunityRepository $communityRepository;
+
+    private CommunityMemberRepository $communityMemberRepository;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->userRepository = new UserRepository();
+        $this->communityRepository = new CommunityRepository();
+        $this->communityMemberRepository = new CommunityMemberRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
+    }
+
+    public function getCommunityHome(): ?IContent
+    {
+        if (!$this->checkPermission($this->request->query('communityId'), false, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        return new HtmlContent('communities/community', [
+            'community' => $community,
+            'members' => $this->getMembers($community),
+            'currencyNames' => [],
+            'upcomingEvents' => [],
+            'editPermission' => $ownCommunityMember->getOwner()
+        ]);
+    }
+
+    public function getCommunityNew(): IContent
+    {
+        return new HtmlContent('communities/community_edit');
+    }
+
+    public function getCommunityEdit(): ?IContent
+    {
+        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        return new HtmlContent('communities/community_edit', [
+            'community' => $community
+        ]);
+    }
+
+    public function getMembersEdit(): ?IContent
+    {
+        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        return new HtmlContent('communities/community_members', [
+            'community' => $community,
+            'members' => $this->getMembers($community)
+        ]);
+    }
+
+    private function getMembers(Community $community): array
+    {
+        $members = iterator_to_array($this->communityMemberRepository->getAllByCommunity($community, true));
+        usort($members, function($a, $b) {
+            return strnatcmp($a->getUser()->getDisplayName(), $b->getUser()->getDisplayName());
+        });
+        return $members;
+    }
+
+
+    public function newMember(): ?IContent
+    {
+        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $user = $this->userRepository->getById($this->request->post('user_id'));
+
+        $communityMember = new CommunityMember();
+        $communityMember->setCommunity($community);
+        $communityMember->setUser($user);
+        $this->pdm->saveToDb($communityMember);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function editMember(): ?IContent
+    {
+        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $communityMember = $this->communityMemberRepository->getById($this->request->post('community_member_id'));
+        if ($communityMember->getUserId() === $this->request->user()->getUniqueId()) {
+            return new JsonContent([
+                'error' => ['errorText' => 'Own user cannot be edited.']
+            ]);
+        }
+
+        $communityMember->setOwner($this->request->post('owner'));
+        $this->pdm->saveToDb($communityMember);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function deleteMember(): ?IContent
+    {
+        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $communityMember = $this->communityMemberRepository->getById($this->request->post('community_member_id'));
+        if ($communityMember->getUserId() === $this->request->user()->getUniqueId()) {
+            return new JsonContent([
+                'error' => ['errorText' => 'Own user cannot be deleted.']
+            ]);
+        }
+
+        $this->pdm->deleteFromDb($communityMember);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function saveCommunity(): ?IContent
+    {
+        $communityId = $this->request->query('communityId');
+        if ($communityId){
+            if (!$this->checkPermission($communityId, true, $community, $ownCommunityMember)) {
+                return null;
+            }
+        } else {
+            $community = new Community();
+        }
+
+        $name = $this->request->post('name');
+        $currency = $this->request->post('currency');
+        if (strlen($name) === 0 || strlen($currency) === 0 || strlen($currency) > 3) {
+            return new JsonContent([
+                'error' => ['errorText' => 'Please fill all required fields!']
+            ]);
+        }
+
+        $community->setName($name);
+        $community->setCurrency($currency);
+        if (!$communityId) {
+            $community->setCreatedDate(new DateTime());
+        }
+        $this->pdm->saveToDb($community);
+
+        if (!$communityId) {
+            /**
+            * @var User $user
+            */
+            $user = $this->request->user();
+
+            $communityMember = new CommunityMember();
+            $communityMember->setCommunity($community);
+            $communityMember->setUser($user);
+            $communityMember->setOwner(true);
+            $this->pdm->saveToDb($communityMember);
+        }
+
+        return new JsonContent([
+            'redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()])]
+        ]);
+    }
+
+    private function checkPermission(
+        int $communityId,
+        bool $needToBeOwner,
+        ?Community &$community,
+        ?CommunityMember &$ownCommunityMember): bool
+    {
+        $community = $this->communityRepository->getById($communityId);
+        if ($community === null) {
+            return false;
+        }
+
+        /**
+        * @var User $user
+        */
+        $user = $this->request->user();
+
+        $ownCommunityMember = $this->communityMemberRepository->getByCommunityAndUser($community, $user);
+        if ($ownCommunityMember === null || ($needToBeOwner && !$ownCommunityMember->getOwner())) {
+            return false;
+        }
+
+        return true;
+    }
+}

src/Controller/HomeController.php

@@ -1,27 +1,48 @@
 <?php namespace RVR\Controller;
 
-use SokoWeb\Interfaces\Authorization\ISecured;
+use RVR\PersistentData\Model\User;
+use RVR\Repository\CommunityMemberRepository;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Response\HtmlContent;
-use SokoWeb\Response\JsonContent;
 
-class HomeController implements ISecured
+class HomeController implements IAuthenticationRequired
 {
     private IRequest $request;
 
+    private CommunityMemberRepository $communityMemberRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
+        $this->communityMemberRepository = new CommunityMemberRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return $this->request->user() !== null;
+        return true;
     }
 
-    public function getIndex(): IContent
+    public function getHome(): IContent
     {
-        return new HtmlContent('index');
+        /**
+        * @var User $user
+        */
+        $user = $this->request->user();
+
+        $ownCommunityMembers = $this->communityMemberRepository->getAllByUser($user, true);
+        $communities = [];
+        foreach ($ownCommunityMembers as $ownCommunityMember) {
+            $communities[] = $ownCommunityMember->getCommunity();
+        }
+        usort($communities, function($a, $b) {
+            return strnatcmp($a->getName(), $b->getName());
+        });
+
+        return new HtmlContent('home', [
+            'communities' => $communities,
+            'upcomingEvents' => []
+        ]);
     }
 }

src/Controller/LoginController.php

@@ -37,7 +37,7 @@ class LoginController
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->redirectUrl = $this->request->session()->has('redirect_after_login') ?
             $this->request->session()->get('redirect_after_login') :
-            \Container::$routeCollection->getRoute('index')->generateLink();
+            \Container::$routeCollection->getRoute('home')->generateLink();
     }
 
     public function getLoginForm()
@@ -113,8 +113,8 @@ class LoginController
         if ($user === null || !$user->checkPassword($this->request->post('password'))) {
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'No user found with the given email address / username or the given password is wrong. You can <a href="/password/requestReset?email=' .
-                        urlencode($this->request->post('email')) . '" title="Request password reset">request password reset</a>!'
+                    'errorText' => 'No user found with the given email address / username or the given password is wrong. You can <a href="' .
+                        \Container::$routeCollection->getRoute('password-requestReset')->generateLink(['email' => $this->request->post('email')]) . '" title="Request password reset">request password reset</a>!'
                 ]
             ]);
         }
@@ -127,7 +127,7 @@ class LoginController
 
     public function loginWithGoogle()
     {
-        $defaultError = 'Authentication with Google failed. Please <a href="/login/google" title="Login with Google">try again</a>!';
+        $defaultError = 'Authentication with Google failed. Please <a href="' . \Container::$routeCollection->getRoute('login-google')->generateLink() . '" title="Login with Google">try again</a>!';
 
         if ($this->request->user() !== null) {
             $this->deleteRedirectUrl();
@@ -174,7 +174,7 @@ class LoginController
     {
         $this->request->setUser(null);
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        return new Redirect(\Container::$routeCollection->getRoute('home')->generateLink(), IRedirect::TEMPORARY);
     }
 
     public function requestPasswordReset(): IContent

src/Controller/OAuthAuthController.php

@@ -4,14 +4,14 @@ use DateTime;
 use RVR\PersistentData\Model\OAuthToken;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\OAuthClientRepository;
-use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IRedirect;
 use SokoWeb\Response\Redirect;
 use SokoWeb\PersistentData\PersistentDataManager;
 use SokoWeb\Response\HtmlContent;
 
-class OAuthAuthController implements ISecured
+class OAuthAuthController implements IAuthenticationRequired
 {
     private IRequest $request;
 
@@ -26,9 +26,9 @@ class OAuthAuthController implements ISecured
         $this->oAuthClientRepository = new OAuthClientRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return $this->request->user() !== null;
+        return true;
     }
 
     public function auth()

src/Controller/OAuthController.php

@@ -59,6 +59,7 @@ class OAuthController
             'iat' => (int)$token->getCreatedDate()->getTimestamp(),
             'nbf' => (int)$token->getCreatedDate()->getTimestamp(),
             'exp' => (int)$token->getExpiresDate()->getTimestamp(),
+            'aud' => $clientId,
             'nonce' => $token->getNonce()
         ], $this->getUserInfoInternal(
             $this->userRepository->getById($token->getUserId()),
@@ -79,16 +80,14 @@ class OAuthController
 
     public function getUserInfo() : IContent
     {
-        //TODO: headers should be set by soko-web
-        $headers = getallheaders();
-
-        if (!isset($headers['Authorization'])) {
+        $authorization = $this->request->header('Authorization');
+        if ($authorization === null) {
             return new JsonContent([
                 'error' => 'No Authorization header was sent.'
             ]);
         }
 
-        $accessToken = substr($headers['Authorization'], strlen('Bearer '));
+        $accessToken = substr($authorization, strlen('Bearer '));
         $token = $this->oAuthTokenRepository->getByAccessToken($accessToken);
 
         if ($token === null || $token->getExpiresDate() < new DateTime()) {
@@ -109,10 +108,10 @@ class OAuthController
     {
         return new JsonContent([
             'issuer' => $_ENV['APP_URL'],
-            'authorization_endpoint' => $this->request->getBase() . '/oauth/auth',
-            'token_endpoint' => $this->request->getBase() . '/oauth/token',
-            'userinfo_endpoint' => $this->request->getBase() . '/oauth/userinfo',
-            'jwks_uri' => $this->request->getBase() . '/oauth/certs',
+            'authorization_endpoint' => $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('oauth-auth')->generateLink(),
+            'token_endpoint' => $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('oauth-token')->generateLink(),
+            'userinfo_endpoint' => $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('oauth-userinfo')->generateLink(),
+            'jwks_uri' => $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('oauth-certs')->generateLink(),
             'response_types_supported' =>
             [
                 'code',

src/Controller/UserController.php

@@ -2,7 +2,7 @@
 
 use DateTime;
 use SokoWeb\Http\Request;
-use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Interfaces\Response\IRedirect;
@@ -15,7 +15,7 @@ use SokoWeb\Response\Redirect;
 use SokoWeb\Util\JwtParser;
 use RVR\Repository\UserRepository;
 
-class UserController implements ISecured
+class UserController implements IAuthenticationRequired
 {
     private IRequest $request;
 
@@ -30,9 +30,9 @@ class UserController implements ISecured
         $this->userRepository = new UserRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return $this->request->user() !== null;
+        return true;
     }
 
     public function getAccount(): IContent

src/Controller/UserSearchController.php

@@ -0,0 +1,42 @@
+<?php namespace RVR\Controller;
+
+use RVR\Repository\UserRepository;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Response\JsonContent;
+
+class UserSearchController implements IAuthenticationRequired
+{
+    private IRequest $request;
+
+    private UserRepository $userRepository;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+        $this->userRepository = new UserRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
+    }
+
+    public function searchUser(): IContent
+    {
+        $users = iterator_to_array($this->userRepository->searchByName($this->request->query('q')));
+        usort($users, function($a, $b) {
+            return strnatcmp($a->getDisplayName(), $b->getDisplayName());
+        });
+
+        $results = [];
+        foreach ($users as $user) {
+            $results[] = ['value' => $user->getId(), 'label' => $user->getFullDisplayName()];
+        }
+
+        return new JsonContent([
+            'results' => $results
+        ]);
+    }
+}

src/PersistentData/Model/Community.php

@@ -0,0 +1,57 @@
+<?php namespace RVR\PersistentData\Model;
+
+use DateTime;
+use SokoWeb\PersistentData\Model\Model;
+
+class Community extends Model
+{
+    protected static string $table = 'communities';
+
+    protected static array $fields = ['name', 'currency', 'created'];
+
+    private string $name = '';
+
+    private string $currency = '';
+
+    private DateTime $created;
+
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
+
+    public function setCurrency(string $currency): void
+    {
+        $this->currency = $currency;
+    }
+
+    public function setCreatedDate(DateTime $created): void
+    {
+        $this->created = $created;
+    }
+
+    public function setCreated(string $created): void
+    {
+        $this->created = new DateTime($created);
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getCurrency(): string
+    {
+        return $this->currency;
+    }
+
+    public function getCreatedDate(): DateTime
+    {
+        return $this->created;
+    }
+
+    public function getCreated(): string
+    {
+        return $this->created->format('Y-m-d H:i:s');
+    }
+}

src/PersistentData/Model/CommunityMember.php

@@ -0,0 +1,72 @@
+<?php namespace RVR\PersistentData\Model;
+
+use SokoWeb\PersistentData\Model\Model;
+
+class CommunityMember extends Model
+{
+    protected static string $table = 'community_members';
+
+    protected static array $fields = ['community_id', 'user_id', 'owner'];
+
+    protected static array $relations = ['community' => Community::class, 'user' => User::class];
+
+    private ?Community $community = null;
+
+    private ?int $communityId = null;
+
+    private ?User $user = null;
+
+    private ?int $userId = null;
+
+    private bool $owner = false;
+
+    public function setCommunity(Community $community): void
+    {
+        $this->community = $community;
+    }
+
+    public function setCommunityId(int $communityId): void
+    {
+        $this->communityId = $communityId;
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function setOwner(bool $owner): void
+    {
+        $this->owner = $owner;
+    }
+
+    public function getCommunity(): ?Community
+    {
+        return $this->community;
+    }
+
+    public function getCommunityId(): ?int
+    {
+        return $this->communityId;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function getOwner(): bool
+    {
+        return $this->owner;
+    }
+}

src/PersistentData/Model/User.php

@@ -171,6 +171,11 @@ class User extends Model implements IUser
         return $this->nickname ?: $this->fullName;
     }
 
+    public function getFullDisplayName(): string
+    {
+        return $this->nickname ? $this->nickname . ' (' . $this->fullName . ')' : $this->fullName;
+    }
+
     public function checkPassword(string $password): bool
     {
         if ($this->password === null) {

src/Repository/CommunityMemberRepository.php

@@ -0,0 +1,48 @@
+<?php namespace RVR\Repository;
+
+use Generator;
+use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\CommunityMember;
+use RVR\PersistentData\Model\User;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class CommunityMemberRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getById(int $id): ?CommunityMember
+    {
+        return $this->pdm->selectFromDbById($id, CommunityMember::class);
+    }
+
+    public function getAllByCommunity(Community $community, bool $useRelations = false): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('community_id', '=', $community->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, CommunityMember::class, $useRelations);
+    }
+
+    public function getAllByUser(User $user, bool $useRelations = false): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, CommunityMember::class, $useRelations);
+    }
+
+    public function getByCommunityAndUser(Community $community, User $user) : ?CommunityMember
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('community_id', '=', $community->getId());
+        $select->where('user_id', '=', $user->getId());
+
+        return $this->pdm->selectFromDb($select, CommunityMember::class);
+    }
+}

src/Repository/CommunityRepository.php

@@ -0,0 +1,19 @@
+<?php namespace RVR\Repository;
+
+use RVR\PersistentData\Model\Community;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class CommunityRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getById(int $id): ?Community
+    {
+        return $this->pdm->selectFromDbById($id, Community::class);
+    }
+}

src/Repository/UserRepository.php

@@ -1,5 +1,6 @@
 <?php namespace RVR\Repository;
 
+use Generator;
 use SokoWeb\Interfaces\Repository\IUserRepository;
 use SokoWeb\Database\Query\Select;
 use RVR\PersistentData\Model\User;
@@ -51,4 +52,14 @@ class UserRepository implements IUserRepository
 
         return $this->pdm->selectFromDb($select, User::class);
     }
+
+    public function searchByName(string $name): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('full_name', 'LIKE', '%' . $name . '%');
+        $select->orWhere('nickname', 'LIKE', '%' . $name . '%');
+        $select->limit(10);
+
+        yield from $this->pdm->selectMultipleFromDb($select, User::class);
+    }
 }

views/account/account.php

@@ -5,7 +5,7 @@
 @section(main)
     <h2>Account</h2>
     <div class="box">
-        <form id="accountForm" action="/account" method="post" data-reload-on-success="true" data-observe-inputs="email,username,password_new,password_new_confirm,nickname,phone,id_number">
+        <form id="accountForm" action="/<?= Container::$routeCollection->getRoute('account-action')->generateLink() ?>" method="post" data-reload-on-success="true" data-observe-inputs="email,username,password_new,password_new_confirm,nickname,phone,id_number">
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
@@ -39,3 +39,9 @@
         </form>
     </div>
 @endsection
+
+@section(pageScript)
+<script>
+    var googleAuthenticateUrl = '/<?= Container::$routeCollection->getRoute('account.googleAuthenticate')->generateLink() ?>';
+</script>
+@endsection

views/communities/community.php

@@ -0,0 +1,50 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2><?= $community->getName() ?> <span class="small">[<a href="/<?= Container::$routeCollection->getRoute('community-edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span></h2>
+
+    <div class="gridContainer marginTop">
+        <div>
+            <h3 class="marginBottom">Members</h3>
+            <?php foreach ($members as $member): ?>
+                <p><?= $member->getUser()->getDisplayName() ?></p>
+            <?php endforeach; ?>
+            <?php if ($editPermission): ?>
+                <hr>
+                <p><a href="/<?= Container::$routeCollection->getRoute('community-members')->generateLink(['communityId' => $community->getId()]) ?>">Edit members</a></p>
+            <?php endif; ?>
+        </div>
+        <div>
+            <h3 class="marginBottom">Currencies</h3>
+            <p>Main currency: <b><?= $community->getCurrency() ?></b></p>
+            <p>Further currencies: <b><?= implode(', ', $currencyNames) ?></b></p>
+        </div>
+        <div>
+            <h3 class="marginBottom">Upcoming events</h3>
+            <?php if (count($upcomingEvents) > 0): ?>
+                <?php foreach ($upcomingEvents as $event): ?>
+                    <!-- todo -->
+                <?php endforeach; ?>
+            <?php else: ?>
+                <p>There is no upcoming event.</p>
+            <?php endif; ?>
+        </div>
+        <div>
+            <h3 class="marginBottom">Finances</h3>
+            <table class="fullWidth">
+                <tr>
+                    <td>You owe</td>
+                    <td style="text-align: right; color: red;">0 <?= $community->getCurrency() ?></td>
+                </tr>
+                <tr>
+                    <td>You're owed</td>
+                    <td style="text-align: right; color: green;">0 <?= $community->getCurrency() ?></td>
+                </tr>
+                <tr>
+                    <td>Your balance</td>
+                    <td style="text-align: right;">0 <?= $community->getCurrency() ?></td>
+                </tr>
+            </table>
+        </div>
+    </div>
+@endsection

views/communities/community_edit.php

@@ -0,0 +1,20 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2><?= isset($community) ? $community->getName() . ' - Edit' : 'New community' ?></h2>
+    <div class="box">
+        <?php
+        $formAction = isset($community) ?
+            Container::$routeCollection->getRoute('community-edit-action')->generateLink(['communityId' => $community->getId()]) :
+            Container::$routeCollection->getRoute('community-new-action')->generateLink();
+        ?>
+        <form id="communityForm" action="/<?= $formAction ?>" method="post" data-redirect-on-success="true">
+            <input type="text" class="text big fullWidth" name="name" placeholder="Name" value="<?= isset($community) ? $community->getName() : '' ?>" required>
+            <input type="text" class="text big fullWidth marginTop" name="currency" value="<?= isset($community) ? $community->getCurrency() : '' ?>" placeholder="Default currency" maxlength="3" required>
+            <p id="accountFormError" class="formError justify marginTop"></p>
+            <div class="right marginTop">
+                <button type="submit" name="submit"><?= isset($community) ? 'Save' : 'Create' ?></button>
+            </div>
+        </form>
+    </div>
+@endsection

views/communities/community_members.php

@@ -0,0 +1,42 @@
+@css(node_modules/choices.js/public/assets/styles/choices.min.css)
+@js(node_modules/choices.js/public/assets/scripts/choices.js)
+@js(js/communities/community_members.js)
+
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2><?= $community->getName() ?> - Edit members</h2>
+    <div class="box">
+        <table class="fullWidth">
+            <thead>
+                <tr>
+                    <th style="width: 50%;"></th>
+                    <th style="width: 25%; text-align: center;">Owner</th>
+                    <th style="width: 25%;"></th>
+                </tr>
+            </thead>
+            <?php foreach ($members as $member): ?>
+                <?php $editable = $member->getUserId() !== Container::$request->user()->getUniqueId(); ?>
+                <tr>
+                    <td><?= $member->getUser()->getDisplayName() ?></td>
+                    <td style="text-align: center;"><input type="checkbox" class="member_owner" data-id="<?= $member->getId() ?>" <?= $member->getOwner() ? 'checked' : '' ?> <?= !$editable ? 'disabled' : '' ?> /></td>
+                    <td style="text-align: right;"><button type="button" class="small red delete_member" data-id="<?= $member->getId() ?>" <?= !$editable ? 'disabled' : '' ?>>Delete</button></td>
+                </tr>
+            <?php endforeach; ?>
+            <tr>
+                <td><select type="text" id="new_member_user_id"></td>
+                <td></td>
+                <td style="text-align: right;"><button type="button" class="small" id="new_member_button" disabled>Add</button></td>
+            </tr>
+        </table>
+    </div>
+@endsection
+
+@section(pageScript)
+<script>
+    var searchUserUrl = '/<?= Container::$routeCollection->getRoute('searchUser')->generateLink(['q' => 'QUERY']) ?>';
+    var newMemberUrl = '/<?= Container::$routeCollection->getRoute('community-members-new')->generateLink(['communityId' => $community->getId()]) ?>';
+    var editMemberUrl = '/<?= Container::$routeCollection->getRoute('community-members-edit')->generateLink(['communityId' => $community->getId()]) ?>';
+    var deleteMemberUrl = '/<?= Container::$routeCollection->getRoute('community-members-delete')->generateLink(['communityId' => $community->getId()]) ?>';
+</script>
+@endsection

views/home.php

@@ -0,0 +1,28 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <div class="gridContainer">
+        <div>
+            <h3 class="marginBottom">Communities</h3>
+            <?php if (count($communities) > 0): ?>
+                <?php foreach ($communities as $community): ?>
+                    <p><a href="/<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a></p>
+                <?php endforeach; ?>
+            <?php else: ?>
+                <p>You have no community.</p>
+            <?php endif; ?>
+            <hr>
+            <p><a href="/<?= Container::$routeCollection->getRoute('community-new')->generateLink() ?>">New community</a></p>
+        </div>
+        <div>
+            <h3 class="marginBottom">Upcoming events</h3>
+            <?php if (count($upcomingEvents) > 0): ?>
+                <?php foreach ($upcomingEvents as $event): ?>
+                    <!-- todo -->
+                <?php endforeach; ?>
+            <?php else: ?>
+                <p>There is no upcoming event.</p>
+            <?php endif; ?>
+        </div>
+    </div>
+@endsection

views/index.php

@@ -1,8 +0,0 @@
-@extends(templates/layout_normal)
-
-@section(main)
-    <h2><?= $_ENV['APP_NAME'] ?></h2>
-    <div class="box">
-        <p>This is the new <?= $_ENV['APP_NAME'] ?>.</p>
-    </div>
-@endsection

views/login/login.php

@@ -3,17 +3,17 @@
 @section(main)
     <h2>Login</h2>
     <div class="box">
-        <form id="loginForm" action="/login" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
+        <form id="loginForm" action="/<?= Container::$routeCollection->getRoute('login-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
             <input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" required autofocus>
             <input type="password"  class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Login</button>
             </div>
-            <p class="center marginTop"><a href="/password/requestReset" title="Request password reset">Forgot your password?</a></p>
+            <p class="center marginTop"><a href="/<?= Container::$routeCollection->getRoute('password-requestReset')->generateLink() ?>" title="Request password reset">Forgot your password?</a></p>
             <hr>
             <div class="center">
-                <a class="button yellow" href="/login/google" title="Login with Google">Login with Google</a>
+                <a class="button yellow" href="/<?= Container::$routeCollection->getRoute('login-google')->generateLink() ?>" title="Login with Google">Login with Google</a>
             </div>
         </form>
     </div>

views/login/password_reset_request.php

@@ -5,7 +5,7 @@
 @section(main)
     <h2>Request password reset</h2>
     <div class="box">
-        <form id="passwordResetForm" action="/password/requestReset" method="post" data-redirect-on-success="/password/requestReset/success">
+        <form id="passwordResetForm" action="/<?= Container::$routeCollection->getRoute('password-requestReset-action')->generateLink() ?>" method="post" data-redirect-on-success="/<?= Container::$routeCollection->getRoute('password-requestReset.success')->generateLink() ?>">
             <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
             <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
                 <div class="marginTop">

views/login/reset_password.php

@@ -4,7 +4,7 @@
     <h2>Reset password</h2>
     <div class="box">
         <?php if ($success) : ?>
-            <form id="resetPasswordForm" action="/password/reset/<?= $token ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
+            <form id="resetPasswordForm" action="/<?= Container::$routeCollection->getRoute('password-reset.action')->generateLink(['token' => $token]) ?>"" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
                 <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
                 <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6" autofocus>
                 <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" required minlength="6">
@@ -14,7 +14,7 @@
                 </div>
             </form>
         <?php else: ?>
-            <p class="error justify">Confirming your identity failed. Please check the link you entered, or retry <a href="/password/requestReset" title="Request password reset">requesting password reset</a>!</p>
+            <p class="error justify">Confirming your identity failed. Please check the link you entered, or retry <a href="/<?= Container::$routeCollection->getRoute('password-requestReset')->generateLink() ?>" title="Request password reset">requesting password reset</a>!</p>
         <?php endif; ?>
     </div>
 @endsection

views/templates/layout_normal.php

@@ -10,14 +10,14 @@
     </h1>
     <p>
         <?php if (Container::$request->user()) : ?>
-            <span><a href="/account" title="Account">
+            <span><a href="/<?= Container::$routeCollection->getRoute('account')->generateLink() ?>" title="Account">
                 <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
                 <svg class="inline" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
                 </svg><!--
              --><?= Container::$request->user()->getDisplayName() ?><!--
             --></a></span><!--
-            --><span><a href="/logout" title="Logout">Logout</a></span>
+            --><span><a href="/<?= Container::$routeCollection->getRoute('logout')->generateLink() ?>" title="Logout">Logout</a></span>
         <?php endif; ?>
     </p>
 </header>
@@ -25,8 +25,8 @@
 @yields('main')
 </main>
 <footer>
-    <p><?= round($__debug_runtime, 0) ?> ms</p>
-    <p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
+    <p><?= round($__debug_runtime, 0) ?> ms</p><!--
+ --><p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
  --><p>&copy; The RVR Contributors <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
 </footer>
 @endsection

web.php

@@ -12,7 +12,7 @@ if (!empty($_ENV['DEV'])) {
 
 Container::$routeCollection = new SokoWeb\Routing\RouteCollection();
 
-Container::$routeCollection->get('index', '', [RVR\Controller\HomeController::class, 'getIndex']);
+Container::$routeCollection->get('home', '', [RVR\Controller\HomeController::class, 'getHome']);
 Container::$routeCollection->get('startSession', 'startSession.json', [RVR\Controller\HomeController::class, 'startSession']);
 Container::$routeCollection->group('login', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('login', '', [RVR\Controller\LoginController::class, 'getLoginForm']);
@@ -41,6 +41,20 @@ Container::$routeCollection->group('account', function (SokoWeb\Routing\RouteCol
     $routeCollection->get('account.googleAuthenticate', 'googleAuthenticate', [RVR\Controller\UserController::class, 'getGoogleAuthenticateRedirect']);
     $routeCollection->get('account.googleAuthenticate-action', 'googleAuthenticate/code', [RVR\Controller\UserController::class, 'authenticateWithGoogle']);
 });
+Container::$routeCollection->get('searchUser', 'searchUser', [RVR\Controller\UserSearchController::class, 'searchUser']);
+Container::$routeCollection->group('communities', function (SokoWeb\Routing\RouteCollection $routeCollection) {
+    $routeCollection->get('community-new', 'new', [RVR\Controller\CommunityController::class, 'getCommunityNew']);
+    $routeCollection->post('community-new-action', 'new', [RVR\Controller\CommunityController::class, 'saveCommunity']);
+    $routeCollection->group('{communityId}', function (SokoWeb\Routing\RouteCollection $routeCollection) {
+        $routeCollection->get('community', '', [RVR\Controller\CommunityController::class, 'getCommunityHome']);
+        $routeCollection->get('community-edit', 'edit', [RVR\Controller\CommunityController::class, 'getCommunityEdit']);
+        $routeCollection->post('community-edit-action', 'edit', [RVR\Controller\CommunityController::class, 'saveCommunity']);
+        $routeCollection->get('community-members', 'members', [RVR\Controller\CommunityController::class, 'getMembersEdit']);
+        $routeCollection->post('community-members-new', 'newMember', [RVR\Controller\CommunityController::class, 'newMember']);
+        $routeCollection->post('community-members-edit', 'editMember', [RVR\Controller\CommunityController::class, 'editMember']);
+        $routeCollection->post('community-members-delete', 'deleteMember', [RVR\Controller\CommunityController::class, 'deleteMember']);
+    });
+});
 
 Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler();
 
@@ -72,6 +86,7 @@ Container::$request = new SokoWeb\Request\Request(
     $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'],
     $_GET,
     $_POST,
+    getallheaders(),
     $_SESSION,
     new RVR\Repository\UserRepository()
 );