From 4bfadc57bc4669fb1e8b89d6f2edfd6d66653735 Mon Sep 17 00:00:00 2001
From: "David J. Allen" <davidallendj@gmail.com>
Date: Sun, 25 Feb 2024 10:00:55 -0700
Subject: [PATCH] Minor changes

---
 docker/configs/config.yml  | 16 ----------------
 docker/docker-compose.yaml |  2 ++
 internal/login.go          | 10 +++++++---
 3 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 docker/configs/config.yml

diff --git a/docker/configs/config.yml b/docker/configs/config.yml
deleted file mode 100644
index 9ae7182..0000000
--- a/docker/configs/config.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-networks:
-- name: hardware_management
-  subnet: 10.10.10.10/24
-- name: system_management
-  subnet: 10.10.10.10/24
-- name: high_speed
-  subnet: 192.168.1.128/24
-databases:
-- name: hydradb
-  users:
-  - name: hydra-user
-    password: hydra
-- name: kratosdb
-  users:
-  - name: kratos-user
-    password: kratos
\ No newline at end of file
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index c37f13c..68bb963 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -12,6 +12,7 @@ volumes:
 services:
   hydra:
     image: oryd/hydra:v2.2.0
+    container_name: hydra
     ports:
       - "4444:4444" # Public port
       - "4445:4445" # Admin port
@@ -85,6 +86,7 @@ services:
     depends_on:
       - kratos-migrate
     image: oryd/kratos:v1.1.0
+    container_name: kratos
     ports:
       - '4433:4433' # public
       - '4434:4434' # admin
diff --git a/internal/login.go b/internal/login.go
index c84454c..28a8a2b 100644
--- a/internal/login.go
+++ b/internal/login.go
@@ -83,7 +83,7 @@ func Login(config *Config) error {
 	// unmarshal data to get id_token and access_token
 	var data map[string]any
 	err = json.Unmarshal([]byte(tokenString), &data)
-	if err != nil {
+	if err != nil || data == nil {
 		return fmt.Errorf("failed to unmarshal token: %v", err)
 	}
 
@@ -128,6 +128,7 @@ func Login(config *Config) error {
 		if err != nil {
 			return fmt.Errorf("failed to fetch identities: %v", err)
 		}
+		fmt.Printf("Created new identity successfully.\n")
 	}
 
 	// extract the subject from ID token claims
@@ -160,13 +161,16 @@ func Login(config *Config) error {
 	fmt.Printf("Fetching JWKS from authentication server for verification...\n")
 	err = idp.FetchJwk(config.ActionUrls.JwksUri)
 	if err != nil {
-		fmt.Printf("failed to fetch JWK: %v\n", err)
+		return fmt.Errorf("failed to fetch JWK: %v\n", err)
 	} else {
 		fmt.Printf("Attempting to add issuer to authorization server...\n")
-		_, err = client.AddTrustedIssuer(config.ActionUrls.TrustedIssuers, idp, subject, time.Duration(1000), config.Scope)
+		res, err := client.AddTrustedIssuer(config.ActionUrls.TrustedIssuers, idp, subject, time.Duration(1000), config.Scope)
 		if err != nil {
 			return fmt.Errorf("failed to add trusted issuer: %v", err)
 		}
+		if string(res) == "" {
+			fmt.Printf("Added issuer to authorization server successfully.\n")
+		}
 	}
 
 	// use ID token/user info to fetch access token from authentication server