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

This commit is contained in:
Ali BARIN
2022-11-08 19:48:54 +01:00
parent dbceed563a
commit d2b0a57064
10 changed files with 29 additions and 60 deletions

View File

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

View File

@@ -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;
} catch (error) {
return false;
}
return true;
};
export default isStillVerified;

View File

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

View File

@@ -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($);
return !!user.id;
} catch (error) {
return false;
}
const user = await getCurrentUser($);
return !!user.id;
};
export default isStillVerified;

View File

@@ -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($);
return !!user;
} catch (error) {
return false;
}
const user = await getCurrentUser($);
return !!user;
};
export default isStillVerified;

View File

@@ -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($);
return !!user.id;
} catch (error) {
return false;
}
const user = await getCurrentUser($);
return !!user.id;
};
export default isStillVerified;

View File

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

View File

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

View File

@@ -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($);
return !!user;
} catch (error) {
return false;
}
const user = await getCurrentUser($);
return !!user;
};
export default isStillVerified;

View File

@@ -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,