Merge pull request 'center files table' (#3) from sites/file-explorer:main into main

Reviewed-on: jank1619/file-explorer#3

composer.json

@@ -7,7 +7,6 @@
         "php": ">=8.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "knpuniversity/oauth2-client-bundle": "^2.18",
         "symfony/apache-pack": "^1.0",
         "symfony/asset-mapper": "^7.1",
         "symfony/console": "7.1.*",
@@ -16,17 +15,14 @@
         "symfony/flex": "^2",
         "symfony/form": "^7.1",
         "symfony/framework-bundle": "7.1.*",
-        "symfony/mime": "7.1.*",
         "symfony/runtime": "7.1.*",
-        "symfony/security-bundle": "7.1.*",
         "symfony/stimulus-bundle": "^2.22",
         "symfony/twig-bundle": "7.1.*",
         "symfony/ux-icons": "^2.22",
         "symfony/yaml": "7.1.*",
         "symfonycasts/tailwind-bundle": "^0.6.1",
         "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0",
+        "twig/twig": "^2.12|^3.0"
-        "ext-fileinfo": "*"
     },
     "config": {
         "allow-plugins": {
@@ -79,7 +75,6 @@
         }
     },
     "require-dev": {
-        "symfony/maker-bundle": "^1.61",
         "symfony/stopwatch": "7.1.*",
         "symfony/web-profiler-bundle": "7.1.*"
     }

config/bundles.php

@@ -8,7 +8,4 @@ return [
     Symfonycasts\TailwindBundle\SymfonycastsTailwindBundle::class => ['all' => true],
     Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
-    KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
-    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
 ];

config/packages/knpu_oauth2_client.yaml

@@ -1,9 +0,0 @@
-knpu_oauth2_client:
-    clients:
-        auth:
-            type: generic
-            provider_class: App\Security\UserProvider
-            client_id: '%env(AUTHENTIK_CLIENT_ID)%'
-            client_secret: '%env(AUTHENTIK_CLIENT_SECRET)%'
-            redirect_route: auth_callback
-            redirect_params: {}

config/packages/security.yaml

@@ -1,48 +0,0 @@
-security:
-    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
-    password_hashers:
-        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
-    # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
-    providers:
-        # used to reload user from session & other features (e.g. switch_user)
-        app_user_provider:
-            id: App\Security\UserProvider
-
-    firewalls:
-        dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            security: false
-        main:
-            lazy: true
-            provider: app_user_provider
-            custom_authenticators:
-                - App\Security\Authenticator
-            form_login:
-                login_path: auth_entrypoint
-
-            # activate different ways to authenticate
-            # https://symfony.com/doc/current/security.html#the-firewall
-
-            # https://symfony.com/doc/current/security/impersonating_user.html
-            # switch_user: true
-
-    # Easy way to control access for large sections of your site
-    # Note: Only the *first* access control that matches will be used
-    access_control:
-        # - { path: ^/admin, roles: ROLE_ADMIN }
-        # - { path: ^/profile, roles: ROLE_USER }
-        - { path: ^/auth, roles: PUBLIC_ACCESS }
-        - { path: /, roles: ROLE_USER }
-
-when@test:
-    security:
-        password_hashers:
-            # By default, password hashers are resource intensive and take time. This is
-            # important to generate secure password hashes. In tests however, secure hashes
-            # are not important, waste resources and increase test times. The following
-            # reduces the work factor to the lowest possible values.
-            Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
-                algorithm: auto
-                cost: 4 # Lowest possible value for bcrypt
-                time_cost: 3 # Lowest possible value for argon
-                memory_cost: 10 # Lowest possible value for argon

config/routes/security.yaml

@@ -1,3 +0,0 @@
-_security_logout:
-    resource: security.route_loader.logout
-    type: service

src/Controller/AuthenticationController.php

@@ -1,25 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Controller;
-
-use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-
-class AuthenticationController extends AbstractController
-{
-    #[Route(path: '/auth/callback', name: 'auth_callback', methods: Request::METHOD_GET)]
-    public function __invoke(ClientRegistry $clientRegistry): Response
-    {
-        dd($clientRegistry->getClient('auth')->fetchUser());
-    }
-
-    #[Route(path: '/auth/sso', name: 'auth_entrypoint', methods: Request::METHOD_GET)]
-    public function entrypoint(ClientRegistry $clientRegistry): Response
-    {
-        return $clientRegistry->getClient('auth')->redirect();
-    }
-}

src/Controller/ServeFileController.php

@@ -1,28 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace App\Controller;
-
-use App\Service\FileSystemService;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;
-use Symfony\Component\Routing\Attribute\Route;
-
-class ServeFileController extends AbstractController
-{
-    public function __construct(private FileSystemService $fileSystemService)
-    {
-    }
-
-    #[Route("/serve/{filePath}", name: "serve_file")]
-    public function __invoke(string $filePath): BinaryFileResponse
-    {
-        $file = $this->fileSystemService->getFile($filePath);
-        $path = $file->getPath() . '/' . $file->getName();
-
-        $response = new BinaryFileResponse($path);
-        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $file->getName());
-
-        return $response;
-    }
-}

src/Objects/DirContent.php

@@ -14,7 +14,6 @@ readonly class DirContent
         private string $type,
         private string $path,
         private string $content,
-        private string $mimeType,
     ) {
     }
 
@@ -25,8 +24,7 @@ readonly class DirContent
             $fileInfo->getSize() ?? 0,
             $fileInfo->getType() ?? 'N/A',
             $fileInfo->getPath(),
