Browse Source

fixing login err

afeiszli 4 years ago
parent
commit
f8df4b571b
2 changed files with 12 additions and 6 deletions
  1. 1 1
      compose/docker-compose.quickstart.yml
  2. 11 5
      controllers/userHttpController.go

+ 1 - 1
compose/docker-compose.quickstart.yml

@@ -61,7 +61,7 @@ services:
     container_name: coredns
     restart: always
     ports:
-      - "5353:53/udp"
+      - "53:53/udp"
     volumes:
       - dnsconfig:/root/dnsconfig
 volumes:

+ 11 - 5
controllers/userHttpController.go

@@ -183,9 +183,13 @@ func HasAdmin() (bool, error) {
 
 	collection, err := database.FetchRecords(database.USERS_TABLE_NAME)
 	if err != nil {
-		return true, err
+		if database.IsEmptyRecord(err) {
+			return false, nil
+		} else {
+			return true, err
+	
+		}
 	}
-
 	for _, value := range collection { // filter for isadmin true
 		var user models.User
 		err = json.Unmarshal([]byte(value), &user)
@@ -204,9 +208,11 @@ func hasAdmin(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "application/json")
 
-	hasadmin, _ := HasAdmin()
-
-	//Returns all the nodes in JSON format
+	hasadmin, err := HasAdmin()
+	if err != nil {
+		returnErrorResponse(w, r, formatError(err, "internal"))
+		return
+	}	
 
 	json.NewEncoder(w).Encode(hasadmin)