From 1a167290647fe8a647efb27204db52b1434e7e48 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 3 Apr 2018 14:43:12 -0400
Subject: [PATCH] added org 2fa info to admin pages

---
 src/Admin/Views/Organizations/Index.cshtml    | 25 +++++++++++++------
 .../Organizations/_ViewInformation.cshtml     |  3 +++
 src/Admin/Views/Users/Index.cshtml            |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Admin/Views/Organizations/Index.cshtml b/src/Admin/Views/Organizations/Index.cshtml
index ca2e2c37f4..b68aea05d7 100644
--- a/src/Admin/Views/Organizations/Index.cshtml
+++ b/src/Admin/Views/Organizations/Index.cshtml
@@ -10,12 +10,15 @@
     <input type="text" class="form-control mb-2 mr-2" placeholder="Name" asp-for="Name" name="name">
     <label class="sr-only" asp-for="UserEmail">User email</label>
     <input type="text" class="form-control mb-2 mr-2" placeholder="User email" asp-for="UserEmail" name="userEmail">
-    <label class="sr-only" asp-for="Paid">Customer</label>
-    <select class="form-control mb-2 mr-2" asp-for="Paid" name="paid">
-        <option asp-selected="!Model.Paid.HasValue" value="">-- Customer --</option>
-        <option asp-selected="Model.Paid.GetValueOrDefault(false)" value="true">Paid</option>
-        <option asp-selected="!Model.Paid.GetValueOrDefault(true)" value="false">Freeloader</option>
-    </select>
+    @if(!Model.SelfHosted)
+    {
+        <label class="sr-only" asp-for="Paid">Customer</label>
+        <select class="form-control mb-2 mr-2" asp-for="Paid" name="paid">
+            <option asp-selected="!Model.Paid.HasValue" value="">-- Customer --</option>
+            <option asp-selected="Model.Paid.GetValueOrDefault(false)" value="true">Paid</option>
+            <option asp-selected="!Model.Paid.GetValueOrDefault(true)" value="false">Freeloader</option>
+        </select>
+    }
     <button type="submit" class="btn btn-primary mb-2" title="Search"><i class="fa fa-search"></i> Search</button>
 </form>
 
@@ -27,7 +30,7 @@
                 <th style="width: 190px;">Plan</th>
                 <th style="width: 80px;">Seats</th>
                 <th style="width: 150px;">Created</th>
-                <th style="width: 150px; min-width: 150px;">Details</th>
+                <th style="width: 170px; min-width: 170px;">Details</th>
             </tr>
         </thead>
         <tbody>
@@ -87,6 +90,14 @@
                             {
                                 <i class="fa fa-times-circle-o fa-lg fa-fw text-muted" title="Disabled"></i>
                             }
+                            @if(org.TwoFactorIsEnabled())
+                            {
+                                <i class="fa fa-lock fa-lg fa-fw" title="2FA Enabled"></i>
+                            }
+                            else
+                            {
+                                <i class="fa fa-unlock fa-lg fa-fw text-muted" title="2FA Not Enabled"></i>
+                            }
                         </td>
                     </tr>
                 }
diff --git a/src/Admin/Views/Organizations/_ViewInformation.cshtml b/src/Admin/Views/Organizations/_ViewInformation.cshtml
index 047de6152f..9a14108152 100644
--- a/src/Admin/Views/Organizations/_ViewInformation.cshtml
+++ b/src/Admin/Views/Organizations/_ViewInformation.cshtml
@@ -18,6 +18,9 @@
     <dt class="col-sm-4 col-lg-3">Admins</dt>
     <dd class="col-sm-8 col-lg-9">@(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)</dd>
 
+    <dt class="col-sm-4 col-lg-3">Using 2FA</dt>
+    <dd class="col-sm-8 col-lg-9">@(Model.Organization.TwoFactorIsEnabled() ? "Yes" : "No")</dd>
+
     <dt class="col-sm-4 col-lg-3">Created</dt>
     <dd class="col-sm-8 col-lg-9">@Model.Organization.CreationDate.ToString()</dd>
 
diff --git a/src/Admin/Views/Users/Index.cshtml b/src/Admin/Views/Users/Index.cshtml
index 447b95c63f..8304c90123 100644
--- a/src/Admin/Views/Users/Index.cshtml
+++ b/src/Admin/Views/Users/Index.cshtml
@@ -17,7 +17,7 @@
             <tr>
                 <th>Email</th>
                 <th style="width: 150px;">Created</th>
-                <th style="width: 170px; min-width: 150px;">Details</th>
+                <th style="width: 170px; min-width: 170px;">Details</th>
             </tr>
         </thead>
         <tbody>