From 87db3cf751a6795bb92126b0a56643ea05ea32ba Mon Sep 17 00:00:00 2001
From: Jason Kulatunga <jason@thesparktree.com>
Date: Mon, 12 Sep 2022 17:34:03 -0400
Subject: [PATCH] better error messages.

---
 backend/pkg/web/handler/auth.go                            | 7 ++++---
 frontend/src/app/components/footer/footer.component.html   | 4 ++--
 .../src/app/pages/auth-signin/auth-signin.component.html   | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/pkg/web/handler/auth.go b/backend/pkg/web/handler/auth.go
index fffb193c..9ceea0a5 100644
--- a/backend/pkg/web/handler/auth.go
+++ b/backend/pkg/web/handler/auth.go
@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"fmt"
 	"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/auth"
 	"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/database"
 	"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/models"
@@ -43,20 +44,20 @@ func AuthSignin(c *gin.Context) {
 
 	foundUser, err := databaseRepo.GetUserByEmail(c, user.Username)
 	if err != nil || foundUser == nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"success": false})
+		c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": fmt.Sprintf("could not find user: %s", user.Username)})
 		return
 	}
 
 	err = foundUser.CheckPassword(user.Password)
 	if err != nil {
-		c.JSON(http.StatusUnauthorized, gin.H{"success": false})
+		c.JSON(http.StatusUnauthorized, gin.H{"success": false, "error": fmt.Sprintf("username or password does not match: %s", user.Username)})
 		return
 	}
 
 	// return JWT
 	tokenString, err := auth.GenerateJWT(user.Username)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"success": false})
+		c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "an error occurred generating JWT token"})
 		return
 	}
 
diff --git a/frontend/src/app/components/footer/footer.component.html b/frontend/src/app/components/footer/footer.component.html
index 40293519..bf7c8be1 100644
--- a/frontend/src/app/components/footer/footer.component.html
+++ b/frontend/src/app/components/footer/footer.component.html
@@ -1,8 +1,8 @@
 <div class="az-footer ht-40">
   <div class="container ht-100p pd-t-0-f">
     <div class="d-sm-flex justify-content-center justify-content-sm-between py-2 w-100">
-      <span class="text-muted text-center text-sm-left d-block d-sm-inline-block">Copyright © bootstrapdash.com 2020</span>
+      <span class="text-muted text-center text-sm-left d-block d-sm-inline-block">Copyright © Fasten Health 2020</span>
       <span class="float-none float-sm-right d-block mt-1 mt-sm-0 text-center">Free <a href="https://www.bootstrapdash.com/angular-admin-templates/" target="_blank">  angular admin template </a> from <a href="https://www.bootstrapdash.com/" target="_blank">bootstrapdash.com </a></span>
     </div>
   </div><!-- container -->
-</div><!-- az-footer -->
\ No newline at end of file
+</div><!-- az-footer -->
diff --git a/frontend/src/app/pages/auth-signin/auth-signin.component.html b/frontend/src/app/pages/auth-signin/auth-signin.component.html
index 8e8f7481..16ad98db 100644
--- a/frontend/src/app/pages/auth-signin/auth-signin.component.html
+++ b/frontend/src/app/pages/auth-signin/auth-signin.component.html
@@ -36,6 +36,7 @@
           </div>
         </div><!-- form-group -->
         <button [disabled]="!userForm.form.valid" type="submit" class="btn btn-az-primary btn-block">Sign In</button>
+
       </form>
     </div><!-- az-signin-header -->
     <div class="az-signin-footer">