From 0154537fde09d91abe672a3c2ece931c77b92393 Mon Sep 17 00:00:00 2001 From: Nina Siegel Date: Sun, 19 Dec 2021 19:21:43 +0100 Subject: [PATCH 1/2] style(backend): the code format and the imports in one or the other place a little polished. --- backend/cmd/threadule/main.go | 2 +- backend/internal/data/{tweet..go => tweet.go} | 0 backend/internal/logic/password.go | 12 +++++++----- backend/internal/logic/twitter.go | 6 +++--- backend/internal/router/middleware.go | 6 +++--- backend/internal/web/server.go | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) rename backend/internal/data/{tweet..go => tweet.go} (100%) diff --git a/backend/cmd/threadule/main.go b/backend/cmd/threadule/main.go index e74e41d..3ff660e 100644 --- a/backend/cmd/threadule/main.go +++ b/backend/cmd/threadule/main.go @@ -10,7 +10,7 @@ import ( "threadule/backend/internal/config" "threadule/backend/internal/data" "threadule/backend/internal/logic" - router "threadule/backend/internal/router" + "threadule/backend/internal/router" "threadule/backend/internal/web" ) diff --git a/backend/internal/data/tweet..go b/backend/internal/data/tweet.go similarity index 100% rename from backend/internal/data/tweet..go rename to backend/internal/data/tweet.go diff --git a/backend/internal/logic/password.go b/backend/internal/logic/password.go index 1b61505..4356ea6 100644 --- a/backend/internal/logic/password.go +++ b/backend/internal/logic/password.go @@ -7,11 +7,13 @@ import ( "time" ) -const defaultPasswordLength = 16 -const defaultPasswordCharSet = "abcdefghijklmnopqrstuvwxyz" + - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + - "0123456789" + - "=!$%&+#-_.,;:" +const ( + defaultPasswordLength = 16 + defaultPasswordCharSet = "abcdefghijklmnopqrstuvwxyz" + + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + + "0123456789" + + "=!$%&+#-_.,;:" +) func (l *Logic) defaultPassword() string { builder := strings.Builder{} diff --git a/backend/internal/logic/twitter.go b/backend/internal/logic/twitter.go index 42ddc91..201767f 100644 --- a/backend/internal/logic/twitter.go +++ b/backend/internal/logic/twitter.go @@ -1,12 +1,12 @@ package logic import ( + "github.com/dghubble/go-twitter/twitter" + "github.com/dghubble/oauth1" + twitterOAuth "github.com/dghubble/oauth1/twitter" "net/url" "threadule/backend/internal/data/models" ) -import "github.com/dghubble/oauth1" -import "github.com/dghubble/go-twitter/twitter" -import twitterOAuth "github.com/dghubble/oauth1/twitter" func (l *Logic) sendTweet(client *twitter.Client, tweet *models.Tweet, prevId int64) (int64, error) { status, _, err := client.Statuses.Update( diff --git a/backend/internal/router/middleware.go b/backend/internal/router/middleware.go index 5b9b5e7..70dbfd1 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) { - StatusResponse(ctx, http.StatusBadRequest, "Authorization header missing or malformed") + presentation.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 { - StatusResponse(ctx, http.StatusUnauthorized, err.Error()) + presentation.StatusResponse(ctx, http.StatusUnauthorized, err.Error()) return } diff --git a/backend/internal/web/server.go b/backend/internal/web/server.go index 7b9d345..5db4499 100644 --- a/backend/internal/web/server.go +++ b/backend/internal/web/server.go @@ -7,6 +7,6 @@ import ( ) func StartServer(ctx *app.Context, handler http.Handler) error { - ctx.Log.Info("startinhg web server") + ctx.Log.Info("starting web server") return http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", ctx.Config.Web.Port), handler) } From ff535a616f4e77828b288712a0ec6fcc48b033f7 Mon Sep 17 00:00:00 2001 From: Nina Siegel Date: Sun, 19 Dec 2021 19:34:00 +0100 Subject: [PATCH 2/2] 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 }