Sfoglia il codice sorgente

Fix db error handling

Pouria Ezzati 7 anni fa
parent
commit
b2a1a1466e
2 ha cambiato i file con 11 aggiunte e 11 eliminazioni
  1. 8 8
      server/db/url.js
  2. 3 3
      server/db/user.js

+ 8 - 8
server/db/url.js

@@ -55,7 +55,7 @@ exports.createShortUrl = params =>
           shortUrl: generateShortUrl(data.id, params.user.domain),
         });
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.createVisit = params =>
@@ -95,7 +95,7 @@ exports.createVisit = params =>
         const url = records.length && records[0].get('l').properties;
         resolve(url);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.findUrl = ({ id, domain, target }) =>
@@ -130,7 +130,7 @@ exports.findUrl = ({ id, domain, target }) =>
           }));
         resolve(url);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.getCountUrls = ({ user }) =>
@@ -201,7 +201,7 @@ exports.getCustomDomain = ({ customDomain }) =>
         const data = records.length && records[0].get('u').properties;
         resolve(data);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.setCustomDomain = ({ user, customDomain }) =>
@@ -225,7 +225,7 @@ exports.setCustomDomain = ({ user, customDomain }) =>
         const data = records.length && records[0].get('d').properties;
         resolve(data);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.deleteCustomDomain = ({ user }) =>
@@ -242,7 +242,7 @@ exports.deleteCustomDomain = ({ user }) =>
         const data = records.length && records[0].get('u').properties;
         resolve(data);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.deleteUrl = ({ id, domain, user }) =>
@@ -272,7 +272,7 @@ exports.deleteUrl = ({ id, domain, user }) =>
         const data = records.length && records[0].get('u').properties;
         resolve(data);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 /* Collecting stats */
@@ -410,7 +410,7 @@ exports.getStats = ({ id, domain, user }) =>
 
         return resolve(response);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.urlCountFromDate = ({ date, email }) =>

+ 3 - 3
server/db/user.js

@@ -94,7 +94,7 @@ exports.changePassword = ({ email, password }) =>
         const user = res.records.length && res.records[0].get('u').properties;
         return resolve(user);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.generateApiKey = ({ email }) =>
@@ -113,7 +113,7 @@ exports.generateApiKey = ({ email }) =>
         const newApikey = res.records.length && res.records[0].get('u').properties.apikey;
         return resolve({ apikey: newApikey });
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.requestPasswordReset = ({ email }) =>
@@ -140,7 +140,7 @@ exports.requestPasswordReset = ({ email }) =>
         const user = res.records.length && res.records[0].get('u').properties;
         return resolve(user);
       })
-      .catch(() => session.close() && reject);
+      .catch(err => session.close() || reject(err));
   });
 
 exports.resetPassword = ({ resetPasswordToken }) =>