From d8950f7e2adfbca7f28c64f4e0637e00359f9539 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Thu, 7 Mar 2024 21:47:34 +0100
Subject: [PATCH] Reorder constructor arguments Use env variables to set google
client, project and secret Cleanup
---
Command/Calendar2Command.php | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/Command/Calendar2Command.php b/Command/Calendar2Command.php
index 0ddcd3f..c0a739f 100644
--- a/Command/Calendar2Command.php
+++ b/Command/Calendar2Command.php
@@ -60,22 +60,18 @@ class Calendar2Command extends Command {
/**
* {@inheritdoc}
- *
- * @param string $project The google project
- * @param string $client The google client
- * @param string $secret The google secret
*/
- public function __construct(ManagerRegistry $doctrine, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator, string $locale, string $project, string $client, string $secret) {
+ public function __construct(ManagerRegistry $doctrine, string $locale, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator) {
//Call parent constructor
- parent::__construct($doctrine, $router, $slugger, $translator, $locale);
+ parent::__construct($doctrine, $locale, $router, $slugger, $translator);
//Set google client
$this->client = new Client(
[
- 'application_name' => $project,
- 'client_id' => $client,
- 'client_secret' => $secret,
- 'redirect_uri' => $this->router->generate('rapsys_air_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+ 'application_name' => $_ENV['RAPSYSAIR_GOOGLE_PROJECT'],
+ 'client_id' => $_ENV['RAPSYSAIR_GOOGLE_CLIENT'],
+ 'client_secret' => $_ENV['RAPSYSAIR_GOOGLE_SECRET'],
+ 'redirect_uri' => $this->router->generate('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
'scopes' => $this->scopes,
'access_type' => 'offline',
#'login_hint' => $user->getMail(),
--
2.41.3