Merge pull request #581 from CityOfNewYork/johnyu95-public-nycid-miss…

…ing-name Public NYC.ID Missing Name
CityOfNewYork · May 13, 2024 · 3e8f9ad · 3e8f9ad
2 parents 640444c + de63174
commit 3e8f9ad
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/app/request/views.py b/app/request/views.py
@@ -164,6 +164,9 @@ def new():
             else current_app.config["APP_TIMEZONE"]
         )
         if current_user.is_public:
+            if current_user.first_name == '' or current_user.last_name == '':
+                flash('Missing first or last name. Please update your name on the Profile page.', category='danger')
+                return redirect(url_for("request.new"))
             request_id = create_request(
                 escape(form.request_title.data),
                 escape(form.request_description.data),

diff --git a/app/templates/auth/concurrent_session_modal.html b/app/templates/auth/concurrent_session_modal.html
@@ -4,7 +4,6 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                 <h4 class="modal-title" id="concurrent-session-label">You are currently logged in to another session</h4>
-                </h4>
             </div>
             <div class="modal-body">
                 For your security, we have logged you out of your other active sessions.

diff --git a/app/templates/auth/missing_name_modal.html b/app/templates/auth/missing_name_modal.html
@@ -0,0 +1,15 @@
+<div id="missing-name-modal" class="modal" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="missing-name-label">Profile Missing Name</h4>
+            </div>
+            <div class="modal-body">
+                Error, your profile is missing a name. Please click continue to update your profile.
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-default" type="button" id="continue-to-profile" href="#">Continue</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -67,6 +67,7 @@
     {% endwith %}
 </div>
 {% include 'auth/concurrent_session_modal.html' %}
+{% include 'auth/missing_name_modal.html' %}
 <div class="wrapper">
     {% block content %}
     {% endblock %}

diff --git a/app/templates/base.js.html b/app/templates/base.js.html
@@ -9,6 +9,10 @@
             "href",
             webServicesUrl + "/account/user/profile.htm?returnOnSave=true&target=" + btoa(window.location.href)
         );
+        $("#continue-to-profile").attr(
+            "href",
+            webServicesUrl + "/account/user/profile.htm?returnOnSave=true&target=" + btoa(window.location.origin + "/auth/logout")
+        );
     {% endif %}
 
     $.ajaxSetup({
@@ -50,6 +54,9 @@
         {% if duplicate_session %}
             $("#concurrent-session-modal").modal("show");
         {% endif %}
+        {% if current_user.is_public and (current_user.first_name == "" or current_user.last_name == "") %}
+            $("#missing-name-modal").modal("show");
+        {% endif %}
     {% endif %}
 
 

diff --git a/app/templates/request/_edit_requester_info.html b/app/templates/request/_edit_requester_info.html
@@ -4,7 +4,11 @@ <h4>Requester</h4>
     <h4>
         <a data-target="#requesterModal" data-toggle="modal" class="MainNavText" id="MainNavHelp"
            href="#requesterModal">
-            {{ request.requester.name | title | safe }}
+            {% if request.requester.first_name == "" or request.requester.last_name == "" %}
+                Missing Name
+            {% else %}
+                {{ request.requester.name | title | safe }}
+            {% endif %}
         </a>
     </h4>
 </div>