chore: Align template path names.

CommunitySolidServer · Jul 21, 2021 · 838b077 · 838b077
1 parent 113a3fb
commit 838b077
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 13 deletions.
diff --git a/config/http/static/default.json b/config/http/static/default.json
@@ -24,7 +24,7 @@
         },
         {
           "StaticAssetHandler:_assets_key": "/idp/style.css",
-          "StaticAssetHandler:_assets_value": "$PACKAGE_ROOT/templates/idp/email-password-interaction/main.css"
+          "StaticAssetHandler:_assets_value": "$PACKAGE_ROOT/templates/identity/email-password/main.css"
         }
       ]
     }

diff --git a/config/identity/handler/interaction/handlers/forgot-password.json b/config/identity/handler/interaction/handlers/forgot-password.json
@@ -14,7 +14,7 @@
         "args_idpPath": "/idp",
         "args_templateEngine": {
           "@type": "EjsTemplateEngine",
-          "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/resetPasswordEmail.ejs"
+          "template": "$PACKAGE_ROOT/templates/identity/email-password/reset-password-email.html.ejs"
         },
         "args_emailSender": { "@id": "urn:solid-server:default:EmailSender" }
       },
@@ -27,7 +27,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/emailSent.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/email-sent.html.ejs"
       }
     },
     {
@@ -36,7 +36,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/forgotPassword.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/forgot-password.html.ejs"
       }
     }
   ]

diff --git a/config/identity/handler/interaction/handlers/initial.json b/config/identity/handler/interaction/handlers/initial.json
@@ -16,7 +16,7 @@
               "@type": "TemplateHandler",
               "templateEngine": {
                 "@type": "EjsTemplateEngine",
-                "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/confirm.ejs"
+                "template": "$PACKAGE_ROOT/templates/identity/email-password/confirm.html.ejs"
               }
             }
           }

diff --git a/config/identity/handler/interaction/handlers/login.json b/config/identity/handler/interaction/handlers/login.json
@@ -20,7 +20,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/login.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/login.html.ejs"
       }
     }
   ]

diff --git a/config/identity/handler/interaction/handlers/registration.json b/config/identity/handler/interaction/handlers/registration.json
@@ -25,7 +25,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/register.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/register.html.ejs"
       }
     },
     {
@@ -34,7 +34,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/registerResponse.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/register-response.html.ejs"
       }
     }
   ]

diff --git a/config/identity/handler/interaction/handlers/reset-password.json b/config/identity/handler/interaction/handlers/reset-password.json
@@ -33,7 +33,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/resetPassword.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/reset-password.html.ejs"
       }
     },
     {
@@ -42,7 +42,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/message.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/message.html.ejs"
       }
     }
   ]

diff --git a/config/util/representation-conversion/default.json b/config/util/representation-conversion/default.json
@@ -30,10 +30,10 @@
               "@type": "ErrorToTemplateConverter",
               "templateEngine": {
                 "@type": "HandlebarsTemplateEngine",
-                "template": "$PACKAGE_ROOT/templates/error/main.md"
+                "template": "$PACKAGE_ROOT/templates/error/main.md.hbs"
               },
               "templatePath": "$PACKAGE_ROOT/templates/error/descriptions/",
-              "extension": ".md",
+              "extension": ".md.hbs",
               "contentType": "text/markdown"
             },
             {
@@ -42,7 +42,7 @@
               "templateEngine": {
                 "@id": "urn:solid-server:default:MainTemplateEngine",
                 "@type": "HandlebarsTemplateEngine",
-                "template": "$PACKAGE_ROOT/templates/main.html"
+                "template": "$PACKAGE_ROOT/templates/main.html.hbs"
               }
             }
           ]

diff --git a/templates/error/descriptions/E0001.md → templates/error/descriptions/E0001.md.hbs b/templates/error/descriptions/E0001.md → templates/error/descriptions/E0001.md.hbs
diff --git a/templates/error/descriptions/H400.md → templates/error/descriptions/H400.md.hbs b/templates/error/descriptions/H400.md → templates/error/descriptions/H400.md.hbs
diff --git a/templates/error/descriptions/H401.md → templates/error/descriptions/H401.md.hbs b/templates/error/descriptions/H401.md → templates/error/descriptions/H401.md.hbs
diff --git a/templates/error/descriptions/H403.md → templates/error/descriptions/H403.md.hbs b/templates/error/descriptions/H403.md → templates/error/descriptions/H403.md.hbs
diff --git a/templates/error/descriptions/H404.md → templates/error/descriptions/H404.md.hbs b/templates/error/descriptions/H404.md → templates/error/descriptions/H404.md.hbs
diff --git a/templates/error/descriptions/H500.md → templates/error/descriptions/H500.md.hbs b/templates/error/descriptions/H500.md → templates/error/descriptions/H500.md.hbs
diff --git a/templates/error/descriptions/H501.md → templates/error/descriptions/H501.md.hbs b/templates/error/descriptions/H501.md → templates/error/descriptions/H501.md.hbs
diff --git a/templates/error/main.md → templates/error/main.md.hbs b/templates/error/main.md → templates/error/main.md.hbs
diff --git a/...dp/email-password-interaction/confirm.ejs → .../identity/email-password/confirm.html.ejs b/...dp/email-password-interaction/confirm.ejs → .../identity/email-password/confirm.html.ejs
diff --git a/.../email-password-interaction/emailSent.ejs → ...entity/email-password/email-sent.html.ejs b/.../email-password-interaction/emailSent.ejs → ...entity/email-password/email-sent.html.ejs
diff --git a/...l-password-interaction/forgotPassword.ejs → ...y/email-password/forgot-password.html.ejs b/...l-password-interaction/forgotPassword.ejs → ...y/email-password/forgot-password.html.ejs
diff --git a/.../idp/email-password-interaction/login.ejs → ...es/identity/email-password/login.html.ejs b/.../idp/email-password-interaction/login.ejs → ...es/identity/email-password/login.html.ejs
diff --git a/...dp/email-password-interaction/message.ejs → .../identity/email-password/message.html.ejs b/...dp/email-password-interaction/message.ejs → .../identity/email-password/message.html.ejs
diff --git a/...password-interaction/registerResponse.ejs → ...email-password/register-response.html.ejs b/...password-interaction/registerResponse.ejs → ...email-password/register-response.html.ejs
diff --git a/...p/email-password-interaction/register.ejs → ...identity/email-password/register.html.ejs b/...p/email-password-interaction/register.ejs → ...identity/email-password/register.html.ejs
diff --git a/...ssword-interaction/resetPasswordEmail.ejs → ...il-password/reset-password-email.html.ejs b/...ssword-interaction/resetPasswordEmail.ejs → ...il-password/reset-password-email.html.ejs
diff --git a/...il-password-interaction/resetPassword.ejs → ...ty/email-password/reset-password.html.ejs b/...il-password-interaction/resetPassword.ejs → ...ty/email-password/reset-password.html.ejs
diff --git a/templates/main.html → templates/main.html.hbs b/templates/main.html → templates/main.html.hbs