From 30384cbfefc59e62751ff7538d7121371fd45225 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 29 May 2020 09:55:38 -0500
Subject: [PATCH] Clean up auth code

---
 app/soapbox/actions/auth.js | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 2ff3ea1e1..46e7ea97e 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -1,5 +1,5 @@
 import api from '../api';
-import { showAlert, showAlertForError } from 'soapbox/actions/alerts';
+import { showAlert } from 'soapbox/actions/alerts';
 import { fetchMe } from 'soapbox/actions/me';
 
 export const AUTH_APP_CREATED    = 'AUTH_APP_CREATED';
@@ -15,20 +15,8 @@ export const RESET_PASSWORD_REQUEST = 'RESET_PASSWORD_REQUEST';
 export const RESET_PASSWORD_SUCCESS = 'RESET_PASSWORD_SUCCESS';
 export const RESET_PASSWORD_FAIL    = 'RESET_PASSWORD_FAIL';
 
-const hasAppToken = getState => getState().hasIn(['auth', 'app', 'access_token']);
 const noOp = () => () => new Promise(f => f());
 
-function initAuthApp() {
-  return (dispatch, getState) => {
-    const hasToken = hasAppToken(getState);
-    const action   = hasToken ? verifyApp : createAppAndToken;
-    return dispatch(action())
-      .catch(error => {
-        dispatch(showAlertForError(error));
-      });
-  };
-}
-
 function createAppAndToken() {
   return (dispatch, getState) => {
     return dispatch(createApp()).then(() => {
@@ -69,14 +57,6 @@ function createAppToken() {
   };
 }
 
-function verifyApp() {
-  return (dispatch, getState) => {
-    return api(getState, 'app').get('/api/v1/apps/verify_credentials')
-      .then (response => dispatch(authAppCreated(response.data)))
-      .catch(error    => dispatch(createAppAndToken()));
-  };
-}
-
 function createUserToken(username, password) {
   return (dispatch, getState) => {
     const app = getState().getIn(['auth', 'app']);
@@ -133,7 +113,7 @@ export function logOut() {
 export function register(params) {
   return (dispatch, getState) => {
     dispatch({ type: AUTH_REGISTER_REQUEST });
-    return dispatch(initAuthApp()).then(() => {
+    return dispatch(createAppAndToken()).then(() => {
       return api(getState, 'app').post('/api/v1/accounts', params);
     }).then(response => {
       dispatch({ type: AUTH_REGISTER_SUCCESS, token: response.data });