Gmail API Support

data/google-crawlers.json

@@ -1,5 +1,5 @@
 {
-    "creationTime": "2024-05-28T22:00:41.000000",
+    "creationTime": "2024-07-02T22:00:37.000000",
     "prefixes": [
         {
             "ipv6Prefix": "2001:4860:4801:2008::/64"
@@ -55,6 +55,9 @@
         {
             "ipv6Prefix": "2001:4860:4801:201e::/64"
         },
+        {
+            "ipv6Prefix": "2001:4860:4801:201f::/64"
+        },
         {
             "ipv6Prefix": "2001:4860:4801:2020::/64"
         },
@@ -310,6 +313,9 @@
         {
             "ipv6Prefix": "2001:4860:4801:2093::/64"
         },
+        {
+            "ipv4Prefix": "108.177.2.0/27"
+        },
         {
             "ipv4Prefix": "192.178.17.0/27"
         },

lib/account.js

@@ -179,6 +179,7 @@ class Account {
             switch (key) {
                 case 'notifyFrom':
                 case 'syncFrom':
+                case 'lastWatch':
                     // Date object
                     if (accountData[key]) {
                         if (accountData[key] === 'null') {
@@ -224,6 +225,7 @@ class Account {
                 // generic JSON values
                 case 'webhooksCustomHeaders':
                 case 'subconnections':
+                case 'watchResponse':
                     try {
                         let value = JSON.parse(accountData[key]);
                         if (value === null) {
@@ -328,6 +330,7 @@ class Account {
             switch (key) {
                 case 'notifyFrom':
                 case 'syncFrom':
+                case 'lastWatch':
                     // Date object
                     if (accountData[key] === 'now') {
                         result[key] = new Date().toISOString();
@@ -362,6 +365,7 @@ class Account {
                 // generic JSON values
                 case 'subconnections':
                 case 'webhooksCustomHeaders':
+                case 'watchResponse':
                     try {
                         result[key] = JSON.stringify(accountData[key]);
                     } catch (err) {
@@ -523,7 +527,7 @@ class Account {
     async update(accountData) {
         let oldAccountData = await this.loadAccountData(accountData.account);
 
-        if (accountData.oauth2 && accountData.oauth2.provider) {
+        if (accountData.oauth2?.provider) {
             // check if this OAuth2 provider exists
             let oauth2App = await oauth2Apps.get(accountData.oauth2.provider);
             if (!oauth2App) {
@@ -536,9 +540,9 @@ class Account {
         let removeProvider;
         let addProvider;
 
-        if (accountData.oauth2 && accountData.oauth2.provider) {
+        if (accountData.oauth2?.provider) {
             addProvider = accountData.oauth2.provider;
-            if (oldAccountData.oauth2 && oldAccountData.oauth2.provider && oldAccountData.oauth2.provider !== accountData.oauth2.provider) {
+            if (oldAccountData.oauth2?.provider && oldAccountData.oauth2.provider !== accountData.oauth2.provider) {
                 removeProvider = oldAccountData.oauth2.provider;
             }
         }
@@ -566,10 +570,25 @@ class Account {
 
         if (addProvider && !LEGACY_KEYS.includes(addProvider)) {
             pipeline = pipeline.sadd(`${REDIS_PREFIX}oapp:a:${addProvider}`, this.account);
+            if (accountData.oauth2?.auth?.user) {
+                // check if already exists
+                let existingAppBinding = await this.redis.hget(`${REDIS_PREFIX}oapp:h:${accountData.oauth2.provider}`, accountData.oauth2.auth?.user);
+                if (existingAppBinding && existingAppBinding !== this.account) {
+                    let message = 'Another account for the same OAuth2 user already exists';
+                    let error = Boom.boomify(new Error(message), { statusCode: 400 });
+                    error.output.payload.code = 'AccountAlreadyExists';
+                    error.output.payload.existingAccount = existingAppBinding;
+                    throw error;
+                }
+                pipeline = pipeline.hset(`${REDIS_PREFIX}oapp:h:${addProvider}`, accountData.oauth2?.auth?.user, this.account);
+            }
         }
 
         if (removeProvider) {
             pipeline = pipeline.srem(`${REDIS_PREFIX}oapp:a:${removeProvider}`, this.account);
+            if (oldAccountData.oauth2?.auth?.user) {
+                pipeline = pipeline.hdel(`${REDIS_PREFIX}oapp:h:${removeProvider}`, oldAccountData.oauth2?.auth?.user);
+            }
         }
 
         let [[err, result]] = await pipeline.exec();
@@ -680,6 +699,18 @@ class Account {
 
         if (accountData.oauth2 && accountData.oauth2.provider) {
             pipeline = pipeline.sadd(`${REDIS_PREFIX}oapp:a:${accountData.oauth2.provider}`, this.account);
+            if (accountData.oauth2.auth?.user) {
+                // check if already exists
+                let existingAppBinding = await this.redis.hget(`${REDIS_PREFIX}oapp:h:${accountData.oauth2.provider}`, accountData.oauth2.auth?.user);
+                if (existingAppBinding && existingAppBinding !== this.account) {
+                    let message = 'Another account for the same OAuth2 user already exists';
+                    let error = Boom.boomify(new Error(message), { statusCode: 400 });
+                    error.output.payload.code = 'AccountAlreadyExists';
+                    error.output.payload.existingAccount = existingAppBinding;
+                    throw error;
+                }
+                pipeline = pipeline.hset(`${REDIS_PREFIX}oapp:h:${accountData.oauth2.provider}`, accountData.oauth2.auth?.user, this.account);
+            }
         }
 
         let result = await pipeline.exec();
@@ -694,6 +725,17 @@ class Account {
         if (result[0][1] && result[0][1].account) {
             // existing user
             state = 'existing';
+
+            try {
+                let oldAccountData = this.unserializeAccountData(result[0][1]);
+                if (oldAccountData?.oauth2?.provider && oldAccountData?.oauth2?.auth?.user && oldAccountData.oauth2.provider !== accountData.oauth2?.provider) {
+                    // remove previous entry if provider was updated
+                    await this.redis.hdel(`${REDIS_PREFIX}oapp:h:${oldAccountData.oauth2.provider}`, oldAccountData.oauth2.auth?.user);
+                }
+            } catch (err) {
+                // ignore
+            }
+
             await this.call({
                 cmd: 'update',
                 account: this.account,
@@ -737,8 +779,11 @@ class Account {
             .del(`${REDIS_PREFIX}tpl:${this.account}:i`) // stored templates index
             .del(`${REDIS_PREFIX}tpl:${this.account}:c`); // stored templates index
 
-        if (accountData.oauth2 && accountData.oauth2.provider) {
+        if (accountData.oauth2?.provider) {
             pipeline = pipeline.srem(`${REDIS_PREFIX}oapp:a:${accountData.oauth2.provider}`, this.account);
+            if (accountData.oauth2?.auth?.user) {
+                pipeline = pipeline.hdel(`${REDIS_PREFIX}oapp:h:${accountData.oauth2.provider}`, accountData.oauth2.auth?.user);
+            }
         }
 
         let result = await pipeline.exec();

lib/api-client/base-client.js

@@ -84,6 +84,10 @@ class BaseClient {
         return null;
     }
 
+    async close() {
+        return null;
+    }
+
     async delete() {
         return null;
     }