authentication-service/cmd/api/handlers.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"bytes"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -32,15 +30,6 @@ func (app *Config) Authenticate(w http.ResponseWriter, r *http.Request) {
 		app.errorJSON(w, errors.New("invalid credentials"), http.StatusBadRequest)
 		return
 	}
-
-	// log authentication
-
-	err = app.logRequest("authentication", fmt.Sprintf("%s is logged in", user.Email))
-	if err != nil {
-		app.errorJSON(w, err)
-		return
-	}
-
 	payload := jsonResponse{
 		Error:   false,
 		Message: fmt.Sprintf("%s %s is authorized to log in.", user.FirstName, user.LastName),
@@ -49,30 +38,3 @@ func (app *Config) Authenticate(w http.ResponseWriter, r *http.Request) {
 
 	app.writeJSON(w, http.StatusAccepted, payload)
 }
-
-func (app *Config) logRequest(name, data string) error {
-	var entry struct {
-		Name string `json:"name"`
-		Data string `json:"data"`
-	}
-
-	entry.Name = name
-	entry.Data = data
-
-	jsonData, _ := json.MarshalIndent(entry, "", "\t")
-
-	logServiceURL := "http://logger-service/log"
-
-	request, err := http.NewRequest("POST", logServiceURL, bytes.NewBuffer(jsonData))
-	if err != nil {
-		return err
-	}
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{}
-	_, err = client.Do(request)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

broker-service/cmd/api/handlers.go

@@ -57,9 +57,8 @@ func (app *Config) authenticate(w http.ResponseWriter, a AuthPayload) {
 		Input: a,
 		Addr:  "http://authentication-service/authenticate",
 		ErrCode: statusError{
-			ExpectedCode: http.StatusAccepted,
+			Code: http.StatusUnauthorized,
-			ErrCode:      http.StatusUnauthorized,
+			Err:  errors.New("invalid credentials"),
-			Err:          errors.New("invalid credentials"),
 		},
 		SuccessMsg: "Authenticated",
 	}
@@ -67,14 +66,12 @@ func (app *Config) authenticate(w http.ResponseWriter, a AuthPayload) {
 }
 
 func (app *Config) LogItem(w http.ResponseWriter, entry LogPayload) {
-	log.Println(entry)
 	loggerService := Microservice{
 		Input: entry,
 		Addr:  "http://logger-service/log",
 		ErrCode: statusError{
-			ExpectedCode: http.StatusAccepted,
+			Code: http.StatusInternalServerError,
-			ErrCode:      http.StatusInternalServerError,
+			Err:  errors.New("internal error"),
-			Err:          errors.New("internal error"),
 		},
 		SuccessMsg: "Logged!",
 	}
@@ -82,9 +79,8 @@ func (app *Config) LogItem(w http.ResponseWriter, entry LogPayload) {
 }
 
 type statusError struct {
-	ExpectedCode int
+	Code int
-	ErrCode      int
+	Err  error
-	Err          error
 }
 
 type Microservice struct {
@@ -101,7 +97,6 @@ func (app *Config) callService(w http.ResponseWriter, ms Microservice) {
 		app.errorJSON(w, err, http.StatusBadRequest)
 		return
 	}
-	log.Println(ms.Input)
 
 	// call the service
 	req, err := http.NewRequest(
@@ -125,8 +120,8 @@ func (app *Config) callService(w http.ResponseWriter, ms Microservice) {
 	log.Println(resp.Body)
 
 	// make sure we get back the correct status code
-	if resp.StatusCode != ms.ErrCode.ExpectedCode {
+	if resp.StatusCode != http.StatusAccepted {
-		app.errorJSON(w, ms.ErrCode.Err, ms.ErrCode.ErrCode)
+		app.errorJSON(w, ms.ErrCode.Err, ms.ErrCode.Code)
 		return
 	}
 

front-end/cmd/web/templates/test.page.gohtml

@@ -9,7 +9,6 @@
 
                 <a id="brokerBtn" class="btn btn-outline-secondary" href="javascript:void(0);">Test Broker</a>
                 <a id="authBrokerBtn" class="btn btn-outline-secondary" href="javascript:void(0);">Test Auth</a>
-                <a id="logBtn" class="btn btn-outline-secondary" href="javascript:void(0);">Test Log</a>
 
                 <div id="output" class="mt-5" style="outline: 1px solid silver; padding: 2em;">
                     <span class="text-muted">Output shows here...</span>
@@ -37,7 +36,6 @@
     <script>
         let brokerBtn = document.getElementById("brokerBtn");
         let authBrokerBtn = document.getElementById("authBrokerBtn");
-        let logBtn = document.getElementById("logBtn");
         let output = document.getElementById("output");
         let sent = document.getElementById("payload");
         let received = document.getElementById("received");
@@ -93,38 +91,5 @@
                     output.innerHTML += "<br><br>Error: " + error;
                 });
         });
-
-        logBtn.addEventListener("click", () => {
-            const payload = {
-                action: "log",
-                log: {
-                    name: "event",
-                    data: "some kind of data",
-                }
-            };
-            const headers = new Headers();
-            headers.append("Content-Type", "application/json");
-            const body = {
-                method: 'POST',
-                body: JSON.stringify(payload),
-                headers: headers,
-            }
-            fetch("http:\/\/localhost:8080/handle", body)
-            .then((response) => response.json())
-                .then((data) => {
-                    sent.innerHTML = JSON.stringify(payload, undefined, 4);
-                    received.innerHTML = JSON.stringify(data, undefined, 4);
-                    if (data.error) {
-                        console.log(data.message);
-                        output.innerHTML += `<br><strong>Error:</strong>: ${data.message}`;
-                    } else {
-                        output.innerHTML += `<br><strong>Response from broker service</strong>: ${data.message}`;
-                    }
-                })
-                .catch((error) => {
-                    output.innerHTML += "<br><br>Error: " + error;
-                });
-        });
-
     </script>
 {{end}}

logger-service/cmd/api/handlers.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"log"
 	"logger/data"
 	"net/http"
 )
@@ -19,7 +18,6 @@ func (app *Config) WriteLog(w http.ResponseWriter, r *http.Request) {
 		app.errorJSON(w, err)
 		return
 	}
-	log.Println("requestpayload", requestPayload)
 
 	// insert data
 	event := data.LogEntry{
@@ -27,8 +25,6 @@ func (app *Config) WriteLog(w http.ResponseWriter, r *http.Request) {
 		Data: requestPayload.Data,
 	}
 
-	log.Println("event", event)
-
 	err = app.Models.LogEntry.Insert(event)
 	if err != nil {
 		app.errorJSON(w, err)

logger-service/cmd/api/main.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"time"
 
-	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
@@ -43,8 +42,6 @@ func main() {
 		}
 	}()
 
-	client = mongoClient
-
 	app := Config{
 		Models: data.New(client),
 	}
@@ -78,12 +75,6 @@ func connectToMongo() (*mongo.Client, error) {
 		return nil, err
 	}
 
-	var result bson.M
-	if err = client.Database("admin").RunCommand(context.TODO(), bson.D{{Key: "ping", Value: 1}}).Decode(&result); err != nil {
-		log.Println("Error ping:", err)
-		return nil, err
-	}
-
 	log.Println("Connected to Mongo")
 
 	return client, nil

logger-service/data/models.go

@@ -35,15 +35,13 @@ type LogEntry struct {
 func (l *LogEntry) Insert(entry LogEntry) error {
 	collection := client.Database("logs").Collection("logs")
 
-	newLog := LogEntry{
+	_, err := collection.InsertOne(context.TODO(), LogEntry{
 		Name:      entry.Name,
 		Data:      entry.Data,
 		CreatedAt: time.Now(),
 		UpdatedAt: time.Now(),
-	}
+	})
-	_, err := collection.InsertOne(context.TODO(), newLog)
 	if err != nil {
-		log.Println("Insert error:", err)
 		return err
 	}
 	return nil

project/docker-compose.yml

@@ -51,8 +51,9 @@ services:
     ports:
       - "27017:27017"
     environment:
-      MONGO_INITDB_ROOT_USERNAME: admin
+      MONGO_INITDB_DATABASE: logs
-      MONGO_INITDB_ROOT_PASSWORD: password
+      MONGO_INITDB_USERNAME: admin
+      MONGO_INITDB_PASSWORD: password
     volumes:
       - ./db-data/mongo:/data/db
 
@@ -61,14 +62,3 @@ services:
     restart: always
     ports:
       - 8090:8080
-
-  mongo-express:
-    image: mongo-express
-    restart: always
-    ports:
-      - 8091:8081
-    environment:
-      ME_CONFIG_MONGODB_ADMINUSERNAME: admin
-      ME_CONFIG_MONGODB_ADMINPASSWORD: password
-      ME_CONFIG_MONGODB_URL: mongodb://admin:password@mongo:27017/
-      ME_CONFIG_BASICAUTH: false