From 438250b3a9ebe11704b374591d283b79c1ecaf47 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 19 Sep 2020 15:24:52 +0200
Subject: [PATCH] policies: improve wording on denied tempaltes

---
 docs/flow/flows.md                               | 5 ++---
 passbook/flows/templates/flows/denied_shell.html | 2 +-
 passbook/lib/sentry.py                           | 2 ++
 passbook/policies/templates/policies/denied.html | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/flow/flows.md b/docs/flow/flows.md
index d8eec0690..0bd440785 100644
--- a/docs/flow/flows.md
+++ b/docs/flow/flows.md
@@ -39,7 +39,6 @@ This designates a flow for unenrollment. This flow can contain any amount of ver
 This designates a flow for recovery. This flow normally contains an [**identification**](stages/identification/index.md) stage to find the user. It can also contain any amount of verification stages, such as [**email**](stages/email/index.md) or [**captcha**](stages/captcha/index.md).
 Afterwards, use the [**prompt**](stages/prompt/index.md) stage to ask the user for a new password and the [**user_write**](stages/user_write.md) stage to update the password.
 
-### Change Password
+### Setup
 
-This designates a flow for password changes. This flow can contain any amount of verification stages, such as [**email**](stages/email/index.md) or [**captcha**](stages/captcha/index.md).
-Afterwards, use the [**prompt**](stages/prompt/index.md) stage to ask the user for a new password and the [**user_write**](stages/user_write.md) stage to update the password.
+This designates a flow for general setup. This designation doesn't have any constraints in what you can do. For example, by default this designation is used to configure Factors, like change a password and setup TOTP.
diff --git a/passbook/flows/templates/flows/denied_shell.html b/passbook/flows/templates/flows/denied_shell.html
index dc768c21d..82e0dc72c 100644
--- a/passbook/flows/templates/flows/denied_shell.html
+++ b/passbook/flows/templates/flows/denied_shell.html
@@ -19,7 +19,7 @@
         <div class="pf-c-form__group">
             <p>
                 <i class="pf-icon pf-icon-error-circle-o"></i>
-                {% trans 'Access denied' %}
+                {% trans 'Request has been denied.' %}
             </p>
             {% if error %}
             <hr>
diff --git a/passbook/lib/sentry.py b/passbook/lib/sentry.py
index b232c1f2f..d119f8387 100644
--- a/passbook/lib/sentry.py
+++ b/passbook/lib/sentry.py
@@ -10,6 +10,7 @@ from redis.exceptions import RedisError
 from rest_framework.exceptions import APIException
 from structlog import get_logger
 from websockets.exceptions import WebSocketException
+from ldap3.core.exceptions import LDAPException
 
 LOGGER = get_logger()
 
@@ -39,6 +40,7 @@ def before_send(event, hint):
         SentryIgnoredException,
         WebSocketException,
         CeleryError,
+        LDAPException,
     )
     if "exc_info" in hint:
         _, exc_value, _ = hint["exc_info"]
diff --git a/passbook/policies/templates/policies/denied.html b/passbook/policies/templates/policies/denied.html
index 24127083d..9200dc4d9 100644
--- a/passbook/policies/templates/policies/denied.html
+++ b/passbook/policies/templates/policies/denied.html
@@ -19,7 +19,7 @@
         <div class="pf-c-form__group">
             <p>
                 <i class="pf-icon pf-icon-error-circle-o"></i>
-                {% trans 'Access denied' %}
+                {% trans 'Request has been denied.' %}
             </p>
             {% if error %}
             <hr>