Fixes: #1680 :Google Sync Contacts API turned down since January 19, 2022. We...

Fixes: #1680 :Google Sync Contacts API turned down since January 19, 2022. We have to switch to Pepole API

pkg/vtiger/modules/Google/modules/Google/helpers/Utils.php

@@ -274,6 +274,9 @@ class Google_Utils_Helper {
         $result = $db->pquery($sql,array($user->getId()));
         for($i=0;$i<$db->num_rows($result);$i++) {  
             $row = $db->fetch_row($result);
+            if(in_array($row['google_field'], array('gd:website', 'content'))) {
+                continue;
+            }
             $fieldmapping[$row['vtiger_field']] = array(
                 'google_field_name' => $row['google_field'],
                 'google_field_type' => $row['google_field_type'],

pkg/vtiger/modules/Google/modules/Google/models/Contacts.php

@@ -16,7 +16,7 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <string> id
      */
     public function getId() {
-        return $this->data['entity']['id']['$t'];
+        return $this->data['entity']['resourceName'] ? $this->data['entity']['resourceName'] : $this->data['entity']['id']['$t'];
     }
 
     /**
@@ -24,11 +24,13 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <date> modified time 
      */
     public function getModifiedTime() {
-        return $this->vtigerFormat($this->data['entity']['updated']['$t']);
+        $updateTime = $this->data['entity']['metadata']['sources'][0]['updateTime'] ? $this->data['entity']['metadata']['sources'][0]['updateTime'] : $this->data['entity']['updated']['$t'];
+        $updateTime = $updateTime? $updateTime : str_replace(' ', 'T', date('Y-m-d H:i:s'));
+        return $this->vtigerFormat($updateTime);
     }
     
     function getNamePrefix() {
-        $namePrefix = $this->data['entity']['gd$name']['gd$namePrefix']['$t'];
+        $namePrefix = $this->data['entity']['names'][0]['honorificPrefix'];
         return $namePrefix;
     }
 
@@ -37,7 +39,7 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <string> $first name
      */
     function getFirstName() {
-        $fname = $this->data['entity']['gd$name']['gd$givenName']['$t'];
+        $fname = $this->data['entity']['names'][0]['givenName'];
         return $fname;
     }
 
@@ -46,7 +48,7 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <string> Last name
      */
     function getLastName() {
-        $lname = $this->data['entity']['gd$name']['gd$familyName']['$t'];
+        $lname = $this->data['entity']['names'][0]['familyName'];
         return $lname;
     }
 
@@ -55,15 +57,12 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <array> emails
      */
     function getEmails() {
-        $arr = $this->data['entity']['gd$email'];
+        $arr = $this->data['entity']['emailAddresses'];
         $emails = array();
         if (is_array($arr)) {
             foreach ($arr as $email) {
-                if(isset($email['rel']))
-                    $labelEmail = parse_url($email['rel'], PHP_URL_FRAGMENT);
-                else
-                    $labelEmail = $email['label'];
-                $emails[$labelEmail] = $email['address'];
+                $labelEmail = $email['type'];
+                $emails[$labelEmail] = $email['value'];
             }
         }
         return $emails;
@@ -74,15 +73,12 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <array> phone numbers
      */
     function getPhones() {
-        $arr = $this->data['entity']['gd$phoneNumber'];
+        $arr = $this->data['entity']['phoneNumbers'];
         $phones = array();
         if(is_array($arr)) {
             foreach ($arr as $phone) {
-                $phoneNo = $phone['$t'];
-                if(isset($phone['rel']))
-                    $labelPhone = parse_url($phone['rel'], PHP_URL_FRAGMENT);
-                else
-                    $labelPhone = $phone['label'];
+                $phoneNo = $phone['value'];
+                $labelPhone = $phone['type'];
                 $phones[$labelPhone] = $phoneNo;
             }
         }
@@ -94,23 +90,21 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
      * @return <array> Addresses
      */
     function getAddresses() {
-        $arr = $this->data['entity']['gd$structuredPostalAddress'];
+        $arr = $this->data['entity']['addresses'];
         $addresses = array();
         if(is_array($arr)) {
             foreach ($arr as $address) {
                 $structuredAddress = array(
-                    'street' => $address['gd$street']['$t'],
-                    'pobox' => $address['gd$pobox']['$t'],
-                    'postcode' => $address['gd$postcode']['$t'],
-                    'city' => $address['gd$city']['$t'],
-                    'region' => $address['gd$region']['$t'],
-                    'country' => $address['gd$country']['$t'],
-                    'formattedAddress' => $address['gd$formattedAddress']['$t']
+                    'street' => $address['streetAddress'],
+                    'pobox' => $address['poBox'],
+                    'postcode' => $address['postalCode'],
+                    'city' => $address['city'],
+                    'region' => $address['region'],
+                    'country' => $address['country'],
+                    'formattedAddress' => $address['formattedValue']
                 );
-                if(isset($address['rel']))
-                    $labelAddress = parse_url($address['rel'], PHP_URL_FRAGMENT);
-                else
-                    $labelAddress = $address['label'];
+                $labelAddress = $address['type'];
+                $addresses[$labelAddress] = $structuredAddress;
                 $addresses[$labelAddress] = $structuredAddress;
             }
         }
@@ -119,7 +113,7 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
     
     function getUserDefineFieldsValues() {
         $fieldValues = array();
-        $userDefinedFields = $this->data['entity']['gContact$userDefinedField'];
+        $userDefinedFields = $this->data['entity']['userDefined'];
         if(is_array($userDefinedFields) && php7_count($userDefinedFields)) {
             foreach($userDefinedFields as $userDefinedField) {
                 $fieldName = $userDefinedField['key'];
@@ -129,33 +123,26 @@ class Google_Contacts_Model extends WSAPP_SyncRecordModel {
         return $fieldValues;
     }
     
-    function getUrlFields() {
-        $websiteFields = $this->data['entity']['gContact$website'];
-        $urls = array();
-        if(is_array($websiteFields)) {
-            foreach($websiteFields as $website) {
-                $url = $website['href'];
-                if(isset($website['rel'])) 
-                    $fieldName = $website['rel'];
-                else
-                    $fieldName = $website['label'];
-                $urls[$fieldName] = $url;
-            }
-        }
-        return $urls;
-    }
+    
     
     function getBirthday() {
-        return $this->data['entity']['gContact$birthday']['when'];
+        if($this->data['entity']['birthdays'][0]['date']) {
+            $birthDate = $this->data['entity']['birthdays'][0]['date']['year'].'-'.$this->data['entity']['birthdays'][0]['date']['month'].'-'.$this->data['entity']['birthdays'][0]['date']['day'];
+        } else {
+            $date = $this->data['entity']['birthdays'][0]['text'];
+            $date = explode('/', $date);
+            $birthDate = $date[2].'-'.$date[0].'-'.$date[1];            
+        }
+        return $birthDate;
     }
     
     function getTitle() {
-        return $this->data['entity']['gd$organization'][0]['gd$orgTitle']['$t'];
+        return $this->data['entity']['organizations'][0]['title'];
     }
     
     function getAccountName($userId) {
         $description = false;
-        $orgName = $this->data['entity']['gd$organization'][0]['gd$orgName']['$t'];
+        $orgName = $this->data['entity']['organizations'][0]['name'];
         if(empty($orgName)) {
             $contactsModel = Vtiger_Module_Model::getInstance('Contacts');
             $accountFieldInstance = Vtiger_Field_Model::getInstance('account_id', $contactsModel);