From 079822dfecfba659a491034c447c679dab2424c7 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Mon, 9 May 2016 16:27:35 -0400
Subject: Start extending to support GitLab authentication. Add necessary
 dependency. Add baseURL parameter for self-hosted GitLab Add necessary
 require. Add block for GitLab auth. Fix typo Update font-awesome dependency
 for GitLab icon. Use a color closer to GitLab orange. More direct TODO

---
 lib/auth.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'lib/auth.js')

diff --git a/lib/auth.js b/lib/auth.js
index af3e8d1d..d495605a 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -4,6 +4,7 @@ var passport = require('passport');
 var FacebookStrategy = require('passport-facebook').Strategy;
 var TwitterStrategy = require('passport-twitter').Strategy;
 var GithubStrategy = require('passport-github').Strategy;
+var GitlabStrategy = require('passport-gitlab2').Strategy;
 var DropboxStrategy = require('passport-dropbox-oauth2').Strategy;
 
 //core
@@ -56,6 +57,15 @@ if (config.github) {
         callbackURL: config.serverurl + '/auth/github/callback'
     }, callback));
 }
+//gitlab
+if (config.gitlab) {
+    passport.use(new GitlabStrategy({
+        baseURL: config.gitlab.baseURL,
+        clientID: config.gitlab.clientID,
+        clientSecret: config.gitlab.clientSecret,
+        callbackURL: config.serverurl + '/auth/gitlab/callback'
+    }, callback));
+}
 //dropbox
 if (config.dropbox) {
     passport.use(new DropboxStrategy({
-- 
cgit v1.2.3


From e545de72a6daab8f51d4b39ec9e33563eb16ee68 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Wed, 11 May 2016 17:06:05 -0400
Subject: Add accessToken saving.

---
 lib/auth.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'lib/auth.js')

diff --git a/lib/auth.js b/lib/auth.js
index d495605a..ec45eea3 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -19,13 +19,23 @@ function callback(accessToken, refreshToken, profile, done) {
             profileid: profile.id.toString()
         },
         defaults: {
-            profile: JSON.stringify(profile)
+            profile: JSON.stringify(profile),
+            accessToken: accessToken,
+            refreshToken: refreshToken
         }
     }).spread(function(user, created) {
         if (user) {
-            if (config.debug)
-                logger.info('user login: ' + user.id);
-            return done(null, user);
+            if(user.accessToken == accessToken){
+                if (config.debug)
+                    logger.info('user login: ' + user.id);
+                return done(null, user);
+            }
+            user.accessToken = accessToken;
+            user.save().then(function(){
+                if (config.debug)
+                    logger.info('user login: ' + user.id);
+                return done(null, user);
+            })
         }
     }).catch(function(err) {
         logger.error('auth callback failed: ' + err);
-- 
cgit v1.2.3