From: James Julich <51384945+jamesjulich@users.noreply.github.com>
Date: Tue, 19 Oct 2021 12:39:30 +0000 (-0500)
Subject: Address 301 redirect issue and Safari regex issue. (#143)
X-Git-Tag: v1.4.0~14
X-Git-Url: https://git.wafflesoft.org/?a=commitdiff_plain;h=012e933e43c83792d5602f93e0ff47aa6b359813;p=cinny.git

Address 301 redirect issue and Safari regex issue. (#143)

* Address 301 redirect issue and Safari regex issue.

* Restored login redirect

as this doesn't not fix the sso redirect #143.

Co-authored-by: Ajay Bura <32841439+ajbura@users.noreply.github.com>
---

diff --git a/src/app/molecules/sso-buttons/SSOButtons.jsx b/src/app/molecules/sso-buttons/SSOButtons.jsx
index 82e8cc4..76f865a 100644
--- a/src/app/molecules/sso-buttons/SSOButtons.jsx
+++ b/src/app/molecules/sso-buttons/SSOButtons.jsx
@@ -9,7 +9,7 @@ function SSOButtons({ homeserver }) {
 
   useEffect(() => {
     // If the homeserver passed in is not a fully-qualified domain name, do not update.
-    if (!homeserver.match('(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-).)+[a-zA-Z]{2,63}$)')) {
+    if (!homeserver.match('^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+$')) {
       return;
     }