IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-4026 Use client dir constant for OAuth Authorization page (#3895)

Browse Source
This commit is contained in:
enahum
2016-08-30 14:00:50 -03:00
committed by Corey Hulen
parent 77656aea7f
commit 6c8746dbdc
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/oauth.go
View File

@@ -429,7 +429,7 @@ func authorizeOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/html")
w.Header().Set("Cache-Control", "no-cache, max-age=31556926, public")
http.ServeFile(w, r, utils.FindDir("webapp/dist")+"root.html")
http.ServeFile(w, r, utils.FindDir(model.CLIENT_DIR)+"root.html")
}
func getAccessToken(c *Context, w http.ResponseWriter, r *http.Request) {

2
model/client.go
View File

@@ -35,6 +35,8 @@ const (
STATUS_OK = "OK"
STATUS_FAIL = "FAIL"
CLIENT_DIR = "webapp/dist"
API_URL_SUFFIX_V1 = "/api/v1"
API_URL_SUFFIX_V3 = "/api/v3"
API_URL_SUFFIX = API_URL_SUFFIX_V3

8
web/web.go
View File

@@ -16,17 +16,13 @@ import (
"github.com/mssola/user_agent"
)
const (
CLIENT_DIR = "webapp/dist"
)
func InitWeb() {
l4g.Debug(utils.T("web.init.debug"))
mainrouter := api.Srv.Router
if *utils.Cfg.ServiceSettings.WebserverMode != "disabled" {
staticDir := utils.FindDir(CLIENT_DIR)
staticDir := utils.FindDir(model.CLIENT_DIR)
l4g.Debug("Using client directory at %v", staticDir)
if *utils.Cfg.ServiceSettings.WebserverMode == "gzip" {
mainrouter.PathPrefix("/static/").Handler(gziphandler.GzipHandler(staticHandler(http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir))))))
@@ -76,5 +72,5 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Cache-Control", "no-cache, max-age=31556926, public")
http.ServeFile(w, r, utils.FindDir(CLIENT_DIR)+"root.html")
http.ServeFile(w, r, utils.FindDir(model.CLIENT_DIR)+"root.html")
}