google · google-oss-robot · Sep 18, 2020 · Sep 17, 2020 · Sep 17, 2020 · Sep 17, 2020
@@ -10,6 +10,7 @@
 
 <head>
   {{template "head" .}}
+  {{template "firebase" .}}
 </head>
 
 <body class="bg-light">
@@ -22,19 +23,134 @@ <h1>Import users</h1>
     <p>Bulk import a list of users to <strong>{{.currentRealm.Name}}</strong>.</p>
 
     <div class="card mb-3 shadow-sm">
-      <div class="card-header">Import options</div>
+      <div class="card-header">Import</div>
       <div class="card-body">
         <div class="alert alert-warning">
           <span class="oi oi-beaker"></span> This feature is still under
           active development.
         </div>
-        <small class="form-text text-muted">Coming soon</small>
+
+        <form id="form">
+          <div class="custom-file">
+            <input type="file" class="custom-file-input" id="csv" accept=".csv" required>
+            <label class="custom-file-label" for="csv" id="fileLabel">Select a CSV file</label>
+          </div>
+          <button class="btn btn-primary" type="submit" id="import" disabled>Import users</button>
+        </form>
+      </div>
+
+      <div class="card-body">
+        <div class="progress">
+          <div id="progress" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0"
+            aria-valuemax="100"></div>
+        </div>
+        <table class="table table-bordered" id="csvtable" style="display:none;">
+          <thead>
+            <tr>
+              <th>Email</th>
+              <th>Name</th>
+            </tr>
+          </thead>
+          <tbody id="csvtablebody"></tbody>
+        </table>
       </div>
     </div>
-    <a class="card-link" href="/users">&larr; All users</a>
+    <a class=" card-link" href="/users">&larr; All users</a>
   </main>
 
   {{template "scripts" .}}
+  <script type="text/javascript">
+    $(function() {
+      let $form = $('#form');
+      let $csv = $('#csv');
+      let $fileLabel = $('#fileLabel');
+      let $import = $('#import');
+      let $table = $('#csvtable');
+      let $tableBody = $('#csvtablebody');
+      let $progress = $('#progress');
+
+      if (typeof (FileReader) == "undefined") {
+        flash("Your browser does not support the required HTML5 file reader.", "danger");
+      } else {
+        $csv.prop('disabled', false);
+      }
+
+      $csv.change(function(file) {
+        let fileName = file.target.files[0].name;
+        $fileLabel.html(fileName);
+        $import.prop('disabled', false);
+      });
+
+      $form.on('submit', function(event) {
+        event.preventDefault();
+        $import.prop('disabled', true);
+
+        $table.show(400);
+
+        var reader = new FileReader();
+        reader.onload = readCSV
+        reader.readAsText($csv[0].files[0]);
+      });
+
+      const batchSize = 20
+
+      async function readCSV(e) {
+        let rows = e.target.result.split("\n");
+        let batch = [];
+        for (let i = 0; i < rows.length; i++) {
+          if (rows[i].trim() != "") {
+            if (batch.length >= batchSize) {
+              $tableBody.empty();
+              batch = []
+            }
+
+            let user = {};
+            let cols = rows[i].split(",");
+            user["email"] = cols[0].trim();
+            user["name"] = (cols.length > 1) ? cols[1].trim() : "";
+
+            let row = "<tr><td>" + user["email"] + "</td><td>" + user["name"] + "</td></tr>";
+            $tableBody.append(row);
+
+            batch.push(user);
+          }
+
+          if (batch.length >= batchSize || i == rows.length - 1) {
+            let percent = Math.floor((i + 1) * 100 / rows.length) + "%"
+            $progress.width(percent);
+            $progress.html(percent)
+            uploadBatch(batch);
+          }
+        }
+        $table.hide(400);
+        $import.prop('disabled', false);
+      }
+    });
+
+    function uploadBatch(data) {
+      $.ajax({
+        type: 'POST',
+        url: '/users/import/userbatch',
+        data: JSON.stringify({ "users": data }),
+        headers: { 'X-CSRF-Token': '{{.csrfToken}}' },
+        contentType: 'application/json',
+        success: function(result) {
+          for (user of result.newUsers) {
+            let pwd = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+            firebase.auth().createUserWithEmailAndPassword(user.email, pwd)
+              .then(function(userCredential) {
+                return firebase.auth().sendPasswordResetEmail(user.email);
+              }).catch(function(error) {
+                flash(error.message, "danger")
+              });
+          }
+        },
+        error: function(xhr, status, e) {
+          flash(status + " " + e, "danger")
+        }
+      });
+    }
+  </script>
 </body>
 
 </html>

@@ -29,7 +29,7 @@ <h1>Users</h1>
             <span class="oi oi-plus" aria-hidden="true"></span>
             New user
           </a>
