More code simplifications

Author: mjackson

demos/bookstore/app/layout.tsx

@@ -101,11 +101,7 @@ export function Layout({ children }: { children?: Remix.RemixNode }) {
                   action={routes.auth.logout.href()}
                   style={{ display: 'inline' }}
                 >
-                  <button
-                    type="submit"
-                    className="btn btn-secondary"
-                    style={{ marginLeft: '1rem' }}
-                  >
+                  <button type="submit" class="btn btn-secondary" style="margin-left: 1rem;">
                     Logout
                   </button>
                 </form>
@@ -120,10 +116,10 @@ export function Layout({ children }: { children?: Remix.RemixNode }) {
         </div>
       </header>
       <main>
-        <div className="container">{children}</div>
+        <div class="container">{children}</div>
       </main>
       <footer>
-        <div className="container">
+        <div class="container">
           <p>&copy; {new Date().getFullYear()} Bookstore Demo. Built with Remix.</p>
         </div>
       </footer>

demos/bookstore/app/middleware/auth.ts

@@ -42,20 +42,11 @@ export function requireAuth(options?: RequireAuthOptions): Middleware {
 
   return async ({ session, url }) => {
     let userId = session.get('userId')
+    let user = typeof userId === 'string' && getUserById(userId)
 
-    if (typeof userId !== 'string') {
-      // Capture the current URL to redirect back after login
-      let returnTo = url.pathname + url.search
-      let loginUrl = redirectRoute.href(undefined, { returnTo })
-      return redirect(loginUrl, 302)
-    }
-
-    let user = getUserById(userId)
     if (!user) {
-      // Capture the current URL to redirect back after login
-      let returnTo = url.pathname + url.search
-      let loginUrl = redirectRoute.href(undefined, { returnTo })
-      return redirect(loginUrl, 302)
+      // Capture the current URL to redirect back to after login
+      return redirect(redirectRoute.href(undefined, { returnTo: url.pathname + url.search }), 302)
     }
 
     setCurrentUser(user)