From 01bb4cd0e2544c2fe969776e236d03fc7035c88f Mon Sep 17 00:00:00 2001
From: Jim LAURIE <j.laurie6993@gmail.com>
Date: Thu, 25 Jan 2018 12:26:09 +0100
Subject: [PATCH] Remove last else condition

---
 .../services/Providers.js                     | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/services/Providers.js b/packages/strapi-plugin-users-permissions/services/Providers.js
index 9119fc9957..e9b5887334 100644
--- a/packages/strapi-plugin-users-permissions/services/Providers.js
+++ b/packages/strapi-plugin-users-permissions/services/Providers.js
@@ -60,40 +60,39 @@ exports.connect = (provider, query) => {
 
       // We need at least the mail.
       if (!profile.email) {
-        reject([{
+        return reject([{
           message: 'Email was not available.'
         }, null]);
-      } else {
-        try {
-          const user = await strapi.query('user', 'users-permissions').findOne({email: profile.email});
+      } 
+      
+      try {
+        const user = await strapi.query('user', 'users-permissions').findOne({email: profile.email});
 
-          if (!strapi.plugins['users-permissions'].config.advanced.allow_register) {
-            return resolve([null, [{ messages: [{ id: 'Auth.advanced.allow_register' }] }], 'Register action is actualy not available.']);
-          }
-
-          if (user && user.provider === provider) {
-            return resolve([null, [{ messages: [{ id: 'Auth.form.error.email.taken' }] }], 'Email is already taken.']);
-          }
-
-          if (user && user.provider !== provider && strapi.plugins['users-permissions'].config.advanced.unique_email) {
-            return resolve([null, [{ messages: [{ id: 'Auth.form.error.email.taken' }] }], 'Email is already taken.']);
-          }
-
-          if (!user || _.get(user, 'provider') !== provider) {
-            // Create the new user.
-            const params = _.assign(profile, {
-              provider: provider
-            });
-
-            const createdUser = await strapi.query('user', 'users-permissions').create(params);
-
-            return resolve([createdUser, null]);
-          }
-
-          resolve([user, null]);
-        } catch (err) {
-          reject([null, err]);
+        if (!strapi.plugins['users-permissions'].config.advanced.allow_register) {
+          return resolve([null, [{ messages: [{ id: 'Auth.advanced.allow_register' }] }], 'Register action is actualy not available.']);
         }
+
+        if (user && user.provider === provider) {
+          return resolve([null, [{ messages: [{ id: 'Auth.form.error.email.taken' }] }], 'Email is already taken.']);
+        }
+
+        if (user && user.provider !== provider && strapi.plugins['users-permissions'].config.advanced.unique_email) {
+          return resolve([null, [{ messages: [{ id: 'Auth.form.error.email.taken' }] }], 'Email is already taken.']);
+        }
+
+        if (!user || _.get(user, 'provider') !== provider) {
+          // Create the new user.
+          const params = _.assign(profile, {
+            provider: provider
+          });
+
+          const createdUser = await strapi.query('user', 'users-permissions').create(params);
+
+          return resolve([createdUser, null]);
+        }
+        resolve([user, null]);
+      } catch (err) {
+        reject([null, err]);
       }
     });
   });