3 files changed, 10 insertions, 6 deletions
diff --git a/lib/web/auth/google/index.js b/lib/web/auth/google/index.js
index bf2a260f..609c69cf 100644
--- a/lib/web/auth/google/index.js
+++ b/lib/web/auth/google/index.js
@@ -6,7 +6,7 @@ var GoogleStrategy = require('passport-google-oauth20').Strategy
 const config = require('../../../config')
 const {setReturnToFromReferer, passportGeneralCallback} = require('../utils')
 
-let facebookAuth = module.exports = Router()
+let googleAuth = module.exports = Router()
 
 passport.use(new GoogleStrategy({
   clientID: config.google.clientID,
@@ -14,12 +14,12 @@ passport.use(new GoogleStrategy({
   callbackURL: config.serverurl + '/auth/google/callback'
 }, passportGeneralCallback))
 
-facebookAuth.get('/auth/google', function (req, res, next) {
+googleAuth.get('/auth/google', function (req, res, next) {
   setReturnToFromReferer(req)
   passport.authenticate('google', { scope: ['profile'] })(req, res, next)
 })
   // google auth callback
-facebookAuth.get('/auth/google/callback',
+googleAuth.get('/auth/google/callback',
   passport.authenticate('google', {
     successReturnToOrRedirect: config.serverurl + '/',
     failureRedirect: config.serverurl + '/'
diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js
index 766c5cbc..9a63578a 100644
--- a/lib/web/auth/ldap/index.js
+++ b/lib/web/auth/ldap/index.js
@@ -23,9 +23,10 @@ passport.use(new LDAPStrategy({
     tlsOptions: config.ldap.tlsOptions || null
   }
 }, function (user, done) {
+  var uuid = user.uidNumber || user.uid || user.sAMAccountName
   var profile = {
-    id: 'LDAP-' + user.uidNumber,
-    username: user.uid,
+    id: 'LDAP-' + uuid,
+    username: uuid,
     displayName: user.displayName,
     emails: user.mail ? [user.mail] : [],
     avatarUrl: null,
diff --git a/lib/web/imageRouter.js b/lib/web/imageRouter.js
index 592a497c..bebab302 100644
--- a/lib/web/imageRouter.js
+++ b/lib/web/imageRouter.js
@@ -64,8 +64,11 @@ imageRouter.post('/uploadimage', function (req, res) {
                   res.status(500).end('upload image error')
                   return
                 }
+
+                var s3Endpoint = 's3.amazonaws.com'
+                if (config.s3.region && config.s3.region !== 'us-east-1') { s3Endpoint = `s3-${config.s3.region}.amazonaws.com` }
                 res.send({
-                  link: `https://s3-${config.s3.region}.amazonaws.com/${config.s3bucket}/${params.Key}`
+                  link: `https://${s3Endpoint}/${config.s3bucket}/${params.Key}`
                 })
               })
             })