-          <a class="btn btn-sm disabled" href="/users/import" data-toggle="tooltip" title="Bulk import users">
+          <a class="btn btn-sm" href="/users/import" data-toggle="tooltip" title="Bulk import users">
             <span class="oi oi-data-transfer-upload" aria-hidden="true"></span>
             Import
           </a>

@@ -312,6 +312,7 @@ func realMain(ctx context.Context) error {
 		userSub.Handle("", userController.HandleCreate()).Methods("POST")
 		userSub.Handle("/new", userController.HandleCreate()).Methods("GET")
 		userSub.Handle("/import", userController.HandleImport()).Methods("GET")
+		userSub.Handle("/import/userbatch", userController.HandleImportBatch()).Methods("POST")
 		userSub.Handle("/{id}/edit", userController.HandleUpdate()).Methods("GET")
 		userSub.Handle("/{id}", userController.HandleShow()).Methods("GET")
 		userSub.Handle("/{id}", userController.HandleUpdate()).Methods("PATCH")

diff --git a/go.mod b/go.mod
@@ -21,6 +21,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/schema v1.2.0
 	github.com/gorilla/sessions v1.2.1
+	github.com/hashicorp/go-multierror v1.1.0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/jinzhu/now v1.1.1 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect

diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -140,6 +140,27 @@ type CSRFResponse struct {
 	ErrorCode string `json:"errorCode"`
 }
 
+// UserBatchRequest is a request for bulk creation of users.
+// This is called by the Web frontend.
+// API is served at /users/import/userbatch
+type UserBatchRequest struct {
+	Users []BatchUser `json:"users"`
+}
+
+// BatchUser represents a single user's email/name.
+type BatchUser struct {
+	Email string `json:"email"`
+	Name  string `json:"name"`
+}
+
+// UserBatchResponse defines the response type for UserBatchRequest.
+type UserBatchResponse struct {
+	NewUsers []BatchUser `json:"newUsers"`
+
+	Error     string `json:"error"`
+	ErrorCode string `json:"errorCode,omitempty"`
+}
+
 // IssueCodeRequest defines the parameters to request an new OTP (short term)
 // code. This is called by the Web frontend.
 // API is served at /api/issue

diff --git a/pkg/controller/user/import.go b/pkg/controller/user/import.go
@@ -31,5 +31,6 @@ func (c *Controller) HandleImport() http.Handler {
 
 func (c *Controller) renderImport(ctx context.Context, w http.ResponseWriter) {
 	m := controller.TemplateMapFromContext(ctx)
+	m["firebase"] = c.config.Firebase
 	c.h.RenderHTML(w, "users/import", m)
 }
@@ -0,0 +1,86 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package user
+
+import (
+	"net/http"
+
+	"github.com/google/exposure-notifications-verification-server/pkg/api"
+	"github.com/google/exposure-notifications-verification-server/pkg/controller"
+	"github.com/google/exposure-notifications-verification-server/pkg/database"
+	"github.com/hashicorp/go-multierror"
+)
+
+func (c *Controller) HandleImportBatch() http.Handler {
+	logger := c.logger.Named("user.HandleImportBatch")
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+
+		realm := controller.RealmFromContext(ctx)
+		if realm == nil {
+			controller.MissingRealm(w, r, c.h)
+			return
+		}
+
+		var request api.UserBatchRequest
+		if err := controller.BindJSON(w, r, &request); err != nil {
+			logger.Errorw("Error decoding request", "error", err)
+			c.h.RenderJSON(w, http.StatusBadRequest, api.Error(err))
+			return
+		}
+
+		newUsers := []api.BatchUser{}
+
+		var batchErr error
+		for _, batchUser := range request.Users {
+			// See if the user already exists by email - they may be a member of another
+			// realm.
+			user, err := c.db.FindUserByEmail(batchUser.Email)
+			alreadyExists := true
+			if err != nil {
+				if !database.IsNotFound(err) {
+					logger.Errorw("Error finding user", "error", err)
+					batchErr = multierror.Append(batchErr, err)
+					continue
+				}
+
+				user = new(database.User)
+				alreadyExists = false
+			}
+
+			// Build the user struct - keeping email and name if user already exists in another realm.
+			if !alreadyExists {
+				newUsers = append(newUsers, batchUser)
+				user.Email = batchUser.Email
+				user.Name = batchUser.Name
+			}
+			user.Realms = append(user.Realms, realm)
+
+			if err := c.db.SaveUser(user); err != nil {
+				logger.Errorw("Error saving user", "error", err)
+				batchErr = multierror.Append(batchErr, err)
+				continue
+			}
+		}
+
+		if batchErr != nil {
+			controller.InternalError(w, r, c.h, batchErr)
+		}
+
+		c.h.RenderJSON(w, http.StatusOK, api.UserBatchResponse{
+			NewUsers: newUsers,
+		})
+	})
+}