Merge pull request #697 from automatisch/refactor-is-still-verified

refactor: abstract exception capture out of is-still-verified

packages/backend/src/apps/deepl/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import verifyCredentials from './verify-credentials';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  await verifyCredentials($);
-    await verifyCredentials($);
+  return true;
-    return true;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/discord/auth/is-still-verified.ts

@@ -2,13 +2,9 @@ import { IGlobalVariable } from '@automatisch/types';
 import getCurrentUser from '../common/get-current-user';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  await getCurrentUser($);
-    await getCurrentUser($);
 
-    return true;
+  return true;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/flickr/auth/is-still-verified.ts

@@ -1,17 +1,13 @@
 import { IGlobalVariable } from '@automatisch/types';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  const params = {
-    const params = {
+    method: 'flickr.test.login',
-      method: 'flickr.test.login',
+    format: 'json',
-      format: 'json',
+    nojsoncallback: 1,
-      nojsoncallback: 1,
+  };
-    };
+  const response = await $.http.get('/rest', { params });
-    const response = await $.http.get('/rest', { params });
+  return !!response.data.user.id;
-    return !!response.data.user.id;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/github/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import getCurrentUser from '../common/get-current-user';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  const user = await getCurrentUser($);
-    const user = await getCurrentUser($);
+  return !!user.id;
-    return !!user.id;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/salesforce/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import getCurrentUser from '../common/get-current-user';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  const user = await getCurrentUser($);
-    const user = await getCurrentUser($);
+  return !!user;
-    return !!user;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/slack/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import getCurrentUser from '../common/get-current-user';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  const user = await getCurrentUser($);
-    const user = await getCurrentUser($);
+  return !!user.id;
-    return !!user.id;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/smtp/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import verifyCredentials from './verify-credentials';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  await verifyCredentials($);
-    await verifyCredentials($);
+  return true;
-    return true;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/twilio/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import verifyCredentials from './verify-credentials';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  await verifyCredentials($);
-    await verifyCredentials($);
+  return true;
-    return true;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/apps/twitter/auth/is-still-verified.ts

@@ -2,12 +2,8 @@ import { IGlobalVariable } from '@automatisch/types';
 import getCurrentUser from '../common/get-current-user';
 
 const isStillVerified = async ($: IGlobalVariable) => {
-  try {
+  const user = await getCurrentUser($);
-    const user = await getCurrentUser($);
+  return !!user;
-    return !!user;
-  } catch (error) {
-    return false;
-  }
 };
 
 export default isStillVerified;

packages/backend/src/graphql/queries/test-connection.ts

@@ -22,7 +22,12 @@ const testConnection = async (
   const app = await App.findOneByKey(connection.key, false);
   const $ = await globalVariable({ connection, app });
 
-  const isStillVerified = await app.auth.isStillVerified($);
+  let isStillVerified;
+  try {
+    isStillVerified = !!(await app.auth.isStillVerified($));
+  } catch {
+    isStillVerified = false;
+  }
 
   connection = await connection.$query().patchAndFetch({
     formattedData: connection.formattedData,