From 9a8d8e12cf5c1a6931a1317eefebe73490f82132 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 19 Nov 2024 09:41:08 -0500
Subject: [PATCH 01/10] Added new header button that is displayed in header

---
 app/__init__.py                      | 12 ++++++++++++
 app/templates/components/header.html | 28 ++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 64580fcc1..43a60abab 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -173,6 +173,18 @@ def inject_feature_flags():
         ]
         return dict(FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled)
 
+    @application.context_processor
+    def inject_feature_flags():
+        feature_best_practices_enabled = application.config[
+            "FEATURE_ABOUT_PAGE_ENABLED"
+        ]
+        return dict(FEATURE_ABOUT_PAGE_ENABLED=feature_best_practices_enabled)
+
+    @application.context_processor
+    def inject_initial_signin_url():
+        url = os.getenv("LOGIN_DOT_GOV_INITIAL_SIGNIN_URL")
+        return {'initial_signin_url': url}
+
     notify_environment = os.environ["NOTIFY_ENVIRONMENT"]
 
     application.config.from_object(configs[notify_environment])
diff --git a/app/templates/components/header.html b/app/templates/components/header.html
index 248abf250..012b3b9c1 100644
--- a/app/templates/components/header.html
+++ b/app/templates/components/header.html
@@ -43,18 +43,29 @@
 <header class="usa-header usa-header--extended">
   <div class="usa-nav-container">
     <div class="usa-navbar">
-      <div class="usa-logo display-flex flex-align-center flex-justify" id="-logo">
-        <div class="logo-img display-flex">
-          <a href="/">
-            <span class="usa-sr-only">Notify.gov logo</span>
-            <img src="{{ (asset_path | default('/static')) + 'images/notify-logo.svg' }}" alt="Notify.gov logo"
-              class="usa-flag-logo margin-right-1">
+      <div class="display-flex flex-align-center flex-justify">
+        <div class="usa-logo display-flex flex-align-center flex-justify" id="-logo">
+          <div class="logo-img display-flex">
+            <a href="/">
+              <span class="usa-sr-only">Notify.gov logo</span>
+              <img src="{{ (asset_path | default('/static')) + 'images/notify-logo.svg' }}" alt="Notify.gov logo"
+                class="usa-flag-logo margin-right-1">
+            </a>
+          </div>
+          {% if navigation %}
+          <button type="button" class="usa-menu-btn">Menu</button>
+          {% endif %}
+        </div>
+        {% if not current_user.is_authenticated and FEATURE_ABOUT_PAGE_ENABLED %}
+        <div class="usa-nav__login">
+          <a class="usa-button usa-button login-button login-button--primary margin-right-2"
+            href="{{ initial_signin_url }}">Sign
+            in with <img src="{{ asset_url('images/logo-login.svg') }}" alt="Login.gov logo">
           </a>
         </div>
-        {% if navigation %}
-        <button type="button" class="usa-menu-btn">Menu</button>
         {% endif %}
       </div>
+
     </div>
     <nav aria-label="Primary navigation" class="usa-nav">
       <div class="usa-nav__inner">
@@ -89,6 +100,7 @@
             {% endif %}
           </ul>
         </div>
+
       </div>
     </nav>
   </div>

From 9023943bb1484eb8659359587db4ed3290bb7899 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 19 Nov 2024 10:49:30 -0500
Subject: [PATCH 02/10] Fixed a few errors

---
 app/__init__.py                      | 17 ++++++-----------
 app/templates/components/header.html |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 43a60abab..d59ad198b 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -168,17 +168,12 @@ def create_app(application):
 
     @application.context_processor
     def inject_feature_flags():
-        feature_best_practices_enabled = application.config[
-            "FEATURE_BEST_PRACTICES_ENABLED"
-        ]
-        return dict(FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled)
-
-    @application.context_processor
-    def inject_feature_flags():
-        feature_best_practices_enabled = application.config[
-            "FEATURE_ABOUT_PAGE_ENABLED"
-        ]
-        return dict(FEATURE_ABOUT_PAGE_ENABLED=feature_best_practices_enabled)
+        feature_best_practices_enabled = application.config.get("FEATURE_BEST_PRACTICES_ENABLED", False)
+        feature_about_page_enabled = application.config.get("FEATURE_ABOUT_PAGE_ENABLED", False)
+        return dict(
+          FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled,
+         FEATURE_ABOUT_PAGE_ENABLED=feature_about_page_enabled,
+        )
 
     @application.context_processor
     def inject_initial_signin_url():
