Add domain search

simple-login · Dec 19, 2024 · f2e3b3d · f2e3b3d
1 parent 4a09a15
commit f2e3b3d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/app/admin_model.py b/app/admin_model.py
@@ -1011,6 +1011,10 @@ def index(self):
                 user = User.get_by(id=user_id)
             except ValueError:
                 user = User.get_by(email=query)
+                if user is None:
+                    cd = CustomDomain.get_by(domain=query)
+                    if cd is not None:
+                        user = cd.user
             search = CustomDomainSearchResult.from_user(user)
             print("NEW", search.domains)
 

diff --git a/templates/admin/custom_domain_search.html b/templates/admin/custom_domain_search.html
@@ -44,13 +44,14 @@ <h4>User <a href="/admin/email_search?email={{ user.email }}">{{ user.email }}</
         <h4 class="mb-3">{{ title }} <span class="text-success">Verified</span></h4>
     {% else %}
         <h4 class="mb-3">{{ title }}</h4>
-        <p>Expected {{expected}}</p>
-            <p>Current response</p>
-            <ul class="list-group">
-            {% for error in errors %}
-                <li class="list-group-item">{{ error }}</li>
-            {% endfor %}
-            </ul>
+        <p>Expected</p>
+        <p>{{expected}}</p>
+        <p>Current response</p>
+        <ul class="list-group">
+        {% for error in errors %}
+            <li class="list-group-item">{{ error }}</li>
+        {% endfor %}
+        </ul>
     {% endif %}
 {%- endmacro %}
 
@@ -70,7 +71,7 @@ <h3>Domain {{ domain_with_data.domain.domain }}</h3>
         </li>
         {% for dkim_domain in domain_with_data.dkim_expected %}
             <li class="list-group-item">
-            {{ show_verification("DKIM {}".format(dkim_domain), domain_with_data.dkim_expected[dkim_domain], [domain_with_data.dkim_validation.get(dkim_domain+"."+domain.domain,'')]) }}
+            {{ show_verification("DKIM {}.{}".format(dkim_domain, domain.domain), domain_with_data.dkim_expected[dkim_domain], [domain_with_data.dkim_validation.get(dkim_domain+"."+domain.domain,'')]) }}
             </li>
         {% endfor %}
     </ul>
@@ -83,7 +84,7 @@ <h3>Domain {{ domain_with_data.domain.domain }}</h3>
     <div class="border border-dark border-2 mt-1 mb-2 p-3">
         <form method="get">
             <div class="form-group">
-                <label for="email">User to search:</label>
+                <label for="email">User or domain to search:</label>
                 <input type="text"
                        class="form-control"
                        name="user"
@@ -105,7 +106,7 @@ <h3 class="mb-3">Found User {{ data.user.email }}</h3>
     <div class="d-flex">
 
     {% for domain_with_data in data.domains  %}
-        <div class="card m-2" style="width: 30rem;">
+        <div class="card m-2 border-dark" style="width: 30rem;">
         <div class="card-body">
             {{ show_domain(domain_with_data) }}
         </div>