From 18b0681d26bf1bd12e476ec55cf92e33bde5aafe Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Tue, 20 May 2025 13:35:58 +0530
Subject: [PATCH] slack_import: Show validation error on empty slack access
 token.

We used to rely on browser to show error for empty slack access
token, but now we are using our own error element for this.
---
 templates/zerver/slack_import.html | 2 +-
 zerver/views/registration.py       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/zerver/slack_import.html b/templates/zerver/slack_import.html
index 1ccf6f3051..67c4d318d5 100644
--- a/templates/zerver/slack_import.html
+++ b/templates/zerver/slack_import.html
@@ -41,7 +41,7 @@
                         <label for="slack_access_token" class="inline-block label-title">{{ _('Slack bot user OAuth token') }}</label>
                         <input id="slack-access-token" type="text"
                           placeholder="xoxb-…"
-                          maxlength="100" name="slack_access_token" required {% if slack_access_token %} value="{{ slack_access_token }}" {% endif %} />
+                          maxlength="100" name="slack_access_token" {% if slack_access_token %} value="{{ slack_access_token }}" {% endif %} />
                         {% if slack_access_token_validation_error %}
                         <p id="slack-access-token-validation-error" class="help-inline text-error">{{ slack_access_token_validation_error }}</p>
                         {% endif %}
diff --git a/zerver/views/registration.py b/zerver/views/registration.py
index 61b72aa75c..ad3fd7a7b4 100644
--- a/zerver/views/registration.py
+++ b/zerver/views/registration.py
@@ -361,8 +361,8 @@ def registration_helper(
             }
 
             saved_slack_access_token = prereg_realm.data_import_metadata.get("slack_access_token")
-            if saved_slack_access_token or slack_access_token:
-                if slack_access_token and slack_access_token != saved_slack_access_token:
+            if saved_slack_access_token or slack_access_token is not None:
+                if slack_access_token is not None and slack_access_token != saved_slack_access_token:
                     # Verify slack token access.
                     from zerver.data_import.slack import (
                         SLACK_IMPORT_TOKEN_SCOPES,