diff --git a/app/templates/components/header.html b/app/templates/components/header.html
index 012b3b9c1..a1c1de389 100644
--- a/app/templates/components/header.html
+++ b/app/templates/components/header.html
@@ -56,7 +56,7 @@
           <button type="button" class="usa-menu-btn">Menu</button>
           {% endif %}
         </div>
-        {% if not current_user.is_authenticated and FEATURE_ABOUT_PAGE_ENABLED %}
+        {% if not current_user.is_authenticated and FEATURE_ABOUT_PAGE_ENABLED and request.path == '/about'%}
         <div class="usa-nav__login">
           <a class="usa-button usa-button login-button login-button--primary margin-right-2"
             href="{{ initial_signin_url }}">Sign

From 9b246aa03fbbc1e27a1c14487aba2e7867f834bf Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 19 Nov 2024 12:06:09 -0500
Subject: [PATCH 03/10] Fixed indent

---
 app/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index d59ad198b..0c776a052 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -171,8 +171,8 @@ def inject_feature_flags():
         feature_best_practices_enabled = application.config.get("FEATURE_BEST_PRACTICES_ENABLED", False)
         feature_about_page_enabled = application.config.get("FEATURE_ABOUT_PAGE_ENABLED", False)
         return dict(
-          FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled,
-         FEATURE_ABOUT_PAGE_ENABLED=feature_about_page_enabled,
+            FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled,
+            FEATURE_ABOUT_PAGE_ENABLED=feature_about_page_enabled,
         )
 
     @application.context_processor

From 8231b671af4c008ad26a87ba68467eafdb27f898 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Thu, 21 Nov 2024 17:52:44 -0500
Subject: [PATCH 04/10] Updated logic in init to include nonce and state and
 removed from index

---
 app/__init__.py         | 26 +++++++++++++++++++++++++-
 app/main/views/index.py | 23 +----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 0c776a052..bce65ed98 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,8 +1,10 @@
 import os
+import secrets
 import pathlib
+
 from functools import partial
 from time import monotonic
-from urllib.parse import urlparse, urlunparse
+from urllib.parse import urlparse, urlunparse, unquote
 
 import jinja2
 from flask import (
@@ -114,6 +116,7 @@
     get_lines_with_normalised_whitespace,
 )
 from notifications_utils.recipients import format_phone_number_human_readable
+from notifications_utils.url_safe_token import generate_token
 
 login_manager = LoginManager()
 csrf = CSRFProtect()
@@ -177,7 +180,28 @@ def inject_feature_flags():
 
     @application.context_processor
     def inject_initial_signin_url():
+        ttl = 24 * 60 * 60
+
+        # make and store the state
+        state = generate_token(
+        str(request.remote_addr),
+        current_app.config["SECRET_KEY"],
+        current_app.config["DANGEROUS_SALT"],
+        )
+
+        state_key = f"login-state-{unquote(state)}"
+        redis_client.set(state_key, state, ex=ttl)
+
+         # make and store the nonce
+        nonce = secrets.token_urlsafe()
+        nonce_key = f"login-nonce-{unquote(nonce)}"
+        redis_client.set(nonce_key, nonce, ex=ttl)
+
         url = os.getenv("LOGIN_DOT_GOV_INITIAL_SIGNIN_URL")
+        if url is not None:
+            url = url.replace("NONCE", nonce)
+            url = url.replace("STATE", state)
+
         return {'initial_signin_url': url}
 
     notify_environment = os.environ["NOTIFY_ENVIRONMENT"]
diff --git a/app/main/views/index.py b/app/main/views/index.py
index 974e29211..c294a38e0 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -40,31 +40,10 @@ def index():
     if current_user and current_user.is_authenticated:
         return redirect(url_for("main.choose_account"))
 
-    ttl = 24 * 60 * 60
-
-    # make and store the state
-    state = generate_token(
-        str(request.remote_addr),
-        current_app.config["SECRET_KEY"],
-        current_app.config["DANGEROUS_SALT"],
-    )
-    state_key = f"login-state-{unquote(state)}"
-    redis_client.set(state_key, state, ex=ttl)
-
-    # make and store the nonce
-    nonce = secrets.token_urlsafe()
-    nonce_key = f"login-nonce-{unquote(nonce)}"
-    redis_client.set(nonce_key, nonce, ex=ttl)
-
-    url = os.getenv("LOGIN_DOT_GOV_INITIAL_SIGNIN_URL")
-    if url is not None:
-        url = url.replace("NONCE", nonce)
-        url = url.replace("STATE", state)
     return render_template(
         "views/signedout.html",
         sms_rate=CURRENT_SMS_RATE,
-        counts=status_api_client.get_count_of_live_services_and_organizations(),
-        initial_signin_url=url,
+        counts=status_api_client.get_count_of_live_services_and_organizations()
     )
 
 

