From ff535a616f4e77828b288712a0ec6fcc48b033f7 Mon Sep 17 00:00:00 2001 From: Nina Siegel Date: Sun, 19 Dec 2021 19:34:00 +0100 Subject: [PATCH] style(backend): revert some style changes --- backend/internal/logic/password.go | 12 +++++------- backend/internal/router/middleware.go | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/backend/internal/logic/password.go b/backend/internal/logic/password.go index 4356ea6..1b61505 100644 --- a/backend/internal/logic/password.go +++ b/backend/internal/logic/password.go @@ -7,13 +7,11 @@ import ( "time" ) -const ( - defaultPasswordLength = 16 - defaultPasswordCharSet = "abcdefghijklmnopqrstuvwxyz" + - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + - "0123456789" + - "=!$%&+#-_.,;:" -) +const defaultPasswordLength = 16 +const defaultPasswordCharSet = "abcdefghijklmnopqrstuvwxyz" + + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + + "0123456789" + + "=!$%&+#-_.,;:" func (l *Logic) defaultPassword() string { builder := strings.Builder{} diff --git a/backend/internal/router/middleware.go b/backend/internal/router/middleware.go index 70dbfd1..5b9b5e7 100644 --- a/backend/internal/router/middleware.go +++ b/backend/internal/router/middleware.go @@ -3,7 +3,7 @@ package router import ( "net/http" "strings" - "threadule/backend/internal/presentation" + . "threadule/backend/internal/presentation" "threadule/backend/internal/web" ) @@ -13,14 +13,14 @@ func authenticated(next web.Handler) web.Handler { return func(ctx *web.Context) { authHeader := ctx.Request.Header.Get("Authorization") if !strings.HasPrefix(authHeader, authPrefix) { - presentation.StatusResponse(ctx, http.StatusBadRequest, "Authorization header missing or malformed") + StatusResponse(ctx, http.StatusBadRequest, "Authorization header missing or malformed") return } authHeader = strings.TrimPrefix(authHeader, authPrefix) user, err := ctx.AppCtx.Logic.AuthenticateSession(authHeader) if err != nil { - presentation.StatusResponse(ctx, http.StatusUnauthorized, err.Error()) + StatusResponse(ctx, http.StatusUnauthorized, err.Error()) return }