From 5731b9b1c73fa6b2414248c98a0c42714e964455 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 19 Apr 2022 14:37:48 -0500
Subject: [PATCH] Redirect all /auth routes

---
 app/soapbox/actions/auth.js                   | Bin 10240 -> 10275 bytes
 app/soapbox/actions/external_auth.js          | Bin 4664 -> 4665 bytes
 app/soapbox/components/sidebar_menu.tsx       |   2 +-
 app/soapbox/containers/soapbox.js             | Bin 8875 -> 8652 bytes
 .../auth_login/components/login_page.js       | Bin 2598 -> 2599 bytes
 .../features/auth_login/components/logout.tsx |  28 ++++++++++++++++++
 app/soapbox/features/public_layout/index.js   | Bin 2183 -> 2184 bytes
 app/soapbox/features/security/mfa_form.js     | Bin 12354 -> 12358 bytes
 app/soapbox/features/settings/index.js        | Bin 3833 -> 3837 bytes
 .../features/ui/components/link_footer.tsx    |   2 +-
 .../ui/components/profile-dropdown.tsx        |   2 +-
 app/soapbox/features/ui/index.js              | Bin 28632 -> 29926 bytes
 .../features/ui/util/async-components.js      | Bin 15719 -> 15853 bytes
 .../features/verification/waitlist_page.js    | Bin 2869 -> 2862 bytes
 14 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 app/soapbox/features/auth_login/components/logout.tsx

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 5c0fc467a5e945210c527c59c6e93b54639d4d11..00f9c606d08961506a27d5032452d183079b5958 100644
GIT binary patch
delta 37
tcmZn&SRAlnp(0Oanu3O6VsdhRX<o_XD*_Ia4=XNWE-lL0oUb&I6#x;~4rc%W

delta 31
ncmZ1+&=9a;q2gp09;L}|6&G=(r<Q1_mloxyYi^#TG?5hm$7>6>

diff --git a/app/soapbox/actions/external_auth.js b/app/soapbox/actions/external_auth.js
index 8bf0bba3f9b8af2a97cd7d26bbf0ec9bb507a50a..4f389667f81db6fccb06d04e47e1888360694ff2 100644
GIT binary patch
delta 18
Zcmdm?vQuRP2ODcnetKr!W*#;j9soRu1(N^(

delta 17
Ycmdm~vO{G92OCRbX-URrUN#*b05$3bEC2ui

diff --git a/app/soapbox/components/sidebar_menu.tsx b/app/soapbox/components/sidebar_menu.tsx
index c31ec29dbf..e7cec5d959 100644
--- a/app/soapbox/components/sidebar_menu.tsx
+++ b/app/soapbox/components/sidebar_menu.tsx
@@ -285,7 +285,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                 <hr />
 
                 <SidebarLink
-                  to='/auth/sign_out'
+                  to='/logout'
                   icon={require('@tabler/icons/icons/logout.svg')}
                   text={intl.formatMessage(messages.logout)}
                   onClick={onClickLogOut}
diff --git a/app/soapbox/containers/soapbox.js b/app/soapbox/containers/soapbox.js
index ad14c6e7e0ada60d1ccdc047d690e4ef0ce6bbc8..690a03a5fb066f8883f3d38bb196bf1be8b888f1 100644
GIT binary patch
delta 12
UcmZ4Odd7LfeVNVsWZ$v?04hfYDgXcg

delta 181
zcmX@(yxMiceHn|?l+2>k<PwFnqWoN2b^XNBk_`Q#)Z)~V_=3dZ;`02W6m^A?e4q?i
zP!}#ZxmHHP44Y=47=~Vu7^+qsY+8#m)AQmp^Pm>y<fnt!`gUBC8)OtWzm|E(0stA&
BLG1tl

diff --git a/app/soapbox/features/auth_login/components/login_page.js b/app/soapbox/features/auth_login/components/login_page.js
index fbdd210e440d2332309d339273478395fc627b22..867a8086383b6670c8ed8c32baa54bdd5b651032 100644
GIT binary patch
delta 17
YcmZ1`vRq_?EhlSEetKr!WJk`Y05(ttOaK4?

delta 16
XcmZ23vP@)yEhkH2X-URpC(fq;FeL@$

diff --git a/app/soapbox/features/auth_login/components/logout.tsx b/app/soapbox/features/auth_login/components/logout.tsx
new file mode 100644
index 0000000000..1a44f292f0
--- /dev/null
+++ b/app/soapbox/features/auth_login/components/logout.tsx
@@ -0,0 +1,28 @@
+import React, { useEffect, useState } from 'react';
+import { useIntl } from 'react-intl';
+import { useDispatch } from 'react-redux';
+import { Redirect } from 'react-router-dom';
+
+import { logOut } from 'soapbox/actions/auth';
+import { Spinner } from 'soapbox/components/ui';
+
+/** Component that logs the user out when rendered */
+const Logout: React.FC = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const [done, setDone] = useState(false);
+
+  useEffect(() => {
+    (dispatch(logOut(intl)) as any)
+      .then(() => setDone(true))
+      .catch(console.warn);
+  });
+
+  if (done) {
+    return <Redirect to='/' />;
+  } else {
+    return <Spinner />;
+  }
+};
+
+export default Logout;
diff --git a/app/soapbox/features/public_layout/index.js b/app/soapbox/features/public_layout/index.js
index 735ccdb2f91cd1b862e25bc7d5d7080317b7827c..d7ff351555943cc7902e7545b77ac5827813f041 100644
GIT binary patch
delta 18
ZcmZn{>=4}Wl9@FpKRq*V^IPUwEC5432Q2^q

delta 17
YcmeAWY!}?{l9?s3v?OEmJLXv|06a<t#sB~S

diff --git a/app/soapbox/features/security/mfa_form.js b/app/soapbox/features/security/mfa_form.js
index dd15bfb3defe3688bb8d853b308801744543fa5a..f09e13cd8487203144c73aaff6e07d508dc3c9b7 100644
GIT binary patch
delta 21
ccmX?<a4cbiG&4tWYDr0EUV8Cnd1hr@0AL^owEzGB

delta 17
YcmX?>a42DeG&4(LX-URrWoBhv06&HW_5c6?

diff --git a/app/soapbox/features/settings/index.js b/app/soapbox/features/settings/index.js
index f78cddad7d763722df5fcff93654de99ea91e8c4..92a10f90ab8464e90f70e166aa202e310ef16bfc 100644
GIT binary patch
delta 16
Ycmew<`&V{@F8k!OY@C~o*pIUV06hB!J^%m!

delta 25
hcmew>`%`v<E;~nJX-S5DZd&5xdu&RZquCd+0|11u35fsz

diff --git a/app/soapbox/features/ui/components/link_footer.tsx b/app/soapbox/features/ui/components/link_footer.tsx
index 84a7c5fc56..da0fc48d68 100644
--- a/app/soapbox/features/ui/components/link_footer.tsx
+++ b/app/soapbox/features/ui/components/link_footer.tsx
@@ -59,7 +59,7 @@ const LinkFooter: React.FC = (): JSX.Element => {
           {(features.federating && features.accountMoving) && (
             <FooterLink to='/settings/migration'><FormattedMessage id='navigation_bar.account_migration' defaultMessage='Move account' /></FooterLink>
           )}
-          <FooterLink to='/auth/sign_out' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></FooterLink>
+          <FooterLink to='/logout' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></FooterLink>
         </>}
       </div>
 
diff --git a/app/soapbox/features/ui/components/profile-dropdown.tsx b/app/soapbox/features/ui/components/profile-dropdown.tsx
index 850f546111..71d5c1101e 100644
--- a/app/soapbox/features/ui/components/profile-dropdown.tsx
+++ b/app/soapbox/features/ui/components/profile-dropdown.tsx
@@ -87,7 +87,7 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
 
     menu.push({
       text: intl.formatMessage(messages.logout, { acct: account.acct }),
-      to: '/auth/sign_out',
+      to: '/logout',
       action: handleLogOut,
       icon: require('@tabler/icons/icons/logout.svg'),
     });
diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index af27d453a16ff14c5bd01eb98cfaef554fb80827..9af173cb3798a77dc1a5ef9112d8339272cdd70e 100644
GIT binary patch
delta 1086
zcmZ`%O=}ZT6eW^=5H;4?mIP_MrXe-8&7feWRwA@m?V?}Qk1hn$mzkH$(3$s!c`r?|
zg#HEPf-Av=8^KL+euqkTx>6AY7cTq<zRWb!BAV6YzI)EO_niCbOXA1R#KA!NG{7=%
z@|IjD%^;b+ncCMhSY3OtI0q|4NN#clgqg7JP@lU5eAP-paF;@z2+D{{1xOCk>K2S`
z%FJ>K)KAfDT2z5e(`HRzv>jo^G_(W-62ldgNHDqLQM#~iaMo~aL-ttOwzO3HHsfv9
zlZdFMq27{kXAOL6+CDYp$tj|i9?8*!2KRj`JkG+I4DPB=$|Mk>6dJ^F>SW2-ju%+m
zoePK69Nx4U*i1-DOyCXBNK0Cgek>l=x?V)>IGdU43xT+k+3cq-v7H$#WjF93Gv2Qr
zl#_UVA(x8%r-7Lz$#Zaz)S;=2_5@669sHUd4L*!7B!}Zb+O!_67p&ypCoYFec0J$I
zrsAOPE<)UfEBQ-!Q0NP03r|nsU}Y5j?C?OhTS?(+K8N3m<6|+suR^41E$~Q_hS*G1
z!&Q9<-xW3dT$!&5Dy2$QXtK>~4Pr>{*Sd}<FKvTJo3olrrNvD#sSK%3YB9iV5PUw7
zE5`*cy}zLUffQp1@jP`Pp-hk8q&w8%9`!|+9bZ=}Sjb+`mG<727FplDE8BNNSYc0E
zwkUf(_e9y@5to{Y_=eTl>fpSdPpd<rvgQ#X+T1tssy=&Go!N<sr|0q2#89TYxF+l-
ztJ&;m_9%8W$<pzoiu?FA{G;7Y{WCg?_~wkkO_e}6Iy~H14r3UsoWYMb0Dl)>;){ta
zgyeKrQlAm$nA~PsRK#ZmxEMAm+y7%LKGD;7MJM>ZlndTY4yLhF8o_Gi5&kNT1#k3g
VNj%Kl4-RkX2~`;h9#=cp{{X=BdCUL+

delta 256
zcmaF%lJUlU#trOzn??D|xF%1NG-XLFEy<XCK{A{J#L&-8OPqXAR$=mc2Yptsz+_#i
zpvkFLa-084>9A~ellNw^4N6VPEJ{r-DON};%Fk8sO)M_SPsz{IQ3%LM1qvi8xVh>m
zq?RP>DU{?Zq-9np<maR)B<1I4=Oz|qPoAhMKUr8saPm84&dqm}r!Y>wrYg62t7;X~
zWFAfZ$<-RNlT&p1!8Qu%aqvx+*0Gr^rlB`^k&Dt~1DlY^*%|_q)3wYd*JyH1cG0w$
yd{UQh@?_n_$s2SzC+~9>nJnkXv3Y@wHp^x;M}0=H>a!a9lkZ!JY|eD5H39(jU0M_X

diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js
index 17f54d3f4bae5d0894cb31f9fc8b11627876ac84..cd202afb57a3d717a47e9e5e2ce89626b680bc42 100644
GIT binary patch
delta 41
ucmaD}^|pG$bU99+{Pg_Nl7PhY$qSfGC-bXlv*mzACJV|+Zk{Q3P7VNUn-BH?

delta 12
TcmaD`{k&?!bh*v4@)zU)E+hsF

diff --git a/app/soapbox/features/verification/waitlist_page.js b/app/soapbox/features/verification/waitlist_page.js
index 819e6af85c7e22b82a8f80b9e01650c19b4e45b5..01b71bcaed6f5f24dc99d0177df1a87fd7a22b9b 100644
GIT binary patch
delta 16
XcmdlgwoYsV4;yn%e)?uHHhES6EoKCY

delta 23
ecmZ1{wpDBc4;xovX-S5Dab|j6{APYOc~$^ktp_;(