4 files changed, 35 insertions, 3 deletions
diff --git a/lib/config/default.js b/lib/config/default.js
index 68849d36..1b124b3e 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -56,7 +56,7 @@ module.exports = {
   heartbeatTimeout: 10000,
   // document
   documentMaxLength: 100000,
-  // image upload setting, available options are imgur/s3/filesystem
+  // image upload setting, available options are imgur/s3/filesystem/azure
   imageUploadType: 'filesystem',
   imgur: {
     clientID: undefined
@@ -74,7 +74,17 @@ module.exports = {
     port: 9000
   },
   s3bucket: undefined,
+  azure: {
+    connectionString: undefined,
+    container: undefined
+  },
   // authentication
+  oauth2: {
+    authorizationURL: undefined,
+    tokenURL: undefined,
+    clientID: undefined,
+    clientSecret: undefined
+  },
   facebook: {
     clientID: undefined,
     clientSecret: undefined
diff --git a/lib/config/dockerSecret.js b/lib/config/dockerSecret.js
index b9116cd3..fd66ddfe 100644
--- a/lib/config/dockerSecret.js
+++ b/lib/config/dockerSecret.js
@@ -22,6 +22,9 @@ if (fs.existsSync(basePath)) {
       accessKeyId: getSecret('s3_acccessKeyId'),
       secretAccessKey: getSecret('s3_secretAccessKey')
     },
+    azure: {
+      connectionString: getSecret('azure_connectionString')
+    },
     facebook: {
       clientID: getSecret('facebook_clientID'),
       clientSecret: getSecret('facebook_clientSecret')
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 3dde4786..e1c11569 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -45,6 +45,10 @@ module.exports = {
     port: toIntegerConfig(process.env.HMD_MINIO_PORT)
   },
   s3bucket: process.env.HMD_S3_BUCKET,
+  azure: {
+    connectionString: process.env.HMD_AZURE_CONNECTION_STRING,
+    container: process.env.HMD_AZURE_CONTAINER
+  },
   facebook: {
     clientID: process.env.HMD_FACEBOOK_CLIENTID,
     clientSecret: process.env.HMD_FACEBOOK_CLIENTSECRET
@@ -68,6 +72,17 @@ module.exports = {
     clientID: process.env.HMD_MATTERMOST_CLIENTID,
     clientSecret: process.env.HMD_MATTERMOST_CLIENTSECRET
   },
+  oauth2: {
+    baseURL: process.env.HMD_OAUTH2_BASEURL,
+    userProfileURL: process.env.HMD_OAUTH2_USER_PROFILE_URL,
+    userProfileUsernameAttr: process.env.HMD_OAUTH2_USER_PROFILE_USERNAME_ATTR,
+    userProfileDisplayNameAttr: process.env.HMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR,
+    userProfileEmailAttr: process.env.HMD_OAUTH2_USER_PROFILE_EMAIL_ATTR,
+    tokenURL: process.env.HMD_OAUTH2_TOKEN_URL,
+    authorizationURL: process.env.HMD_OAUTH2_AUTHORIZATION_URL,
+    clientID: process.env.HMD_OAUTH2_CLIENT_ID,
+    clientSecret: process.env.HMD_OAUTH2_CLIENT_SECRET
+  },
   dropbox: {
     clientID: process.env.HMD_DROPBOX_CLIENTID,
     clientSecret: process.env.HMD_DROPBOX_CLIENTSECRET,
diff --git a/lib/config/index.js b/lib/config/index.js
index bdba5e0e..7853dbad 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -99,8 +99,12 @@ config.isGitLabEnable = config.gitlab.clientID && config.gitlab.clientSecret
 config.isMattermostEnable = config.mattermost.clientID && config.mattermost.clientSecret
 config.isLDAPEnable = config.ldap.url
 config.isSAMLEnable = config.saml.idpSsoUrl
+config.isOAuth2Enable = config.oauth2.clientID && config.oauth2.clientSecret
 config.isPDFExportEnable = config.allowPDFExport
 
+// Only update i18n files in development setups
+config.updateI18nFiles = (env === Environment.development)
+
 // merge legacy values
 let keys = Object.keys(config)
 const uppercase = /[A-Z]/
@@ -127,8 +131,8 @@ if (config.sessionSecret === 'secret') {
 }
 
 // Validate upload upload providers
-if (['filesystem', 's3', 'minio', 'imgur'].indexOf(config.imageUploadType) === -1) {
-  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio" or "imgur". Defaulting to "imgur"')
+if (['filesystem', 's3', 'minio', 'imgur', 'azure'].indexOf(config.imageUploadType) === -1) {
+  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio", "azure" or "imgur". Defaulting to "imgur"')
   config.imageUploadType = 'imgur'
 }