-            $content,
+            $content
-            mime_content_type($fileInfo->getPath() . '/' . $fileInfo->getFilename()),
         );
     }
 
@@ -59,11 +57,6 @@ readonly class DirContent
         return $this->content;
     }
 
-    public function getMimeType(): string
-    {
-        return $this->mimeType;
-    }
-
     private function getHumanReadableSize(): string
     {
         $bytes = $this->size;

src/Security/Authenticator.php

@@ -1,43 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Security;
-
-use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Http\Authenticator\AbstractAuthenticator;
-use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
-use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
-use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
-
-class Authenticator extends AbstractAuthenticator
-{
-    public function __construct(private ClientRegistry $clientRegistry)
-    {
-    }
-
-    public function supports(Request $request): ?bool
-    {
-        return $request->attributes->get('_route') === 'auth_callback';
-    }
-
-    public function authenticate(Request $request): Passport
-    {
-        dd($this->clientRegistry->getClient('auth')->getAccessToken());
-
-        return new SelfValidatingPassport(new UserBadge(''));
-    }
-
-    public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
-    {
-        return null;
-    }
-
-    public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
-    {
-        dd($request );
-    }
-}

src/Security/User.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Security;
-
-use Symfony\Component\Security\Core\User\UserInterface;
-
-class User implements UserInterface
-{
-    private string $email;
-
-    /**
-     * @var string[]
-     */
-    private array $roles = [];
-
-    public function getEmail(): ?string
-    {
-        return $this->email;
-    }
-
-    public function setEmail(string $email): static
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    public function getUserIdentifier(): string
-    {
-        return $this->email;
-    }
-
-    public function getRoles(): array
-    {
-        $roles = $this->roles;
-        $roles[] = 'ROLE_USER';
-
-        return array_unique($roles);
-    }
-
-    public function setRoles(array $roles): static
-    {
-        $this->roles = $roles;
-
-        return $this;
-    }
-
-    public function eraseCredentials(): void
-    {
-    }
-}

src/Security/UserProvider.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Security;
-
-use League\OAuth2\Client\Provider\AbstractProvider;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use League\OAuth2\Client\Token\AccessToken;
-use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
-
-class UserProvider extends AbstractProvider implements UserProviderInterface
-{
-    public function loadUserByIdentifier($identifier): UserInterface
-    {
-        return new User();
-    }
-
-    public function refreshUser(UserInterface $user): UserInterface
-    {
-        return $user;
-    }
-
-    public function supportsClass(string $class): bool
-    {
-        return User::class === $class || is_subclass_of($class, User::class);
-    }
-
-    public function getBaseAuthorizationUrl(): string
-    {
-        return 'https://oauth.simonis.lol/application/o/authorize/';
-    }
-
-    public function getBaseAccessTokenUrl(array $params): string
-    {
-        return 'https://oauth.simonis.lol/application/o/token/';
-    }
-
-    public function getResourceOwnerDetailsUrl(AccessToken $token): string
-    {
-        return 'https://oauth.simonis.lol/application/o/userinfo/';
-    }
-
-    protected function getDefaultScopes(): array
-    {
-        return ['profile', 'email', 'openid'];
-    }
-
-    protected function checkResponse(ResponseInterface $response, $data): void
-    {
-        if (isset($data['error'])) {
-            throw new IdentityProviderException($data['error'], $response->getStatusCode(), $response);
-        }
-    }
-
-    protected function createResourceOwner(array $response, AccessToken $token)
-    {
-        dd($response);
-    }
-}

symfony.lock

@@ -1,16 +1,4 @@
 {
-    "knpuniversity/oauth2-client-bundle": {
-        "version": "2.18",
-        "recipe": {
-            "repo": "github.com/symfony/recipes-contrib",
-            "branch": "main",
-            "version": "1.20",
-            "ref": "1ff300d8c030f55c99219cc55050b97a695af3f6"
-        },
-        "files": [
-            "config/packages/knpu_oauth2_client.yaml"
-        ]
-    },
     "symfony/apache-pack": {
         "version": "1.0",
         "recipe": {
@@ -81,15 +69,6 @@
             "src/Kernel.php"
         ]
     },
-    "symfony/maker-bundle": {
-        "version": "1.61",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "1.0",
-            "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
-        }
-    },
     "symfony/routing": {
         "version": "7.1",
         "recipe": {
@@ -103,19 +82,6 @@
             "config/routes.yaml"
         ]
     },
-    "symfony/security-bundle": {
-        "version": "7.1",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "6.4",
-            "ref": "2ae08430db28c8eb4476605894296c82a642028f"
-        },
-        "files": [
-            "config/packages/security.yaml",
-            "config/routes/security.yaml"
-        ]
-    },
     "symfony/stimulus-bundle": {
         "version": "2.22",
         "recipe": {

templates/file.html.twig

@@ -15,11 +15,7 @@
         </a>
 
         <div class="mt-6 text-gray-700 overflow-auto max-h-96">
-            {% if file.mimeType starts with 'image' %}
+            <p class="whitespace-pre-wrap leading-relaxed break-all text-balance">{{ file.content|raw }}</p>
-                <img src="{{ path('serve_file', {filePath: file.name}) }}" alt="">
-            {% else %}
-                <p class="whitespace-pre-wrap leading-relaxed break-all text-balance">{{ file.content|raw }}</p>
-            {% endif %}
         </div>
     </div>
 {% endblock %}