From c768b092559ca5ec875b0f905d262888905a5c33 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Mon, 25 Nov 2024 11:51:01 -0500
Subject: [PATCH 05/10] Fixed indenting

---
 app/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index bce65ed98..7fca5d4c4 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -184,15 +184,15 @@ def inject_initial_signin_url():
 
         # make and store the state
         state = generate_token(
-        str(request.remote_addr),
-        current_app.config["SECRET_KEY"],
-        current_app.config["DANGEROUS_SALT"],
+            str(request.remote_addr),
+            current_app.config["SECRET_KEY"],
+            current_app.config["DANGEROUS_SALT"],
         )
 
         state_key = f"login-state-{unquote(state)}"
         redis_client.set(state_key, state, ex=ttl)
 
-         # make and store the nonce
+        # make and store the nonce
         nonce = secrets.token_urlsafe()
         nonce_key = f"login-nonce-{unquote(nonce)}"
         redis_client.set(nonce_key, nonce, ex=ttl)
@@ -204,6 +204,7 @@ def inject_initial_signin_url():
 
         return {'initial_signin_url': url}
 
+
     notify_environment = os.environ["NOTIFY_ENVIRONMENT"]
 
     application.config.from_object(configs[notify_environment])

From c941e145878ed336150c2c44067e5fe107fa838f Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Mon, 25 Nov 2024 13:24:47 -0500
Subject: [PATCH 06/10] Added more spacing

---
 app/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/__init__.py b/app/__init__.py
index 7fca5d4c4..b92b96ac5 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -204,7 +204,6 @@ def inject_initial_signin_url():
 
         return {'initial_signin_url': url}
 
-
     notify_environment = os.environ["NOTIFY_ENVIRONMENT"]
 
     application.config.from_object(configs[notify_environment])

From 1763e75befdadec74c174e64ebc447872fbd511c Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Mon, 25 Nov 2024 13:33:33 -0500
Subject: [PATCH 07/10] Cleaning up imports

---
 app/main/views/index.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index c294a38e0..7604c4dc2 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -1,11 +1,7 @@
-import os
-import secrets
-from urllib.parse import unquote
-
 from flask import abort, current_app, redirect, render_template, request, url_for
 from flask_login import current_user
 
-from app import redis_client, status_api_client
+from app import status_api_client
 from app.formatters import apply_html_class, convert_markdown_template
 from app.main import main
 from app.main.views.pricing import CURRENT_SMS_RATE
@@ -16,8 +12,6 @@
     using_notify_nav,
 )
 from app.utils.user import user_is_logged_in
-from notifications_utils.url_safe_token import generate_token
-
 
 # Hook to check for feature flags
 @main.before_request

From 497533c52e941d670852dae000f995c9911a5269 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Mon, 25 Nov 2024 13:40:14 -0500
Subject: [PATCH 08/10] More linting stuff

---
 app/main/views/index.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index 7604c4dc2..c172ab74e 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -13,6 +13,7 @@
 )
 from app.utils.user import user_is_logged_in
 
+
 # Hook to check for feature flags
 @main.before_request
 def check_feature_flags():

From 2d0a53e97d3cb956ee27ddc74483d797be230c6a Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Mon, 25 Nov 2024 13:51:24 -0500
Subject: [PATCH 09/10] Sorted init

---
 app/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index b92b96ac5..4d89cd59e 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,10 +1,9 @@
 import os
-import secrets
 import pathlib
-
+import secrets
 from functools import partial
 from time import monotonic
-from urllib.parse import urlparse, urlunparse, unquote
+from urllib.parse import unquote, urlparse, urlunparse
 
 import jinja2
 from flask import (

From 1931e4359b590407e79576aa531e525abbbbcdb7 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 26 Nov 2024 10:46:41 -0500
Subject: [PATCH 10/10] Fixed more imports

---
 app/main/views/index.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index 81e9de85d..bf1c50dca 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -1,9 +1,12 @@
-from flask import abort, current_app, jsonify, redirect, render_template, request, url_for
-
-import os
-import secrets
-from urllib.parse import unquote
-
+from flask import (
+    abort,
+    current_app,
+    jsonify,
+    redirect,
+    render_template,
+    request,
+    url_for,
+)
 from flask_login import current_user
 
 from app import status_api_client