diff options
-rw-r--r-- | api/file.go | 18 | ||||
-rw-r--r-- | model/config.go | 44 | ||||
-rw-r--r-- | model/oauth.go | 2 | ||||
-rw-r--r-- | web/react/utils/client.jsx | 3 | ||||
-rw-r--r-- | web/templates/head.html | 2 |
5 files changed, 50 insertions, 19 deletions
diff --git a/api/file.go b/api/file.go index d31abfb1d..67ebc14b7 100644 --- a/api/file.go +++ b/api/file.go @@ -522,7 +522,7 @@ func writeFile(f []byte, path string) *model.AppError { auth.AccessKey = utils.Cfg.FileSettings.AmazonS3AccessKeyId auth.SecretKey = utils.Cfg.FileSettings.AmazonS3SecretAccessKey - s := s3.New(auth, aws.Regions[utils.Cfg.FileSettings.AmazonS3Region]) + s := s3.New(auth, awsRegion()) bucket := s.Bucket(utils.Cfg.FileSettings.AmazonS3Bucket) ext := filepath.Ext(path) @@ -562,7 +562,7 @@ func readFile(path string) ([]byte, *model.AppError) { auth.AccessKey = utils.Cfg.FileSettings.AmazonS3AccessKeyId auth.SecretKey = utils.Cfg.FileSettings.AmazonS3SecretAccessKey - s := s3.New(auth, aws.Regions[utils.Cfg.FileSettings.AmazonS3Region]) + s := s3.New(auth, awsRegion()) bucket := s.Bucket(utils.Cfg.FileSettings.AmazonS3Bucket) // try to get the file from S3 with some basic retry logic @@ -613,3 +613,17 @@ func openFileWriteStream(path string) (io.Writer, *model.AppError) { func closeFileWriteStream(file io.Writer) { file.(*os.File).Close() } + +func awsRegion() aws.Region { + if region, ok := aws.Regions[utils.Cfg.FileSettings.AmazonS3Region]; ok { + return region + } + + return aws.Region{ + Name: utils.Cfg.FileSettings.AmazonS3Region, + S3Endpoint: utils.Cfg.FileSettings.AmazonS3Endpoint, + S3BucketEndpoint: utils.Cfg.FileSettings.AmazonS3BucketEndpoint, + S3LocationConstraint: *utils.Cfg.FileSettings.AmazonS3LocationConstraint, + S3LowercaseBucket: *utils.Cfg.FileSettings.AmazonS3LowercaseBucket, + } +} diff --git a/model/config.go b/model/config.go index 38ef81a85..a4792ff9e 100644 --- a/model/config.go +++ b/model/config.go @@ -68,21 +68,25 @@ type LogSettings struct { } type FileSettings struct { - DriverName string - Directory string - EnablePublicLink bool - PublicLinkSalt string - ThumbnailWidth int - ThumbnailHeight int - PreviewWidth int - PreviewHeight int - ProfileWidth int - ProfileHeight int - InitialFont string - AmazonS3AccessKeyId string - AmazonS3SecretAccessKey string - AmazonS3Bucket string - AmazonS3Region string + DriverName string + Directory string + EnablePublicLink bool + PublicLinkSalt string + ThumbnailWidth int + ThumbnailHeight int + PreviewWidth int + PreviewHeight int + ProfileWidth int + ProfileHeight int + InitialFont string + AmazonS3AccessKeyId string + AmazonS3SecretAccessKey string + AmazonS3Bucket string + AmazonS3Region string + AmazonS3Endpoint string + AmazonS3BucketEndpoint string + AmazonS3LocationConstraint *bool + AmazonS3LowercaseBucket *bool } type EmailSettings struct { @@ -210,6 +214,16 @@ func (o *Config) SetDefaults() { o.FileSettings.PublicLinkSalt = NewRandomString(32) } + if o.FileSettings.AmazonS3LocationConstraint == nil { + o.FileSettings.AmazonS3LocationConstraint = new(bool) + *o.FileSettings.AmazonS3LocationConstraint = false + } + + if o.FileSettings.AmazonS3LowercaseBucket == nil { + o.FileSettings.AmazonS3LowercaseBucket = new(bool) + *o.FileSettings.AmazonS3LowercaseBucket = false + } + if len(o.EmailSettings.InviteSalt) == 0 { o.EmailSettings.InviteSalt = NewRandomString(32) } diff --git a/model/oauth.go b/model/oauth.go index 67825dd97..448fd9dc9 100644 --- a/model/oauth.go +++ b/model/oauth.go @@ -13,7 +13,7 @@ import ( type OAuthApp struct { Id string `json:"id"` CreatorId string `json:"creator_id"` - CreateAt int64 `json:"update_at"` + CreateAt int64 `json:"create_at"` UpdateAt int64 `json:"update_at"` ClientSecret string `json:"client_secret"` Name string `json:"name"` diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 1c417153b..8a4cee589 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -246,6 +246,7 @@ export function loginByEmail(name, email, password, success, error) { data: JSON.stringify({name, email, password}), success: function onSuccess(data, textStatus, xhr) { track('api', 'api_users_login_success', data.team_id, 'email', data.email); + sessionStorage.removeItem(data.id + '_last_error'); BrowserStore.signalLogin(); success(data, textStatus, xhr); }, @@ -267,6 +268,8 @@ export function loginByLdap(teamName, id, password, success, error) { data: JSON.stringify({teamName, id, password}), success: function onSuccess(data, textStatus, xhr) { track('api', 'api_users_loginLdap_success', data.team_id, 'id', id); + sessionStorage.removeItem(data.id + '_last_error'); + BrowserStore.signalLogin(); success(data, textStatus, xhr); }, error: function onError(xhr, status, err) { diff --git a/web/templates/head.html b/web/templates/head.html index c2c40098c..70c94e8ff 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -77,7 +77,7 @@ } console.log('detected login from a different tab'); - window.location.href = '/'; + window.location.href = '/' + window.mm_team.name; } }); }); |