Update routes to match rapsys_user one

[airbundle] / Command / CalendarCommand.php

diff --git a/Command/CalendarCommand.php b/Command/CalendarCommand.php
index 9a0e046c78fbae82c9183b0c2580edb44564096a..f22fb091fce435767252c1dcd5a960a615db2dad 100644 (file)
--- a/Command/CalendarCommand.php
+++ b/Command/CalendarCommand.php
@@ -108,7 +108,7 @@ class CalendarCommand extends Command {
                //Retrieve cache object
                //XXX: by default stored in /tmp/symfony-cache/@/W/3/6SEhFfeIW4UMDlAII+Dg
                //XXX: stored in %kernel.project_dir%/var/cache/airlibre/0/P/IA20X0K4dkMd9-+Ohp9Q
                //Retrieve cache object
                //XXX: by default stored in /tmp/symfony-cache/@/W/3/6SEhFfeIW4UMDlAII+Dg
                //XXX: stored in %kernel.project_dir%/var/cache/airlibre/0/P/IA20X0K4dkMd9-+Ohp9Q

-               $cache = new FilesystemAdapter($this->config['cache']['namespace'], $this->config['cache']['lifetime'], $this->config['cache']['directory']);
+               $cache = new FilesystemAdapter($this->config['cache']['namespace'], $this->config['cache']['lifetime'], $this->config['path']['cache']);

 
                //Retrieve calendars
                $cacheCalendars = $cache->getItem('calendars');
 
                //Retrieve calendars
                $cacheCalendars = $cache->getItem('calendars');


@@ -122,25 +122,6 @@ class CalendarCommand extends Command {
                //Retrieve calendars
                $calendars = $cacheCalendars->get();
 
                //Retrieve calendars
                $calendars = $cacheCalendars->get();
 

-               //XXX: calendars content
-               #var_export($calendars);
-               #$debug = [
-               #       '635317121880-usqucmne71jnmprl8br9khh2om4n8cmh.apps.googleusercontent.com' => [
-               #               'project' => 'calendar-317315',
-               #               'secret' => 'HRsKd4FIc9gxQHM4IoBWnlbD',
-               #               'redirect' => 'https://airlibre.eu/calendar/callback',
-               #               'tokens' => [
-               #                       'ya29.a0ARrdaM_cNpedJ-B3irC76_0-C7cfF-WmMh0smAs4m7cSvBChnniWr-e79q0IfAbh5DSG4FlHbCMvmaYb7xX4V45PujT2U4InZmpHfspiPv-QeR4XeZJp7bLXwnw7A4M0imeeYyQcwCW7GJ8O7dGLBQlBZAvt_Q' => [
-               #                               'calendar' => 'airlibre',
-               #                               'expire' => 3599,
-               #                               'scope' => 'https://www.googleapis.com/auth/calendar https://www.googleapis.com/auth/calendar.events',
-               #                               'type' => 'Bearer',
-               #                               'created' => 1625417137,
-               #                       ],
-               #               ],
-               #       ],
-               #];
-

                //Check expired token
                foreach($calendars as $clientId => $client) {
                        //Get google client
                //Check expired token
                foreach($calendars as $clientId => $client) {
                        //Get google client


@@ -163,10 +144,7 @@ class CalendarCommand extends Command {
                                //With expired token
                                if ($exp = $googleClient->isAccessTokenExpired()) {
                                        //Refresh token
                                //With expired token
                                if ($exp = $googleClient->isAccessTokenExpired()) {
                                        //Refresh token

-                                       if ($googleClient->getRefreshToken()) {
-                                               //Retrieve refreshed token
-                                               $googleToken = $googleClient->fetchAccessTokenWithRefreshToken($googleClient->getRefreshToken());
-
+                                       if (($refreshToken = $googleClient->getRefreshToken()) && ($googleToken = $googleClient->fetchAccessTokenWithRefreshToken($refreshToken)) && empty($googleToken['error'])) {

                                                //Add refreshed token
                                                $calendars[$clientId]['tokens'][$googleToken['access_token']] = [
                                                        'calendar' => $token['calendar'],
                                                //Add refreshed token
                                                $calendars[$clientId]['tokens'][$googleToken['access_token']] = [
                                                        'calendar' => $token['calendar'],


@@ -190,7 +168,15 @@ class CalendarCommand extends Command {
                                                        unset($calendars[$clientId]);
                                                }
 
                                                        unset($calendars[$clientId]);
                                                }
 

+                                               //Save calendars
+                                               $cacheCalendars->set($calendars);
+
+                                               //Save calendar
+                                               $cache->save($cacheCalendars);
+

                                                //Drop token and report
                                                //Drop token and report

+                                               //XXX: submit app to avoid expiration
+                                               //XXX: see https://console.cloud.google.com/apis/credentials/consent?project=calendar-317315

                                                echo 'Token '.$tokenId.' for calendar '.$token['calendar'].' has expired and is not refreshable'."\n";
 
                                                //Return failure
                                                echo 'Token '.$tokenId.' for calendar '.$token['calendar'].' has expired and is not refreshable'."\n";
 
                                                //Return failure


@@ -294,6 +280,7 @@ class CalendarCommand extends Command {
                                foreach($sessions as $sessionId => $session) {
                                        //Init shared properties
                                        //TODO: validate for constraints here ??? https://developers.google.com/calendar/api/guides/extended-properties
                                foreach($sessions as $sessionId => $session) {
                                        //Init shared properties
                                        //TODO: validate for constraints here ??? https://developers.google.com/calendar/api/guides/extended-properties

+                                       //TODO: drop shared as unused ???

                                        $shared = [
                                                'gps' => $session['l_latitude'].','.$session['l_longitude']
                                        ];
                                        $shared = [
                                                'gps' => $session['l_latitude'].','.$session['l_longitude']
                                        ];


@@ -450,7 +437,7 @@ class CalendarCommand extends Command {
                                                        $end->setDateTime($session['stop']->format(\DateTime::ISO8601));
 
                                                        try {
                                                        $end->setDateTime($session['stop']->format(\DateTime::ISO8601));
 
                                                        try {

-                                                               //Insert the event
+                                                               //Update the event

                                                                $updatedEvent = $googleCalendar->events->update($token['calendar'], $event->getId(), $event);
                                                        //Catch exception
                                                        } catch(\Google\Service\Exception $e) {
                                                                $updatedEvent = $googleCalendar->events->update($token['calendar'], $event->getId(), $event);
                                                        //Catch exception
                                                        } catch(\Google\Service\Exception $e) {