X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/db4304d58887c81d0534d7714f962d5712449f02..741cdfe32a8529ef11e24ddccafd0013289c56e5:/Controller/UserController.php?ds=sidebyside

diff --git a/Controller/UserController.php b/Controller/UserController.php
index e5d0fc0..2e30fdc 100644
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -157,9 +157,9 @@ class UserController extends BaseUserController {
 			//Get google client
 			$googleClient = new \Google\Client(
 				[
-					'application_name' => $request->server->get('RAPSYSAIR_GOOGLE_PROJECT'),
-					'client_id' => $request->server->get('RAPSYSAIR_GOOGLE_CLIENT'),
-					'client_secret' => $request->server->get('RAPSYSAIR_GOOGLE_SECRET'),
+					'application_name' => $_ENV['RAPSYSAIR_GOOGLE_PROJECT'],
+					'client_id' => $_ENV['GOOGLE_CLIENT_ID'],
+					'client_secret' => $_ENV['GOOGLE_CLIENT_SECRET'],
 					'redirect_uri' => $this->generateUrl('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
 					'scopes' => self::googleScopes,
 					'access_type' => 'offline',
@@ -218,18 +218,39 @@ class UserController extends BaseUserController {
 								)
 							);
 
+							//Set calendar mails
+							$cmails = [];
+
 							//Iterate on each google token calendars
 							foreach($googleToken->getGoogleCalendars() as $googleCalendar) {
+								//Add calendar mail
+								$cmails[] = $googleCalendar->getMail();
+
 								//Remove google token calendar
 								$this->manager->remove($googleCalendar);
 							}
 
+							//Log unlinked google token infos
+							$this->logger->emergency(
+								$this->translator->trans(
+									'expired: mail=%mail% gmail=%gmail% cmails=%cmails% locale=%locale%',
+									[
+										'%mail%' => $googleToken->getUser()->getMail(),
+										'%gmail%' => $googleToken->getMail(),
+										'%cmails' => implode(',', $cmails),
+										'%locale%' => $request->getLocale()
+									]
+								)
+							);
+
 							//Remove google token
 							$this->manager->remove($googleToken);
 
 							//Flush to delete it
 							$this->manager->flush();
 
+							//TODO: warn user by mail ?
+
 							//Skip to next token
 							continue;
 						}
@@ -289,8 +310,9 @@ class UserController extends BaseUserController {
 						);
 					//Catch exception
 					} catch(\Google\Service\Exception $e) {
-						//With 401 code
-						if ($e->getCode() == 401) {
+						//With 401 or code
+						//XXX: see https://cloud.google.com/apis/design/errors
+						if ($e->getCode() == 401 || $e->getCode() == 403) {
 							//Add error in flash message
 							$this->addFlash(
 								'error',
@@ -300,18 +322,39 @@ class UserController extends BaseUserController {
 								)
 							);
 
+							//Set calendar mails
+							$cmails = [];
+
 							//Iterate on each google token calendars
 							foreach($googleToken->getGoogleCalendars() as $googleCalendar) {
+								//Add calendar mail
+								$cmails[] = $googleCalendar->getMail();
+
 								//Remove google token calendar
 								$this->manager->remove($googleCalendar);
 							}
 
+							//Log unlinked google token infos
+							$this->logger->emergency(
+								$this->translator->trans(
+									'denied: mail=%mail% gmail=%gmail% cmails=%cmails% locale=%locale%',
+									[
+										'%mail%' => $googleToken->getUser()->getMail(),
+										'%gmail%' => $googleToken->getMail(),
+										'%cmails' => implode(',', $cmails),
+										'%locale%' => $request->getLocale()
+									]
+								)
+							);
+
 							//Remove google token
 							$this->manager->remove($googleToken);
 
 							//Flush to delete it
 							$this->manager->flush();
 
+							//TODO: warn user by mail ?
+
 							//Skip to next token
 							continue;
 						}
@@ -341,12 +384,8 @@ class UserController extends BaseUserController {
 						}
 					}
 
-					//XXX: TODO: remove DEBUG
-					#header('Content-Type: text/plain');
-
-					//TODO: add feature to filter synchronized data (OrganizerId/DanceId)
 					//TODO: add feature for alerts (-30min/-1h) ?
-					//[Direct link to calendar ?][Direct link to calendar settings ?][Alerts][Remove]
+					//TODO: [Direct link to calendar ?][Direct link to calendar settings ?][Alerts][Remove]
 
 					//Create the CalendarType form and give the proper parameters
 					$form = $this->factory->createNamed('calendar_'.$googleShortMail, 'Rapsys\AirBundle\Form\CalendarType', $formData, [
@@ -576,9 +615,9 @@ class UserController extends BaseUserController {
 		//Get google client
 		$googleClient = new \Google\Client(
 			[
-				'application_name' => $request->server->get('RAPSYSAIR_GOOGLE_PROJECT'),
-				'client_id' => $request->server->get('RAPSYSAIR_GOOGLE_CLIENT'),
-				'client_secret' => $request->server->get('RAPSYSAIR_GOOGLE_SECRET'),
+				'application_name' => $_ENV['RAPSYSAIR_GOOGLE_PROJECT'],
+				'client_id' => $_ENV['GOOGLE_CLIENT_ID'],
+				'client_secret' => $_ENV['GOOGLE_CLIENT_SECRET'],
 				'redirect_uri' => $this->generateUrl('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
 				'scopes' => self::googleScopes,
 				'access_type' => 'offline',