Update from uostream

.gitignore

@@ -4,7 +4,8 @@
 /.env.*.local
 /config/secrets/prod/prod.decrypt.private.php
 /public/bundles/
-/var/
+/var/*
+!/var/.gitkeep
 /vendor/
 ###< symfony/framework-bundle ###
 
@@ -32,7 +33,8 @@
 
 ###> Docker ###
 docker-compose.*.yml
-/docker/logs
+/docker/logs/nginx/*
+!/docker/logs/nginx/.gitkeep
 /docker/nginx/ssl/certs/*
 !/docker/nginx/ssl/certs/.gitkeep
 /docker/nginx/ssl/private/*

CHANGELOG.md

@@ -9,6 +9,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - WIP: organization members (#56)
 
+## [0.1.2] - 2020-04-27
+### Added
+- Add ability to unlink OAuth integration from user profile page (#106)
+- Uptime Robot monitor (#102 & #103)
+
+### Changes
+- GitLab API: Show all user's packages and order by last activity (#104)
+
+### Fixed
+- Handle oauth errors during registration (#92)
+- Handle errors when fetching repos from provider  (#94)
+- Fix last package version detection mechanism (#99)
+- Fix support for packages with slash in version name (#101)
+- Fix number of days for /admin/stats (#108)
+- Fix recent webhook requests view model (#110)
+- Allow *.php named packages to be found (#111)
+
 ## [0.1.1] - 2020-04-22
 ### BC break
 - user email is now change to lowercase with migration 

ansible/roles/nginx/templates/nginx-ssl.conf

@@ -86,10 +86,6 @@ http {
             internal;
         }
 
-        location ~ \.php$ {
-            return 404;
-        }
-
         error_log "{{ nginx_app_error_log }}";
         access_log "{{ nginx_app_access_log }}"  main;
     }

ansible/roles/nginx/templates/nginx.conf

@@ -58,10 +58,6 @@ http {
             internal;
         }
 
-        location ~ \.php$ {
-            return 404;
-        }
-
         error_log "{{ nginx_app_error_log }}";
         access_log "{{ nginx_app_access_log }}"  main;
     }

docker-compose.yml

@@ -16,7 +16,7 @@ services:
 
   app:
     restart: always
-    image: buddy/repman:0.1.1
+    image: buddy/repman:0.1.2
     command: >
       bash -c 'bin/console cache:clear &&
       bin/console cache:warmup &&
@@ -31,7 +31,7 @@ services:
 
   consumer:
     restart: always
-    image: buddy/repman:0.1.1
+    image: buddy/repman:0.1.2
     command: ['bin/console', 'messenger:consume', 'async', '--limit=500']
     env_file: .env.docker
     volumes:
@@ -41,7 +41,7 @@ services:
 
   cron:
     restart: always
-    image: buddy/repman:0.1.1
+    image: buddy/repman:0.1.2
     command: >
       bash -c 'echo "*/5 * * * * /app/bin/console repman:proxy:sync-releases" | crontab - && crond -f -L /dev/stdout'
     env_file: .env.docker

docker/nginx/scripts/nginx.conf

@@ -72,10 +72,6 @@ http {
             internal;
         }
 
-        location ~ \.php$ {
-            return 404;
-        }
-
         error_log /var/log/nginx/repman_error.log;
         access_log /var/log/nginx/repman_access.log main;
     }

src/Controller/Organization/PackageController.php

@@ -78,7 +78,13 @@ public function packageNew(Organization $organization, Request $request, GithubA
                 return $response;
             }
         } catch (HttpException $exception) {
-            $this->addFlash('danger', sprintf('Failed to fetch repositories (reason: %s). Please try again. If the problem persists, try to remove Repman OAuth application from your provider and try again.', $exception->getMessage()));
+            $this->addFlash('danger', sprintf(
+                'Failed to fetch repositories (reason: %s).
+                Please try again. If the problem persists, try to remove Repman OAuth application
+                from your provider or unlink %s integration in your Profile and try again.',
+                $exception->getMessage(),
+                \ucfirst((string) $type)
+            ));
             $form->get('type')->setData(null);
         }
 

src/Controller/UserController.php

@@ -7,33 +7,39 @@
 use Buddy\Repman\Entity\User;
 use Buddy\Repman\Form\Type\User\ChangePasswordType;
 use Buddy\Repman\Message\User\ChangePassword;
+use Buddy\Repman\Message\User\RemoveOAuthToken;
 use Buddy\Repman\Message\User\RemoveUser;
 use Buddy\Repman\Message\User\SendConfirmToken;
+use Buddy\Repman\Query\User\UserQuery;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 final class UserController extends AbstractController
 {
+    private UserQuery $userQuery;
+
+    public function __construct(UserQuery $userQuery)
+    {
+        $this->userQuery = $userQuery;
+    }
+
     /**
      * @Route(path="/user", name="user_profile", methods={"GET","POST"})
      */
     public function profile(Request $request): Response
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
-
-        /** @var User */
-        $user = $this->getUser();
-
+        $oauthTokens = $this->userQuery->findAllOAuthTokens($this->getUser()->id()->toString());
         $form = $this->createForm(ChangePasswordType::class);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
 
             $this->dispatchMessage(new ChangePassword(
-                $user->id()->toString(),
+                $this->getUser()->id()->toString(),
                 $form->get('plainPassword')->getData()
             ));
             $this->addFlash('success', 'Your password has been changed');
@@ -43,7 +49,7 @@ public function profile(Request $request): Response
 
         return $this->render('user/profile.html.twig', [
             'form' => $form->createView(),
-            'is_user_confirmed' => $user->isEmailConfirmed(),
+            'oauth_tokens' => $oauthTokens,
         ]);
     }
 
