Multi tenant support in webconsole

backend/WebUI/model_tenant_data.go

@@ -0,0 +1,6 @@
+package WebUI
+
+type Tenant struct {
+	TenantId   string `json:"tenantId"`
+	TenantName string `json:"tenantName"`
+}

backend/WebUI/model_user_data.go

@@ -0,0 +1,8 @@
+package WebUI
+
+type User struct {
+	UserId            string `json:"userId"`
+	TenantId          string `json:"tenantId"`
+	Email             string `json:"email"`
+	EncryptedPassword string `json:"encryptedPassword"`
+}

backend/WebUI/routers.go

@@ -60,6 +60,90 @@ var routes = Routes{
 		GetSampleJSON,
 	},
 
+	{
+		"Login",
+		http.MethodPost,
+		"/login",
+		Login,
+	},
+
+	{
+		"Logout",
+		http.MethodPost,
+		"/logout",
+		Logout,
+	},
+
+	{
+		"GetTenants",
+		http.MethodGet,
+		"/tenant",
+		GetTenants,
+	},
+
+	{
+		"GetTenantByID",
+		http.MethodGet,
+		"/tenant/:tenantId",
+		GetTenantByID,
+	},
+
+	{
+		"PostTenant",
+		http.MethodPost,
+		"/tenant",
+		PostTenant,
+	},
+
+	{
+		"PutTenantByID",
+		http.MethodPut,
+		"/tenant/:tenantId",
+		PutTenantByID,
+	},
+
+	{
+		"DeleteTenantByID",
+		http.MethodDelete,
+		"/tenant/:tenantId",
+		DeleteTenantByID,
+	},
+
+	{
+		"GetUsers",
+		http.MethodGet,
+		"/tenant/:tenantId/user",
+		GetUsers,
+	},
+
+	{
+		"GetUserByID",
+		http.MethodGet,
+		"/tenant/:tenantId/user/:userId",
+		GetUserByID,
+	},
+
+	{
+		"PostUserByID",
+		http.MethodPost,
+		"/tenant/:tenantId/user",
+		PostUserByID,
+	},
+
+	{
+		"PutUserByID",
+		http.MethodPut,
+		"/tenant/:tenantId/user/:userId",
+		PutUserByID,
+	},
+
+	{
+		"DeleteUserByID",
+		http.MethodDelete,
+		"/tenant/:tenantId/user/:userId",
+		DeleteUserByID,
+	},
+
 	{
 		"GetSubscribers",
 		http.MethodGet,

frontend/src/components/SideBar/Nav.js

@@ -1,11 +1,25 @@
 import React, {Component} from 'react';
 import {Link, withRouter} from 'react-router-dom';
+import LocalStorageHelper from "../../util/LocalStorageHelper";
 
 class Nav extends Component {
   state = {};
 
   render() {
     let {location} = this.props;
+    let user = LocalStorageHelper.getUserInfo();
+    let childView = "";
+    if (user.accessToken === "admin") {
+      childView = (
+          <li className={this.isPathActive('/tenants') ? 'active' : null}>
+          <Link to="/tenants">
+          <i className="pe-7s-users"/>
+          <p>Tenant and User</p>
+          </Link>
+          </li>
+      );
+    }
+
     /* Icons:
      *  - https://fontawesome.com/icons
      *  - http://themes-pixeden.com/font-demos/7-stroke/
@@ -33,6 +47,8 @@ class Nav extends Component {
           </Link>
         </li>
 
+      {childView}
+
       </ul>
     );
   }

frontend/src/models/Tenant.js

@@ -0,0 +1,12 @@
+import Serializable from "./Serializable";
+
+export default class Tenant extends Serializable{
+  id = '';
+  name = "";
+
+  constructor(id, name) {
+    super();
+    this.id = id;
+    this.name = name;
+  }
+}

frontend/src/models/User.js

@@ -4,11 +4,17 @@ export default class User extends Serializable{
   username = "";
   name = "";
   imageUrl = "";
+  accessToken = "";
+  id = '';
+  email = "";
 
-  constructor(username, name) {
+  constructor(username, name, accessToken, id, email) {
     super();
     this.username = username;
     this.name = name;
     this.imageUrl = 'https://cdn1.iconfinder.com/data/icons/evil-icons-user-interface/64/avatar-256.png';
+    this.accessToken = accessToken;
+    this.id = id;
+    this.email = email;
   }
 }

frontend/src/pages/Main/index.js

@@ -13,7 +13,9 @@ import SideBar from '../../components/SideBar';
 import Subscribers from '../Subscribers';
 import Tasks from '../Tasks';
 import UEInfo from '../Dashboard';
-import UEInfoDetail from '../UEInfoDetail'
+import UEInfoDetail from '../UEInfoDetail';
+import Tenants from '../Tenants';
+import Users from '../Users';
 
 const Main = ({
                 mobileNavVisibility,
@@ -47,6 +49,8 @@ const Main = ({
           <Route exact path="/tasks" component={Tasks}/>
           <Route exact path="/ueinfo" component={UEInfo}/>
           <Route exact path="/ueinfo/:id" component={UEInfoDetail}/>
+          <Route exact path="/tenants" component={Tenants}/>
+          <Route exact path="/users/:id" component={Users}/>
 
           <Footer/>
         </div>

frontend/src/pages/Tenants/TenantOverview.js

@@ -0,0 +1,132 @@
+import React, { Component } from 'react';
+import { Link, withRouter } from "react-router-dom";
+import { connect } from "react-redux";
+import { Button, Table } from "react-bootstrap";
+import TenantModal from "./components/TenantModal";
+import ApiHelper from "../../util/ApiHelper";
+
+class TenantOverview extends Component {
+  state = {
+    tenantModalOpen: false,
+    tenantModalData: null,
+  };
+
+  componentDidMount() {
+    ApiHelper.fetchTenants().then();
+  }
+
+  openAddTenant() {
+    this.setState({
+      tenantModalOpen: true,
+      tenantModalData: null,
+    });
+  }
+
+  /**
+   * @param tenantId  {string}
+   */
+  async openEditTenant(tenantId) {
+    const tenant = await ApiHelper.fetchTenantById(tenantId);
+
+    this.setState({
+      tenantModalOpen: true,
+      tenantModalData: tenant,
+    });
+  }
+
+  async addTenant(tenantData) {
+    this.setState({ tenantModalOpen: false });
+
+    if (!await ApiHelper.createTenant(tenantData)) {
+      alert("Error creating new tenant");
+    }
+    ApiHelper.fetchTenants().then();
+  }
+
+  /**
+   * @param tenantData
+   */
+  async updateTenant(tenantData) {
+    this.setState({ tenantModalOpen: false });
+
+    const result = await ApiHelper.updateTenant(tenantData);
+
+    if (!result) {
+      alert("Error updating tenant: " + tenantData["ueId"]);
+    }
+    ApiHelper.fetchTenants().then();
+  }
+
+  /**
+  * @param tenant  {Tenant}
+   */
+  async deleteTenant(tenant) {
+    if (!window.confirm(`Delete tenant ${tenant.id}?`))
+      return;
+
+    const result = await ApiHelper.deleteTenant(tenant.id);
+    ApiHelper.fetchTenants().then();
+    if (!result) {
+      alert("Error deleting tenant: " + tenant.id);
+    }
+  }
+
+  render() {
+    return (
+      <div className="container-fluid">
+        <div className="row">
+          <div className="col-md-12">
+            <div className="card">
+              <div className="header subscribers__header">
+                <h4>Tenants</h4>
+                <Button bsStyle={"primary"} className="subscribers__button"
+                  onClick={this.openAddTenant.bind(this)}>
+                  New Tenant
+                </Button>
+              </div>
+              <div className="content subscribers__content">
+                <Table className="subscribers__table" striped bordered condensed hover>
+                  <thead>
+                    <tr>
+                      <th style={{ width: 400 }}>Tenant ID</th>
+                      <th colSpan={2}>Tenant Name</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {this.props.tenants.map(tenant => (
+                      <tr key={tenant.id}>
+                        <td>{tenant.id}</td>
+                        <td><font color="blue"><u><Link to={"/users/"+tenant.id}>{tenant.name}</Link></u></font></td>
+                        <td style={{ textAlign: 'center' }}>
+                          <Button variant="danger" onClick={this.deleteTenant.bind(this, tenant)}>Delete</Button>
+                         &nbsp;&nbsp;&nbsp;&nbsp;
+                        <Button variant="info" onClick={this.openEditTenant.bind(this, tenant.id)}>Modify</Button>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </Table>
+
+                <p>&nbsp;</p><p>&nbsp;</p>
+                <p>&nbsp;</p><p>&nbsp;</p>
+                <p>&nbsp;</p><p>&nbsp;</p>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <TenantModal open={this.state.tenantModalOpen}
+          setOpen={val => this.setState({ tenantModalOpen: val })}
+          tenant={this.state.tenantModalData}
+          onModify={this.updateTenant.bind(this)}
+          onSubmit={this.addTenant.bind(this)} />
+      </div>
+    );
+  }
+}
+
+const mapStateToProps = state => ({
+  tenants: state.tenant.tenants,
+});
+
+export default withRouter(connect(mapStateToProps)(TenantOverview));