worknenjoy
diff --git a/‎.env.example‎
Lines changed: 2 additions & 0 deletions b/‎.env.example‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎config/passport.js‎
Lines changed: 22 additions & 28 deletions b/‎config/passport.js‎
Lines changed: 22 additions & 28 deletions
diff --git a/‎frontend/.babelrc‎
Lines changed: 5 additions & 4 deletions b/‎frontend/.babelrc‎
Lines changed: 5 additions & 4 deletions
@@ -28,6 +28,8 @@ SECRET_PHRASE=123
 STRIPE_KEY=
 STRIPE_PUBKEY=
 
+GOOGLE_RECAPTCHA_SITE_KEY=
+
 ## Docker compose - local environment settings.
 POSTGRES_PASSWORD=postgres
 POSTGRES_DB=gitpay_dev
 
@@ -11,7 +11,7 @@ const googleStrategy = require('passport-google-oauth20').Strategy
 const gitHubStrategy = require('passport-github2').Strategy
 const bitbucketStrategy = require('passport-bitbucket-oauth20').Strategy
 const facebookStrategy = require('passport-facebook').Strategy
-const LocalStrategy = require('passport-local').Strategy
+const LocalStrategy = require('passport-local')
 const requestPromise = require('request-promise')
 const passportJWT = require('passport-jwt')
 const ExtractJWT = passportJWT.ExtractJwt
@@ -388,34 +388,28 @@ passport.use(
 
 passport.use(
   new LocalStrategy(
-    {
-      usernameField: 'email',
-      passwordField: 'password'
-    },
-    (email, password, done) => {
-      process.nextTick(_ => {
-        const userAttributes = {
-          email: email
+    async function verify (username, password, done) {
+      const userAttributes = {
+        email: username
+      }
+      try {
+        const user = await userExist(userAttributes)
+        if (!user) done(null, false)
+        if (user.verifyPassword(password, user.password)) {
+          const token = jwt.sign(
+            { email: user.email },
+            process.env.SECRET_PHRASE
+          )
+          user.token = token
+          return done(null, user)
         }
-        userExist(userAttributes)
-          .then(user => {
-            if (!user) return done(null, false)
-            if (user.verifyPassword(password, user.password)) {
-              const token = jwt.sign(
-                { email: user.email },
-                process.env.SECRET_PHRASE
-              )
-              user.token = token
-              return done(null, user)
-            }
-            return done(null, false)
-          })
-          .catch(error => {
-            return done(error)
-          })
-      })
-    }
-  )
+        return done(null, false)
+      }
+      catch (err) {
+        console.log('err', err)
+        return done(err)
+      };
+    })
 )
 
 passport.use(new JWTStrategy({
 
@@ -1,7 +1,7 @@
 {
   "presets": [
-    "es2015",
-    "react"
+    "@babel/preset-env",
+    "@babel/preset-react"
   ],
   "plugins": [
     ["transform-imports", {
@@ -12,8 +12,9 @@
     }
     ],
     "add-react-displayname",
-    "transform-object-rest-spread",
-    "transform-class-properties",
+    "@babel/plugin-proposal-object-rest-spread",
+    "@babel/plugin-proposal-class-properties",
+    "babel-plugin-styled-components",
     ["react-intl", {
         "messagesDir": "./build/messages/",
         "removeDefaultMessage": true,