Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Replace /interaction path by /oidc #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/server/src/controllers/oidc/InteractionsCtrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {ConsentInteraction} from "../../interactions/ConsentInteraction";
import {LoginInteraction} from "../../interactions/LoginInteraction";

@Interactions({
path: "/interaction/:uid",
path: "/oidc/:uid",
children: [
LoginInteraction,
ConsentInteraction
Expand Down
2 changes: 1 addition & 1 deletion packages/server/views/forms/interaction-form.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion packages/server/views/forms/login-form.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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"<% } %>>
Expand Down
4 changes: 2 additions & 2 deletions packages/server/views/forms/select-account-form.ejs
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion packages/server/views/partials/login-help.ejs
Original file line number Diff line number Diff line change
@@ -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>
<% } %>
Expand Down
2 changes: 1 addition & 1 deletion packages/server/views/repost.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down