user can now view his own requests

2026-01-08 16:41:27 +00:00 · 2020-05-12 23:29:07 +03:00
parent 8fe7a4f165
commit 40e98aaa34
8 changed files with 311 additions and 0 deletions
--- a/src/bunker.go
+++ b/src/bunker.go
@@ -200,6 +200,7 @@ func (e mainEnv) setupRouter() *httprouter.Router {
 	router.GET("/v1/request/:request", e.getUserRequest)
 	router.POST("/v1/request/:request", e.approveUserRequest)
 	router.DELETE("/v1/request/:request", e.cancelUserRequest)
+	router.GET("/v1/requests/:mode/:address", e.getCustomUserRequests)
 	router.GET("/v1/requests", e.getUserRequests)

 	router.GET("/v1/consent/:mode/:address", e.consentAllUserRecords)
--- a/src/requests_api.go
+++ b/src/requests_api.go
@@ -6,6 +6,7 @@ import (
 	"net/http"

 	"github.com/julienschmidt/httprouter"
+	"go.mongodb.org/mongo-driver/bson"
 )

 func (e mainEnv) getUserRequests(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
@@ -39,6 +40,61 @@ func (e mainEnv) getUserRequests(w http.ResponseWriter, r *http.Request, ps http
 	w.Write([]byte(str))
 }

+func (e mainEnv) getCustomUserRequests(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	address := ps.ByName("address")
+	mode := ps.ByName("mode")
+	event := audit("get user privacy requests", address, mode, address)
+	defer func() { event.submit(e.db) }()
+
+	if validateMode(mode) == false {
+		returnError(w, r, "bad mode", 405, nil, event)
+		return
+	}
+	userTOKEN := address
+	var userBson bson.M
+	if mode == "token" {
+		if enforceUUID(w, address, event) == false {
+			return
+		}
+		userBson, _ = e.db.lookupUserRecord(address)
+	} else {
+		userBson, _ = e.db.lookupUserRecordByIndex(mode, address, e.conf)
+		if userBson != nil {
+			userTOKEN = userBson["token"].(string)
+			event.Record = userTOKEN
+		}
+	}
+	if userBson == nil {
+		returnError(w, r, "internal error", 405, nil, event)
+		return
+	}
+	if e.enforceAuth(w, r, event) == "" {
+		return
+	}
+	
+	var offset int32
+	var limit int32 = 10
+	args := r.URL.Query()
+	if value, ok := args["offset"]; ok {
+		offset = atoi(value[0])
+	}
+	if value, ok := args["limit"]; ok {
+		limit = atoi(value[0])
+	}
+	resultJSON, counter, err := e.db.getUserRequests(userTOKEN, offset, limit)
+	if err != nil {
+		returnError(w, r, "internal error", 405, err, nil)
+		return
+	}
+	fmt.Printf("Total count of custom user requests: %d\n", counter)
+	//fmt.Fprintf(w, "<html><head><title>title</title></head>")
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.WriteHeader(200)
+	str := fmt.Sprintf(`{"status":"ok","total":%d,"rows":%s}`, counter, resultJSON)
+	w.Write([]byte(str))
+}
+
 func (e mainEnv) getUserRequest(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	request := ps.ByName("request")
 	event := audit("get user request by request token", request, "request", request)
--- a/src/requests_db.go
+++ b/src/requests_db.go
@@ -77,6 +77,34 @@ func (dbobj dbcon) getRequests(status string, offset int32, limit int32) ([]byte
 	return resultJSON, count, nil
 }

+func (dbobj dbcon) getUserRequests(userTOKEN string, offset int32, limit int32) ([]byte, int64, error) {
+	//var results []*auditEvent
+	count, err := dbobj.store.CountRecords(storage.TblName.Requests, "token", userTOKEN)
+	if err != nil {
+		return nil, 0, err
+	}
+	var results []bson.M
+	records, err := dbobj.store.GetList(storage.TblName.Requests, "token", userTOKEN, offset, limit)
+	if err != nil {
+		return nil, 0, err
+	}
+	for _, element := range records {
+		element["more"] = false
+		if _, ok := element["change"]; ok {
+			element["more"] = true
+			delete(element, "change")
+		}
+		results = append(results, element)
+	}
+
+	resultJSON, err := json.Marshal(records)
+	if err != nil {
+		return nil, 0, err
+	}
+	//fmt.Printf("Found multiple documents (array of pointers): %+v\n", results)
+	return resultJSON, count, nil
+}
+
 func (dbobj dbcon) getRequest(rtoken string) (bson.M, error) {
 	record, err := dbobj.store.GetRecord(storage.TblName.Requests, "rtoken", rtoken)
 	if err != nil {
--- a/ui/site/user-apps.html
+++ b/ui/site/user-apps.html
@@ -54,6 +54,7 @@ if (conf["custom_css_file"]) {
                            <a class="nav-item nav-link" href="user-profile.html">Profile</a>
                            <a class="nav-item nav-link active" href="user-apps.html">App data</a>
                            <a class="nav-item nav-link" href="user-privacy-portal.html">Privacy portal</a>
+							<a class="nav-item nav-link" href="user-requests.html">My requests</a>
                            <a class="nav-item nav-link" href="user-audit.html">History</a>
                            <a class="nav-item nav-link" href="javascript:bunker_logout();">Logout</a>
                        </div>
--- a/ui/site/user-audit.html
+++ b/ui/site/user-audit.html
@@ -188,6 +188,7 @@ if (conf["custom_css_file"]) {
              <a class="nav-item nav-link" href="user-apps.html">App data</a>
              <a class="nav-item nav-link" href="user-privacy-portal.html">Privacy portal</a>
              <a class="nav-item nav-link active" href="user-audit.html">History</a>
+			  <a class="nav-item nav-link" href="user-requests.html">My requests</a>
              <a class="nav-item nav-link" href="javascript:bunker_logout();">Logout</a>
            </div>
          </div>
--- a/ui/site/user-privacy-portal.html
+++ b/ui/site/user-privacy-portal.html
@@ -47,6 +47,7 @@ if (conf["custom_css_file"]) {
                            <a class="nav-item nav-link" href="user-apps.html">App data</a>
                            <a class="nav-item nav-link active" href="user-privacy-portal.html">Privacy portal</a>
                            <a class="nav-item nav-link" href="user-audit.html">History</a>
+							<a class="nav-item nav-link" href="user-requests.html">My requests</a>
                            <a class="nav-item nav-link" href="javascript:bunker_logout();">Logout</a>
                        </div>
                    </div>
--- a/ui/site/user-profile.html
+++ b/ui/site/user-profile.html
@@ -51,6 +51,7 @@ if (conf["custom_css_file"]) {
                            <a class="nav-item nav-link" href="user-apps.html">App data</a>
                            <a class="nav-item nav-link" href="user-privacy-portal.html">Privacy portal</a>
                            <a class="nav-item nav-link" href="user-audit.html">History</a>
+							<a class="nav-item nav-link" href="user-requests.html">My requests</a>
                            <a class="nav-item nav-link" href="javascript:bunker_logout();">Logout</a>
                        </div>
                    </div>
--- a/ui/site/user-requests.html
+++ b/ui/site/user-requests.html
@@ -0,0 +1,222 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <title>Data Bunker - admin / view user requests</title>
+  <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+    integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css"
+    integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.15.5/dist/bootstrap-table.min.css">
+  <link rel="stylesheet" href="style.css">
+
+  <script src="https://code.jquery.com/jquery-3.3.1.min.js"
+    integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
+    integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
+    crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+    integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+    crossorigin="anonymous"></script>
+  <script src="https://unpkg.com/bootstrap-table@1.15.5/dist/bootstrap-table.min.js"></script>
+ 
+  <script src="jdiff/jdd.js" type="text/javascript" charset="utf-8"></script>
+  <link rel="stylesheet" href="jdiff/jdd.css">
+  
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/highlight.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/languages/json.min.js"></script>
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/styles/a11y-dark.min.css">
+
+  <script>
+    var xtoken = window.localStorage.getItem('xtoken');
+    var token = window.localStorage.getItem('token');
+    function displayTargetObject(target, row, index) {
+      if (row.mode) {
+        return '(' + row.mode + ') ' + target;
+      }
+      return target;
+    }
+    function displayActivity(action, row, index) {
+      var info = '';
+      if (row.brief) {
+        info = '(' + row.brief + ') ';
+      }
+      if (row.app) {
+        info = '(' + row.app + ') ';
+      }
+      result = '';
+      if (row.status && row.status == "ok") {
+        result = '<i class="fas fa-check"></i>&nbsp;' + info + action;
+      } else {
+        result = '<i class="fas fa-times"></i>&nbsp;' + info + action;
+      }
+      return result;
+    }
+    function displayDrillDownLink(rtoken, row, index) {
+      console.log(row);
+      var links = '<a href=\'javascript:displayRequest(\"' + rtoken +
+        '\");\'>view</a>&nbsp;|&nbsp;';
+      links += '<a href=\'javascript:cancelRequest(\"' + rtoken +
+          '\");\'>reject</a>';
+      return links;
+    }
+    var modalPopup;
+
+    function cancelRequest(request) {
+      var xhr = new XMLHttpRequest();
+      xhr.open('DELETE', "/v1/request/" + request);
+      xhr.setRequestHeader("X-Bunker-Token", xtoken)
+      xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+      xhr.onload = function () {
+        if (xhr.status === 200) {
+          document.location.reload();
+        } else if (xhr.status > 400 && xhr.status < 500) {
+          //alert("error, try again");
+          document.location = "/";
+        }
+      }
+      xhr.send();
+    }
+
+    function displayRequest(rtoken) {
+      var xhr0 = new XMLHttpRequest();
+      // first save consent
+      xhr0.open('GET', '/v1/request/' + rtoken, false);
+      xhr0.setRequestHeader("X-Bunker-Token", xtoken)
+      xhr0.setRequestHeader('Content-type', 'application/json');
+      xhr0.onload = function () {
+        if (xhr0.status === 200) {
+          var data = JSON.parse(xhr0.responseText);
+          if (data.status == "ok") {
+		  	console.log("aaaa", data)
+            var d = JSON.stringify(data, null, 4);
+            setTimeout(function () {
+              if (data["original"] && data["change"]) {
+                var code = '<div class="diffcontainer"><div id="report"></div>'+
+			   '<pre id="out" class="left" class="codeBlock"></pre>'+
+		           '<pre id="out2" class="right" class="codeBlock"></pre>'+
+			   '<ul id="toolbar" class="toolbar"></ul></div>';
+                $('#drilldown').html(code);
+                jdd.compare(data["original"], data["change"]);
+	          } else {
+	            $('#drilldown').html('<pre><code class="json">' + d + '</code></pre>');
+                document.querySelectorAll('pre code').forEach((block) => {
+                  hljs.highlightBlock(block);
+                });
+              }
+            }, 300);
+          }
+        }
+      }
+      xhr0.send();
+
+      var heading = "Request drill down";
+      var text = "Display event: " + rtoken;
+      var cancelButtonTxt = "Close popup";
+      if (modalPopup) {
+        $('#request-event-text').text(text)
+        modalPopup.modal('show');
+        return;
+      }
+      modalPopup =
+        $('<div class="modal fade" role="dialog"><div class="modal-dialog" role="document" style="max-width: 80%;"><div class="modal-content">' +
+          '<div class="modal-header">' +
+          '<h5 class="modal-title">' + heading + '</h5>' +
+          '<button type="button" class="close" data-dismiss="modal" aria-label="Close">' +
+          '<span aria-hidden="true">&times;</span></button>' +
+          '</div>' +
+          '<div class="modal-body">' +
+          '<p id="request-event-text">' + text + '</p>' +
+          '<div id="drilldown"></div>' +
+          '</div>' +
+          '<div class="modal-footer">' +
+          '<a href="#" class="btn" data-dismiss="modal">' +
+          cancelButtonTxt +
+          '</a>' +
+          '</div>' +
+          '</div></div></div>');
+
+      modalPopup.find('#okButton').click(function (event) {
+        //callback();
+        //cancelConsent(brief);
+        modalPopup.modal('hide');
+      });
+
+      modalPopup.modal('show');
+    }
+
+    $(function () {
+      //$('#msg').text("Loading data")
+      $('#table').bootstrapTable({
+        /*data: mydata */
+        url: "/v1/requests/token/"+token,
+        undefinedText: 'n/a',
+        /* url: "data1.json", */
+        method: "GET",
+        ajaxOptions: {
+          headers: { "X-Bunker-Token": xtoken },
+          crossDomain: true
+        },
+        showExtendedPagination: true,
+        sidePagination: "server",
+        pagination: true,
+        search: false,
+        classes: "table",
+        onLoadError: function (status, res) {
+          console.log(status);
+          if (status > 400 && status < 500) {
+            document.location = "/";
+          }
+        }
+      });
+    });
+  </script>
+  <script src="site.js"></script>
+</head>
+
+<body>
+  <div class="container">
+    <div class="row col-md-12">
+      <div style="width:100%;">
+        <nav class="navbar navbar-expand-lg navbar-light bg-light">
+          <a class="navbar-brand" href="#">Menu</a>
+                    <button class="navbar-toggler" type="button" data-toggle="collapse"
+                        data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false"
+                        aria-label="Toggle navigation">
+                        <span class="navbar-toggler-icon"></span>
+                    </button>
+                    <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+                        <div class="navbar-nav">
+                            <a class="nav-item nav-link" href="user-profile.html">Profile</a>
+                            <a class="nav-item nav-link" href="user-apps.html">App data</a>
+                            <a class="nav-item nav-link" href="user-privacy-portal.html">Privacy portal</a>
+                            <a class="nav-item nav-link" href="user-audit.html">History</a>
+							<a class="nav-item nav-link active" href="user-requests.html">My requests</a>
+                            <a class="nav-item nav-link" href="javascript:bunker_logout();">Logout</a>
+                        </div>
+                    </div>
+        </nav>
+      </div>
+      <div class="bigblock">
+        <h4>User requests</h4>
+        <p id="msg">All open requests listed below.</p>
+        <table id="table" class="table">
+          <thead>
+            <tr>
+              <th scope="col-2" data-field="when" data-formatter="dateFormat">Time</th>
+              <th scope="col-2" data-field="token" data-formatter="displayTargetObject">User Identifier</th>
+              <th scope="col-4" data-field="action" data-formatter="displayActivity">Activity</th>
+              <th scope="col-2" data-field="status">Status</th>
+              <th scope="col-2" data-field="rtoken" data-formatter="displayDrillDownLink">Actions</th>
+            </tr>
+          </thead>
+        </table>
+      </div>
+    </div>
+  </div>
+</body>
+
+</html>