refactor: use messages instead of errors

package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/ory/kratos-selfservice-ui-node#readme",
   "dependencies": {
-    "@oryd/kratos-client": "0.0.0-next.e568324ce78b",
+    "@oryd/kratos-client": "0.0.0-next.2609b90cf011",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.2",
     "@types/express-handlebars": "0.0.33",

src/routes/auth.ts

@@ -72,7 +72,11 @@ export const authHandler = (type: 'login' | 'registration') => (
         }
       }
 
-      res.render(type, {oidc:methodConfig("oidc"), password:methodConfig("password")})
+      res.render(type, {
+        ...request,
+        oidc:methodConfig("oidc"),
+        password:methodConfig("password"),
+      })
     })
     .catch(err => {
       console.error(err)

src/routes/settings.ts

@@ -33,6 +33,7 @@ const settingsHandler = (req: Request, res: Response, next: NextFunction) => {
 
       if (request) {
         res.render('settings', {
+          ...request,
           password: methodConfig("password"),
           profile: methodConfig("profile"),
           oidc: methodConfig("oidc"),

src/routes/verification.ts

@@ -31,7 +31,9 @@ export default (req: Request, res: Response, next: NextFunction) => {
         return body
       }
     ).then((request: any) => {
-      res.render('verification', request.form)
+      res.render('verification', {
+        ...request
+      })
     }
   ).catch((err: any) => next(err))
 }

views/login.hbs

@@ -3,6 +3,8 @@
         {{> icon_logo}}
         <h5 class="subheading">Welcome to this example login screen!</h5>
 
+        {{> messages messages=messages className="global"}}
+
         {{#if password}}
             <div id="login-password">
                 {{> form submitLabel="Sign in" form=password}}

views/partials/form.hbs

@@ -1,5 +1,5 @@
-{{> form_errors className="overview-form-errors" errors=form.errors}}
 <form action="{{form.action}}" method="{{form.method}}">
+    {{> messages messages=form.messages }}
     {{> form_fields fields=form.fields }}
     {{#if submitLabel}}
         <button type="submit">{{submitLabel}}</button>

views/partials/form_input_default.hbs

@@ -3,5 +3,5 @@
         <input name="{{name}}" type="{{type}}" value="{{value}}" placeholder="{{getTitle name}}" {{#if disabled}}disabled{{/if}}>
         <span>{{getTitle name}}</span>
     </label>
-    {{> form_errors className="input-form-errors"}}
+    {{> messages }}
 </fieldset>

views/partials/form_input_password.hbs

@@ -4,5 +4,5 @@
         <span>{{getTitle name}}</span>
         {{> form_input_password_toggle }}
     </label>
-    {{> form_errors className="input-form-errors"}}
+    {{> messages }}
 </fieldset>

views/partials/messages.hbs

@@ -0,0 +1,5 @@
+<div class="messages {{className}}">
+    {{~#each messages~}}
+        <div class="message {{type}}">{{text}}</div>
+    {{~/each~}}
+</div>

views/recovery.hbs

@@ -3,7 +3,7 @@
     <div class="container">
         <h4>Recover your account</h4>
 
-        {{> form_messages messages=messages className="global"}}
+        {{> messages messages=messages className="global"}}
 
         {{#if token}}
             <div id="recovery-token">

views/registration.hbs

@@ -4,6 +4,8 @@
         <h5 class="subheading">Welcome to SecureApp! <br/>
             Use the form below to sign up:</h5>
 
+        {{> messages messages=messages className="global"}}
+
         {{#if password}}
             <div id="registration-password">
                 {{> form submitLabel="Sign up" form=password}}

views/settings.hbs

@@ -3,6 +3,8 @@
     <div class="container">
         <h2>Settings</h2>
 
+        {{> messages messages=messages className="global"}}
+
         {{#if updateSuccessful}}
             <p>Your changes have been saved!</p>
         {{/if}}

views/verification.hbs

@@ -3,10 +3,10 @@
     <div class="container">
         <h4>Resend verification code</h4>
 
-        {{> form_errors errors=errors className="overview-form-errors"}}
+        {{> messages messages=messages className="global"}}
 
-        <form action="{{action}}" method="{{method}}">
-            {{#each fields}}
+        <form action="{{form.action}}" method="{{form.method}}">
+            {{#each form.fields}}
                 {{> (toFormInputPartialName type)}}
             {{/each}}
             <button type="submit">Resend verification code</button>