From 181ffdd3f3b1d82e3481783c8ef279ab0f027b92 Mon Sep 17 00:00:00 2001
From: Romain Lenzotti <rom.lenzotti@gmail.com>
Date: Mon, 3 May 2021 19:11:42 +0200
Subject: [PATCH] fix: Replace /interaction path by /oidc

---
 packages/server/src/controllers/oidc/InteractionsCtrl.ts | 2 +-
 packages/server/views/forms/interaction-form.ejs         | 2 +-
 packages/server/views/forms/login-form.ejs               | 2 +-
 packages/server/views/forms/select-account-form.ejs      | 4 ++--
 packages/server/views/partials/login-help.ejs            | 2 +-
 packages/server/views/repost.ejs                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/controllers/oidc/InteractionsCtrl.ts b/packages/server/src/controllers/oidc/InteractionsCtrl.ts
index 2d6ca2a..358148d 100644
--- a/packages/server/src/controllers/oidc/InteractionsCtrl.ts
+++ b/packages/server/src/controllers/oidc/InteractionsCtrl.ts
@@ -4,7 +4,7 @@ import {ConsentInteraction} from "../../interactions/ConsentInteraction";
 import {LoginInteraction} from "../../interactions/LoginInteraction";
 
 @Interactions({
-  path: "/interaction/:uid",
+  path: "/oidc/:uid",
   children: [
     LoginInteraction,
     ConsentInteraction
diff --git a/packages/server/views/forms/interaction-form.ejs b/packages/server/views/forms/interaction-form.ejs
index 0f1235e..97dd566 100644
--- a/packages/server/views/forms/interaction-form.ejs
+++ b/packages/server/views/forms/interaction-form.ejs
@@ -49,6 +49,6 @@
         </li>
     <% } %>
 </ul>
-<form autocomplete="off" action="/interaction/<%= uid %>/confirm" method="post">
+<form autocomplete="off" action="/oidc/<%= uid %>/confirm" method="post">
     <button autofocus type="submit" class="login login-submit">Continue</button>
 </form>
\ No newline at end of file
diff --git a/packages/server/views/forms/login-form.ejs b/packages/server/views/forms/login-form.ejs
index 684c56f..d8ff91a 100644
--- a/packages/server/views/forms/login-form.ejs
+++ b/packages/server/views/forms/login-form.ejs
@@ -2,7 +2,7 @@
     <p><%= flash %></p>
 <% } %>
 
-<form autocomplete="off" action="/interaction/<%= uid %>/login" method="post">
+<form autocomplete="off" action="/oidc/<%= uid %>/login" method="post">
     <input required type="email" name="email" placeholder="Enter an email" <% if (!params.login_hint) { %>autofocus="on"<% } else { %> value="<%= params.login_hint %>" <% } %>>
 
     <input required type="password" name="password" placeholder="and password" <% if (params.login_hint) { %>autofocus="on"<% } %>>
diff --git a/packages/server/views/forms/select-account-form.ejs b/packages/server/views/forms/select-account-form.ejs
index ace5ef2..5af89ef 100644
--- a/packages/server/views/forms/select-account-form.ejs
+++ b/packages/server/views/forms/select-account-form.ejs
@@ -1,7 +1,7 @@
-<form autocomplete="off" action="/interaction/<%= uid %>/continue" method="post">
+<form autocomplete="off" action="/oidc/<%= uid %>/continue" method="post">
     <button autofocus type="submit" class="login login-submit">Continue as <%= email %></button>
 </form>
-<form autocomplete="off" action="/interaction/<%= uid %>/continue" method="post">
+<form autocomplete="off" action="/oidc/<%= uid %>/continue" method="post">
     <input type="hidden" name="switch" value="true">
     <button type="submit" class="login">Switch account</button>
 </form>
\ No newline at end of file
diff --git a/packages/server/views/partials/login-help.ejs b/packages/server/views/partials/login-help.ejs
index 2c11122..64dec7d 100644
--- a/packages/server/views/partials/login-help.ejs
+++ b/packages/server/views/partials/login-help.ejs
@@ -1,5 +1,5 @@
 <div class="login-help">
-    <a href="/interaction/<%= uid %>/abort">[ Cancel ]</a>
+    <a href="/oidc/<%= uid %>/abort">[ Cancel ]</a>
     <% if (client.tosUri) { %>
         <a href="<%= client.tosUri %>">[ Terms of Service ]</a>
     <% } %>
diff --git a/packages/server/views/repost.ejs b/packages/server/views/repost.ejs
index 7ee593d..70ee04e 100644
--- a/packages/server/views/repost.ejs
+++ b/packages/server/views/repost.ejs
@@ -18,7 +18,7 @@
   var uid = fields.state.split('|')[0]
   var form = document.createElement('form');
   form.method = 'POST';
-  form.action = '/interaction/' + uid + '/federated';
+  form.action = '/oidc/' + uid + '/federated';
   Object.keys(fields).forEach((key) => {
     if (key) { // empty fragment will yield {"":""};
       var input = document.createElement('input');