chore: address review feedback

ory · Sep 4, 2023 · e56a94f · e56a94f
1 parent 0bbf545
commit e56a94f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/src/routes/consent.ts b/src/routes/consent.ts
@@ -247,7 +247,6 @@ export const registerConsentRoute: RouteRegistrator = function (
     console.log("found HYDRA_ADMIN_URL")
     return app.get(
       "/consent",
-      // @ts-ignore
       csrfProtection,
       createConsentRoute(createHelpers),
     )
@@ -264,7 +263,6 @@ export const registerConsentPostRoute: RouteRegistrator = function (
     return app.post(
       "/consent",
       parseForm,
-      // @ts-ignore
       csrfProtection,
       createConsentPostRoute(createHelpers),
     )

diff --git a/src/routes/settings.ts b/src/routes/settings.ts
@@ -35,8 +35,6 @@ export const createSettingsRoute: RouteCreator =
       return
     }
 
-    const session = req.session
-
     return frontend
       .getSettingsFlow({ id: flow, cookie: req.header("cookie") })
       .then(async ({ data: flow }) => {
@@ -50,23 +48,25 @@ export const createSettingsRoute: RouteCreator =
             .then(({ data }) => data.logout_url)
             .catch(() => "")) || ""
 
+        const settingsScreen = UserSettingsScreen(
+          {
+            flow,
+            logoutUrl,
+            navClassName: "main-nav",
+            headerContainerClassName: "spacing-32",
+            dividerClassName: "divider-left",
+            settingsCardContainerClassName: "spacing-32",
+          },
+          {
+            locale: res.locals.lang,
+          },
+        )
         // Render the data using a view (e.g. Jade Template):
         res.render("settings", {
           layout: "settings",
           nodes: flow.ui.nodes,
-          settingsScreen: UserSettingsScreen(
-            {
-              flow,
-              logoutUrl,
-              navClassName: "main-nav",
-              headerContainerClassName: "spacing-32",
-              dividerClassName: "divider-left",
-              settingsCardContainerClassName: "spacing-32",
-            },
-            {
-              locale: res.locals.lang,
-            },
-          ),
+          nav: settingsScreen.Nav,
+          settingsScreen: settingsScreen.Body,
         })
       })
       .catch(redirectOnSoftError(res, next, initFlowUrl))

diff --git a/views/layouts/settings.hbs b/views/layouts/settings.hbs
@@ -7,7 +7,13 @@
   <body>
     <main data-testid="app-express">
       <div class="app-container">
-          {{{body}}}
+        {{{nav}}}
+        <div class="container spacing-32">
+          <div class="content">
+            {{{body}}}
+          </div>
+          {{> ory_branding}}
+        </div>
       </div>
       {{> scripts }}
     </main>

diff --git a/views/settings.hbs b/views/settings.hbs
@@ -1,10 +1,8 @@
-{{{settingsScreen.Nav}}}
-<div class="container spacing-32">
-    <div class="content spacing-32">
-        {{{settingsScreen.Body}}}
-    </div>
+<div class="spacing-32">
 
-    {{> ory_branding }}
+    <div class="spacing-32">
+        {{{settingsScreen}}}
+    </div>
 
   {{> webauthn_setup nodes=nodes webAuthnHandler=webAuthnHandler webauthnTriggerName="webauthn_settings_trigger"}}