From dd35ad43caab407cc70ef3b153b3f94d57242ed9 Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Thu, 21 Jun 2018 14:31:51 -0400
Subject: MM-10370: serve subpath (#8968)

* factor out GetSubpathFromConfig

* mv web/subpath.go to utils/subpath.go

* serve up web, api and ws on /subpath if configured

* pass config to utils.RenderWeb(App)?Error

This allows the methods to extract the configured subpath and redirect
to the appropriate `/subpath/error` handler.

* ensure GetSubpathFromConfig returns trailing slashes deterministically

* fix error 404 handling

* redirect /subpath to /subpath/

This is necessary for the static handler to match, otherwise none of the
registered routes find anything. This also makes it no longer necessary
to add trailing slashes in the root router.
---
 web/subpath_test.go | 103 ----------------------------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 web/subpath_test.go

(limited to 'web/subpath_test.go')

diff --git a/web/subpath_test.go b/web/subpath_test.go
deleted file mode 100644
index 92b1a5d3c..000000000
--- a/web/subpath_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package web_test
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/mattermost-server/web"
-)
-
-func TestUpdateAssetsSubpath(t *testing.T) {
-	t.Run("no client dir", func(t *testing.T) {
-		tempDir, err := ioutil.TempDir("", "test_update_assets_subpath")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-		os.Chdir(tempDir)
-
-		err = web.UpdateAssetsSubpath("/")
-		require.Error(t, err)
-	})
-
-	t.Run("valid", func(t *testing.T) {
-		tempDir, err := ioutil.TempDir("", "test_update_assets_subpath")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-		os.Chdir(tempDir)
-
-		err = os.Mkdir(model.CLIENT_DIR, 0700)
-		require.NoError(t, err)
-
-		testCases := []struct {
-			Description      string
-			RootHTML         string
-			MainCSS          string
-			Subpath          string
-			ExpectedRootHTML string
-			ExpectedMainCSS  string
-		}{
-			{
-				"no changes required, empty subpath provided",
-				baseRootHtml,
-				baseCss,
-				"",
-				baseRootHtml,
-				baseCss,
-			},
-			{
-				"no changes required",
-				baseRootHtml,
-				baseCss,
-				"/",
-				baseRootHtml,
-				baseCss,
-			},
-			{
-				"subpath",
-				baseRootHtml,
-				baseCss,
-				"/subpath",
-				subpathRootHtml,
-				subpathCss,
-			},
-			{
-				"new subpath from old",
-				subpathRootHtml,
-				subpathCss,
-				"/nested/subpath",
-				newSubpathRootHtml,
-				newSubpathCss,
-			},
-			{
-				"resetting to /",
-				subpathRootHtml,
-				subpathCss,
-				"/",
-				resetRootHtml,
-				baseCss,
-			},
-		}
-
-		for _, testCase := range testCases {
-			t.Run(testCase.Description, func(t *testing.T) {
-				ioutil.WriteFile(filepath.Join(tempDir, model.CLIENT_DIR, "root.html"), []byte(testCase.RootHTML), 0700)
-				ioutil.WriteFile(filepath.Join(tempDir, model.CLIENT_DIR, "main.css"), []byte(testCase.MainCSS), 0700)
-				err := web.UpdateAssetsSubpath(testCase.Subpath)
-				require.NoError(t, err)
-
-				contents, err := ioutil.ReadFile(filepath.Join(tempDir, model.CLIENT_DIR, "root.html"))
-				require.NoError(t, err)
-				require.Equal(t, testCase.ExpectedRootHTML, string(contents))
-
-				contents, err = ioutil.ReadFile(filepath.Join(tempDir, model.CLIENT_DIR, "main.css"))
-				require.NoError(t, err)
-				require.Equal(t, testCase.ExpectedMainCSS, string(contents))
-
-			})
-		}
-	})
-}
-- 
cgit v1.2.3-1-g7c22