3 files changed, 44 insertions, 2 deletions
diff --git a/lib/web/auth/saml/index.js b/lib/web/auth/saml/index.js
index 3ecbc6f3..b8d98340 100644
--- a/lib/web/auth/saml/index.js
+++ b/lib/web/auth/saml/index.js
@@ -20,14 +20,14 @@ passport.use(new SamlStrategy({
   identifierFormat: config.saml.identifierFormat
 }, function (user, done) {
   // check authorization if needed
-  if (config.saml.externalGroups && config.saml.grouptAttribute) {
+  if (config.saml.externalGroups && config.saml.groupAttribute) {
     var externalGroups = intersection(config.saml.externalGroups, user[config.saml.groupAttribute])
     if (externalGroups.length > 0) {
       logger.error('saml permission denied: ' + externalGroups.join(', '))
       return done('Permission denied', null)
     }
   }
-  if (config.saml.requiredGroups && config.saml.grouptAttribute) {
+  if (config.saml.requiredGroups && config.saml.groupAttribute) {
     if (intersection(config.saml.requiredGroups, user[config.saml.groupAttribute]).length === 0) {
       logger.error('saml permission denied')
       return done('Permission denied', null)
diff --git a/lib/web/imageRouter/azure.js b/lib/web/imageRouter/azure.js
new file mode 100644
index 00000000..cc98e5fc
--- /dev/null
+++ b/lib/web/imageRouter/azure.js
@@ -0,0 +1,35 @@
+'use strict'
+const path = require('path')
+
+const config = require('../../config')
+const logger = require('../../logger')
+
+const azure = require('azure-storage')
+
+exports.uploadImage = function (imagePath, callback) {
+  if (!imagePath || typeof imagePath !== 'string') {
+    callback(new Error('Image path is missing or wrong'), null)
+    return
+  }
+
+  if (!callback || typeof callback !== 'function') {
+    logger.error('Callback has to be a function')
+    return
+  }
+
+  var azureBlobService = azure.createBlobService(config.azure.connectionString)
+
+  azureBlobService.createContainerIfNotExists(config.azure.container, { publicAccessLevel: 'blob' }, function (err, result, response) {
+    if (err) {
+      callback(new Error(err.message), null)
+    } else {
+      azureBlobService.createBlockBlobFromLocalFile(config.azure.container, path.basename(imagePath), imagePath, function (err, result, response) {
+        if (err) {
+          callback(new Error(err.message), null)
+        } else {
+          callback(null, azureBlobService.getUrl(config.azure.container, result.name))
+        }
+      })
+    }
+  })
+}
diff --git a/lib/web/userRouter.js b/lib/web/userRouter.js
index ecfbaf8b..963961c7 100644
--- a/lib/web/userRouter.js
+++ b/lib/web/userRouter.js
@@ -5,6 +5,7 @@ const Router = require('express').Router
 const response = require('../response')
 const models = require('../models')
 const logger = require('../logger')
+const {generateAvatar} = require('../letter-avatars')
 
 const UserRouter = module.exports = Router()
 
@@ -34,3 +35,9 @@ UserRouter.get('/me', function (req, res) {
     })
   }
 })
+
+UserRouter.get('/user/:username/avatar.svg', function (req, res, next) {
+  res.setHeader('Content-Type', 'image/svg+xml')
+  res.setHeader('Cache-Control', 'public, max-age=86400')
+  res.send(generateAvatar(req.params.username))
+})