From 7e2146a229822679c16fbdc0924802945afdc437 Mon Sep 17 00:00:00 2001 From: vx3r Date: Mon, 18 May 2020 15:25:05 +0900 Subject: [PATCH] change auth header name, make auth basic work --- cmd/wg-gen-web/main.go | 2 +- ui/src/services/api.service.js | 2 +- util/util.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/wg-gen-web/main.go b/cmd/wg-gen-web/main.go index 6a79f7b..d1fb3e1 100644 --- a/cmd/wg-gen-web/main.go +++ b/cmd/wg-gen-web/main.go @@ -90,7 +90,7 @@ func main() { // cors middleware config := cors.DefaultConfig() config.AllowAllOrigins = true - config.AddAllowHeaders("Authorization") + config.AddAllowHeaders("Authorization", util.AuthTokenHeaderName) app.Use(cors.New(config)) // protection middleware diff --git a/ui/src/services/api.service.js b/ui/src/services/api.service.js index 97b0093..9a5e6d2 100644 --- a/ui/src/services/api.service.js +++ b/ui/src/services/api.service.js @@ -4,7 +4,7 @@ import TokenService from "./token.service"; const ApiService = { setHeader() { - Vue.axios.defaults.headers.common.Authorization = `${TokenService.getToken()}`; + Vue.axios.defaults.headers['x-wg-gen-web-auth'] = `${TokenService.getToken()}`; }, get(resource) { diff --git a/util/util.go b/util/util.go index 3d3f88c..c026f84 100644 --- a/util/util.go +++ b/util/util.go @@ -11,7 +11,7 @@ import ( ) var ( - AuthTokenHeaderName = "Authorization" + AuthTokenHeaderName = "x-wg-gen-web-auth" // RegexpEmail check valid email RegexpEmail = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$") )