Merge pull request #38 from clidey/hk/feature/advanced-setup

[Feature] Add advanced section in login

Author: hkdeman

core/Dockerfile

@@ -1,30 +1,23 @@
-FROM node:18.12.1-alpine as build-stage
-
+FROM node:18.12.1-alpine AS build-stage
 RUN npm i -g pnpm
-
 WORKDIR /app
 COPY ./frontend/package.json ./frontend/pnpm-lock.yaml ./
 RUN pnpm install
 COPY ./frontend/ ./
 RUN pnpm run build
 
-
-FROM golang:1.22.1-alpine3.19 as backend-stage
-
+FROM golang:1.22.1-alpine3.19 AS backend-stage
 RUN apk update && apk add --no-cache gcc musl-dev
-
 WORKDIR /app
 COPY ./core/go.mod ./core/go.sum ./
 RUN go mod download
 COPY ./core/ ./
+COPY --from=build-stage /app/build/ ./build/
 RUN CGO_ENABLED=1 GOOS=linux go build -o /core
 
 FROM alpine:3.19
-
 RUN apk update && apk add --no-cache ca-certificates
-
 WORKDIR /app
 COPY --from=backend-stage /core /core
-COPY --from=build-stage /app/build/ ./build/
 
-CMD ["/core"]
+CMD ["/core"]

core/graph/generated.go

@@ -60,6 +60,7 @@ input LoginCredentials {
   Username: String!
   Password: String!
   Database: String!
+  Advanced: [RecordInput!]
 }
 
 type StatusResponse {
@@ -77,7 +78,7 @@ type Query {
 }
 
 type Mutation {
-  Login(credentails: LoginCredentials!): StatusResponse!
+  Login(credentials: LoginCredentials!): StatusResponse!
   Logout: StatusResponse!
 
   UpdateStorageUnit(type: DatabaseType!, schema: String!, storageUnit: String!, values: [RecordInput!]!): StatusResponse!

core/graph/model/models_gen.go

@@ -1,5 +1,7 @@
 package common
 
+import "github.com/clidey/whodb/core/src/engine"
+
 func ContainsString(slice []string, element string) bool {
 	for _, item := range slice {
 		if item == element {
@@ -8,3 +10,12 @@ func ContainsString(slice []string, element string) bool {
 	}
 	return false
 }
+
+func GetRecordValueOrDefault(records []engine.Record, key string, defaultValue string) string {
+	for _, record := range records {
+		if record.Key == key && len(record.Value) > 0 {
+			return record.Value
+		}
+	}
+	return defaultValue
+}

core/graph/schema.graphqls

@@ -5,6 +5,7 @@ type Credentials struct {
 	Username string
 	Password string
 	Database string
+	Advanced []Record
 }
 
 type PluginConfig struct {

core/graph/schema.resolvers.go

@@ -4,28 +4,33 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/clidey/whodb/core/src/common"
 	"github.com/clidey/whodb/core/src/engine"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func DB(config *engine.PluginConfig) (*mongo.Client, error) {
 	ctx := context.Background()
+	port := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Port", "27017")
+	queryParams := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Query Params", "")
 	var connectionString string
 	// TODO: add TLS enabled logic to work instead of hard coded domains
 	if config.Credentials.Hostname == "localhost" || config.Credentials.Hostname == "host.docker.internal" {
-		connectionString = fmt.Sprintf("mongodb://%s:%s@%s:%d/%s",
+		connectionString = fmt.Sprintf("mongodb://%s:%s@%s:%s/%s%s",
 			config.Credentials.Username,
 			config.Credentials.Password,
 			config.Credentials.Hostname,
-			27017,
-			config.Credentials.Database)
+			port,
+			config.Credentials.Database,
+			queryParams)
 	} else {
-		connectionString = fmt.Sprintf("mongodb+srv://%s:%s@%s/%s",
+		connectionString = fmt.Sprintf("mongodb+srv://%s:%s@%s/%s%s",
 			config.Credentials.Username,
 			config.Credentials.Password,
 			config.Credentials.Hostname,
-			config.Credentials.Database)
+			config.Credentials.Database,
+			queryParams)
 	}
 
 	clientOptions := options.Client().ApplyURI(connectionString)

core/src/common/utils.go

@@ -3,13 +3,18 @@ package mysql
 import (
 	"fmt"
 
+	"github.com/clidey/whodb/core/src/common"
 	"github.com/clidey/whodb/core/src/engine"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
 
 func DB(config *engine.PluginConfig) (*gorm.DB, error) {
-	dsn := fmt.Sprintf("%v:%v@tcp(%v:3306)/%v?charset=utf8mb4&parseTime=True&loc=Local", config.Credentials.Username, config.Credentials.Password, config.Credentials.Hostname, config.Credentials.Database)
+	port := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Port", "3306")
+	charset := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Charset", "utf8mb4")
+	parseTime := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Parse Time", "True")
+	loc := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Loc", "Local")
+	dsn := fmt.Sprintf("%v:%v@tcp(%v:%v)/%v?charset=%v&parseTime=%v&loc=%v", config.Credentials.Username, config.Credentials.Password, config.Credentials.Hostname, port, config.Credentials.Database, charset, parseTime, loc)
 	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
 		return nil, err

core/src/engine/plugin.go

@@ -3,13 +3,16 @@ package postgres
 import (
 	"fmt"
 
+	"github.com/clidey/whodb/core/src/common"
 	"github.com/clidey/whodb/core/src/engine"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 )
 
 func DB(config *engine.PluginConfig) (*gorm.DB, error) {
-	dsn := fmt.Sprintf("host=%v user=%v password=%v dbname=%v port=5432", config.Credentials.Hostname, config.Credentials.Username, config.Credentials.Password, config.Credentials.Database)
+	port := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Port", "5432")
+	sslMode := common.GetRecordValueOrDefault(config.Credentials.Advanced, "SSL Mode", "disable")
+	dsn := fmt.Sprintf("host=%v user=%v password=%v dbname=%v port=%v sslmode=%v", config.Credentials.Hostname, config.Credentials.Username, config.Credentials.Password, config.Credentials.Database, port, sslMode)
 	db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
 	if err != nil {
 		return nil, err