From 56e42e580e8b7ff2cfa2bafaa650147df76572a7 Mon Sep 17 00:00:00 2001
From: root <stremovsky@gmail.com>
Date: Sun, 16 Aug 2020 22:18:41 +0000
Subject: [PATCH] lookup for new users

---
 src/agreements_api.go | 23 ++++++++++++-----------
 src/conf.go           |  4 ++++
 src/users_api.go      |  7 ++++---
 ui/index.html         |  4 ++--
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/agreements_api.go b/src/agreements_api.go
index 6dbc5ae..6c71c18 100644
--- a/src/agreements_api.go
+++ b/src/agreements_api.go
@@ -20,7 +20,6 @@ func (e mainEnv) agreementAccept(w http.ResponseWriter, r *http.Request, ps http
 		returnError(w, r, "bad mode", 405, nil, event)
 		return
 	}
-
 	brief = normalizeBrief(brief)
 	if isValidBrief(brief) == false {
 		returnError(w, r, "bad brief format", 405, nil, event)
@@ -28,22 +27,21 @@ func (e mainEnv) agreementAccept(w http.ResponseWriter, r *http.Request, ps http
 	}
 	exists, err := e.db.checkLegalBasis(brief)
 	if err != nil {
-		returnError(w, r, "internal error", 405, nil, event)
+		returnError(w, r, "internal error", 405, err, event)
 		return
 	}
 	if exists == false {
-		returnError(w, r, "not found", 405, nil, event)
-		return	
+		returnError(w, r, "not found", 404, nil, event)
+		return
 	}
-	
 	userTOKEN := ""
 	if mode == "token" {
 		if enforceUUID(w, address, event) == false {
 			return
 		}
-		userBson, _ := e.db.lookupUserRecord(address)
-		if userBson == nil {
-			returnError(w, r, "internal error", 405, nil, event)
+		userBson, err := e.db.lookupUserRecord(address)
+		if err != nil || userBson == nil {
+			returnError(w, r, "internal error", 405, err, event)
 			return
 		}
 		if e.enforceAuth(w, r, event) == "" {
@@ -51,7 +49,11 @@ func (e mainEnv) agreementAccept(w http.ResponseWriter, r *http.Request, ps http
 		}
 		userTOKEN = address
 	} else {
-		userBson, _ := e.db.lookupUserRecordByIndex(mode, address, e.conf)
+		userBson, err := e.db.lookupUserRecordByIndex(mode, address, e.conf)
+                if err != nil {
+			returnError(w, r, "internal error", 405, err, event)
+			return
+		}
 		if userBson != nil {
 			userTOKEN = userBson["token"].(string)
 			event.Record = userTOKEN
@@ -158,14 +160,13 @@ func (e mainEnv) agreementWithdraw(w http.ResponseWriter, r *http.Request, ps ht
 	}
 	lbasis, err := e.db.getLegalBasis(brief)
 	if err != nil {
-		returnError(w, r, "internal error", 405, nil, event)
+		returnError(w, r, "internal error", 405, err, event)
 		return
 	}
 	if lbasis == nil {
 		returnError(w, r, "not  found", 405, nil, event)
 		return	
 	}
-	
 	userTOKEN := ""
 	authResult := ""
 	if mode == "token" {
diff --git a/src/conf.go b/src/conf.go
index a58b624..d6bc2f4 100644
--- a/src/conf.go
+++ b/src/conf.go
@@ -62,3 +62,7 @@ func (e mainEnv) pluginUserDelete(pluginid, userTOKEN) {
 	// not implemented
 }
 
+func (e mainEnv) pluginUserLookup(email string) {
+	// not implemented
+}
+
diff --git a/src/users_api.go b/src/users_api.go
index 2eda673..252c8f1 100644
--- a/src/users_api.go
+++ b/src/users_api.go
@@ -322,9 +322,10 @@ func (e mainEnv) userPrelogin(w http.ResponseWriter, r *http.Request, ps httprou
 			}
 		}
 	} else {
-		if mode == "phone" || mode == "email" {
-			notifyURL := e.conf.Notification.NotificationURL
-			notifyBadLogin(notifyURL, mode, address)
+		if mode == "email" {
+			//notifyURL := e.conf.Notification.NotificationURL
+			//notifyBadLogin(notifyURL, mode, address)
+			e.pluginUserLookup(address)
 			returnError(w, r, "record not found", 405, errors.New("record not found"), event)
 			return
 		}
diff --git a/ui/index.html b/ui/index.html
index 6128f40..d2ffc10 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -236,12 +236,12 @@ if (conf["custom_css_link"]) {
                         xhr.onload = function () {
                             if (xhr.status === 200) {
                                 document.location = "/site/login.html";
-                            } else if (conf["MagicLookup"]) {
+                            } else /* if (conf["MagicLookup"]) */ {
                                 //error
                                 var loading = document.getElementById('loading');
                                 loading.style.display = "block";
                                 lookupCount = 5;
-                                lookupTimer = setInterval(lookupUser, 500, url);
+                                lookupTimer = setInterval(lookupUser, 2500, url);
                             }
                         }
                         xhr.send();