fix: Update api state management for CRUD endpoints

Author: stefanskoricdev

internal/internal_api/handler/add_member_to_team.go

@@ -18,7 +18,14 @@ type AddMemberToTeamResponse struct {
 func AddMemberToTeam(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	apiState := ctx.Value(util.ApiStateCtxKey).(internal_api.State)
+	authId := ctx.Value(util.AuthIdCtxKey).(string)
+
+	apiState, err := internal_api.InternalApiState(authId, ctx)
+
+	if err != nil {
+		util.JSONError(w, util.ErrorParam{Error: "Internal Server Error"}, http.StatusInternalServerError)
+		return
+	}
 
 	teamId, err := strconv.ParseInt(chi.URLParam(r, "team_id"), 10, 64)
 	if err != nil {

internal/internal_api/handler/create_member.go

@@ -34,7 +34,14 @@ func CreateMember(w http.ResponseWriter, r *http.Request) {
 		util.JSONError(w, util.ErrorParam{Error: "Bad Request"}, http.StatusBadRequest)
 	}
 
-	apiState := ctx.Value(util.ApiStateCtxKey).(internal_api.State)
+	authId := ctx.Value(util.AuthIdCtxKey).(string)
+
+	apiState, err := internal_api.InternalApiState(authId, ctx)
+
+	if err != nil {
+		util.JSONError(w, util.ErrorParam{Error: "Internal Server Error"}, http.StatusInternalServerError)
+		return
+	}
 
 	newMemberRes, err := apiState.DB.CreateMember(body.Name, body.Email, ctx)
 

internal/internal_api/handler/create_team.go

@@ -28,14 +28,26 @@ func CreateTeam(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	organizationId := ctx.Value(util.OrganizationIdCtxKey).(int64)
-
-	if organizationId == 0 || body.TeamName == "" {
-		fmt.Printf("No organization id or team name provided. Organization id: %d Team name: %s", organizationId, body.TeamName)
+	if body.TeamName == "" {
+		fmt.Printf("No team name provided. Team name: %s", body.TeamName)
 		util.JSONError(w, util.ErrorParam{Error: "Bad Request"}, http.StatusBadRequest)
 	}
 
-	apiState := ctx.Value(util.ApiStateCtxKey).(internal_api.State)
+	authId := ctx.Value(util.AuthIdCtxKey).(string)
+
+	apiState, err := internal_api.InternalApiState(authId, ctx)
+
+	if err != nil {
+		util.JSONError(w, util.ErrorParam{Error: "Internal Server Error"}, http.StatusInternalServerError)
+		return
+	}
+
+	organizationId, err := apiState.DB.GetOrganizationIdByAuthId(authId, ctx)
+
+	if err != nil {
+		util.JSONError(w, util.ErrorParam{Error: "Bad request"}, http.StatusBadRequest)
+		return
+	}
 
 	newTeamRes, err := apiState.DB.CreateTeam(body.TeamName, organizationId, ctx)
 

internal/internal_api/internal_api.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"net/http"
 	"os"
 
 	"github.com/dxta-dev/app/internal/internal_api/data"
@@ -52,8 +51,14 @@ func GetTenantDBUrlByAuthId(ctx context.Context, authId string) (TenantDBData, e
 	return tenantData, nil
 }
 
-func InternalApiState(dbUrl string, r *http.Request) (State, error) {
-	tenantDB, err := data.NewTenantDB(dbUrl)
+func InternalApiState(authId string, ctx context.Context) (State, error) {
+	tenantData, err := GetTenantDBUrlByAuthId(ctx, authId)
+
+	if err != nil {
+		return State{}, err
+	}
+
+	tenantDB, err := data.NewTenantDB(tenantData.DBUrl)
 
 	if err != nil {
 		return State{}, err

internal/util/auth.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/dxta-dev/app/internal/internal_api"
 	"github.com/go-chi/jwtauth/v5"
 )
 
@@ -92,8 +91,7 @@ type contextKey struct {
 }
 
 var (
-	OrganizationIdCtxKey = contextKey{"organizationId"}
-	ApiStateCtxKey       = contextKey{"apiState"}
+	AuthIdCtxKey = contextKey{"authId"}
 )
 
 func Authenticator() func(http.Handler) http.Handler {
@@ -116,36 +114,14 @@ func Authenticator() func(http.Handler) http.Handler {
 			authId := claims["organizationId"].(string)
 
 			if authId == "" {
-				fmt.Println("No organization id found in JWT payload")
+				fmt.Println("No auth id found in JWT payload")
 				JSONError(w, ErrorParam{Error: "Bad request"}, http.StatusBadRequest)
 				return
 			}
 
 			ctx := r.Context()
 
-			tenantData, err := internal_api.GetTenantDBUrlByAuthId(ctx, authId)
-
-			if err != nil {
-				JSONError(w, ErrorParam{Error: "Internal Server Error"}, http.StatusInternalServerError)
-				return
-			}
-
-			apiState, err := internal_api.InternalApiState(tenantData.DBUrl, r)
-
-			if err != nil {
-				JSONError(w, ErrorParam{Error: "Internal Server Error"}, http.StatusInternalServerError)
-				return
-			}
-
-			organizationId, err := apiState.DB.GetOrganizationIdByAuthId(authId, ctx)
-
-			if err != nil {
-				JSONError(w, ErrorParam{Error: "Bad request"}, http.StatusBadRequest)
-				return
-			}
-
-			ctx = context.WithValue(ctx, OrganizationIdCtxKey, organizationId)
-			ctx = context.WithValue(ctx, ApiStateCtxKey, apiState)
+			ctx = context.WithValue(ctx, AuthIdCtxKey, authId)
 
 			next.ServeHTTP(w, r.WithContext(ctx))
 		}