@@ -53,10 +59,7 @@ public function profile(Request $request): Response
     public function remove(): Response
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
-
-        /** @var User */
-        $user = $this->getUser();
-        $this->dispatchMessage(new RemoveUser($user->id()->toString()));
+        $this->dispatchMessage(new RemoveUser($this->getUser()->id()->toString()));
         $this->addFlash('success', 'User has been successfully removed');
 
         return $this->redirectToRoute('index');
@@ -68,16 +71,32 @@ public function remove(): Response
     public function resendVerificationEmail(): Response
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
-
-        /** @var User */
-        $user = $this->getUser();
-
         $this->dispatchMessage(new SendConfirmToken(
-            $user->getEmail(),
-            $user->emailConfirmToken()
+            $this->getUser()->getEmail(),
+            $this->getUser()->emailConfirmToken()
         ));
         $this->addFlash('success', 'Email sent successfully');
 
         return $this->redirectToRoute('user_profile');
     }
+
+    /**
+     * @Route(path="/user/remove-oauth-token/{type}", name="user_remove_oauth_token", methods={"DELETE"}, requirements={"type"="github|gitlab|bitbucket|buddy"})
+     */
+    public function removeOAuthToken(string $type): Response
+    {
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
+        $this->dispatchMessage(new RemoveOAuthToken($this->getUser()->id()->toString(), $type));
+        $this->addFlash('success', sprintf('%s has been successfully unlinked.', \ucfirst($type)));
+
+        return $this->redirectToRoute('user_profile');
+    }
+
+    protected function getUser(): User
+    {
+        /** @var User $user */
+        $user = parent::getUser();
+
+        return $user;
+    }
 }

src/Entity/User.php

@@ -294,6 +294,15 @@ public function oauthToken(string $type): ?OAuthToken
         return null;
     }
 
+    public function removeOAuthToken(string $type): void
+    {
+        foreach ($this->oauthTokens as $oauthToken) {
+            if ($oauthToken->isType($type)) {
+                $this->oauthTokens->removeElement($oauthToken);
+            }
+        }
+    }
+
     /**
      * @return Option<string>
      */

src/Kernel.php

@@ -15,7 +15,7 @@ class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
 
-    public const REPMAN_VERSION = '0.1.1';
+    public const REPMAN_VERSION = '0.1.2';
     private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
 
     public function registerBundles(): iterable

src/Message/User/RemoveOAuthToken.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buddy\Repman\Message\User;
+
+final class RemoveOAuthToken
+{
+    private string $userId;
+    private string $type;
+
+    public function __construct(string $userId, string $type)
+    {
+        $this->userId = $userId;
+        $this->type = $type;
+    }
+
+    public function userId(): string
+    {
+        return $this->userId;
+    }
+
+    public function type(): string
+    {
+        return $this->type;
+    }
+}

src/MessageHandler/User/RemoveOAuthTokenHandler.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buddy\Repman\MessageHandler\User;
+
+use Buddy\Repman\Message\User\RemoveOAuthToken;
+use Buddy\Repman\Repository\UserRepository;
+use Ramsey\Uuid\Uuid;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+final class RemoveOAuthTokenHandler implements MessageHandlerInterface
+{
+    private UserRepository $users;
+
+    public function __construct(UserRepository $users)
+    {
+        $this->users = $users;
+    }
+
+    public function __invoke(RemoveOAuthToken $message): void
+    {
+        $user = $this->users->getById(Uuid::fromString($message->userId()));
+        $user->removeOAuthToken($message->type());
+    }
+}

src/Query/User/Model/OAuthToken.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buddy\Repman\Query\User\Model;
+
+final class OAuthToken
+{
+    private string $type;
+    private \DateTimeImmutable $createdAt;
+
+    public function __construct(string $type, \DateTimeImmutable $createdAt)
+    {
+        $this->type = $type;
+        $this->createdAt = $createdAt;
+    }
+
+    public function type(): string
+    {
+        return $this->type;
+    }
+
+    public function createdAt(): \DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+}

src/Query/User/Model/WebhookRequest.php

@@ -7,10 +7,10 @@
 final class WebhookRequest
 {
     private string $date;
-    private string $ip;
-    private string $userAgent;
+    private ?string $ip;
+    private ?string $userAgent;
 
-    public function __construct(string $date, string $ip, string $userAgent)
+    public function __construct(string $date, ?string $ip, ?string $userAgent)
     {
         $this->date = $date;
         $this->ip = $ip;
@@ -22,12 +22,12 @@ public function date(): string
         return $this->date;
     }
 
-    public function ip(): string
+    public function ip(): ?string
     {
         return $this->ip;
     }
 
-    public function userAgent(): string
+    public function userAgent(): ?string
     {
         return $this->userAgent;
     }

src/Query/User/UserQuery.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buddy\Repman\Query\User;
+
+use Buddy\Repman\Query\User\Model\OAuthToken;
+
+interface UserQuery
+{
+    /**
+     * @return OAuthToken[]
+     */
+    public function findAllOAuthTokens(string $userId): array;
+}