Commit46fa9dd

committed

CORS

1 parent7d3b5f2 commit46fa9ddCopy full SHA for 46fa9dd

File tree

+42

-3

lines changed

+42

-3

lines changed

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package api`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"log"`
	`5`	`+"net/http"`
`5`	`6`	`"path"`
`6`	`7`	`"strconv"`
`7`	`8`
`@@ -71,11 +72,13 @@ func openStore(p string) {`
`71`	`72`	`funccreateRouter()*echo.Echo {`
`72`	`73`	`r:=echo.New()`
`73`	`74`
	`75`	`+r.SetHTTPErrorHandler(errorHandler)`
	`76`	`+`
`74`	`77`	`r.Use(mw.Logger())`
`75`	`78`	`r.Use(mw.Recover())`
	`79`	`+r.Use(cors())`
`76`	`80`	`r.Use(mw.StripTrailingSlash())`
`77`	`81`	`r.Use(auth())`
`78`		`-r.Use(mw.Gzip())`
`79`	`82`
`80`	`83`	`account:=r.Group("/account")`
`81`	`84`	`account.Post("/login",login)`
`@@ -116,3 +119,15 @@ func createRouter() *echo.Echo {`
`116`	`119`
`117`	`120`	`returnr`
`118`	`121`	`}`
	`122`	`+`
	`123`	`+funcerrorHandler(errerror,c*echo.Context) {`
	`124`	`+code:=http.StatusInternalServerError`
	`125`	`+msg:=http.StatusText(code)`
	`126`	`+ifhe,ok:=err.(*echo.HTTPError);ok {`
	`127`	`+code=he.Code()`
	`128`	`+msg=he.Error()`
	`129`	`+}`
	`130`	`+c.Response().Header().Set("Content-Type","text/plain; charset=utf-8")`
	`131`	`+c.Response().WriteHeader(code)`
	`132`	`+c.Response().Write([]byte(msg))`
	`133`	`+}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ func auth() echo.HandlerFunc {`
`13`	`13`	`ifc.Request().URL.Path!="/account/login" {`
`14`	`14`	`token:=c.Request().Header.Get("Authorization")`
`15`	`15`	`iftoken=="" {`
`16`		`-returnecho.NewHTTPError(401)`
	`16`	`+returnecho.NewHTTPError(401,"Bad token")`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`user:=authCache.get(token)`
`@@ -25,7 +25,7 @@ func auth() echo.HandlerFunc {`
`25`	`25`
`26`	`26`	`user=store.GetUserByToken(token)`
`27`	`27`	`ifuser==nil {`
`28`		`-returnecho.NewHTTPError(401)`
	`28`	`+returnecho.NewHTTPError(401,"Bad token")`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`authCache.set(token,user)`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+package api`
	`2`	`+`
	`3`	`+import (`
	`4`	`+"github.com/Castcloud/castcloud-go-server/Godeps/_workspace/src/github.com/labstack/echo"`
	`5`	`+)`
	`6`	`+`
	`7`	`+funccors() echo.MiddlewareFunc {`
	`8`	`+returnfunc(h echo.HandlerFunc) echo.HandlerFunc {`
	`9`	`+returnfunc(c*echo.Context)error {`
	`10`	`+ifc.Request().Header.Get("Origin")=="" {`
	`11`	`+returnh(c)`
	`12`	`+}`
	`13`	`+`
	`14`	`+c.Response().Header().Set("Access-Control-Allow-Origin","*")`
	`15`	`+ifc.Request().Method=="OPTIONS" {`
	`16`	`+c.Response().Header().Set("Access-Control-Allow-Methods","GET, POST, PUT, DELETE")`
	`17`	`+c.Response().Header().Set("Access-Control-Allow-Headers","Authorization")`
	`18`	`+returnc.NoContent(200)`
	`19`	`+}`
	`20`	`+`
	`21`	`+returnh(c)`
	`22`	`+}`
	`23`	`+}`
	`24`	`+}`

Comments

(0)