diff --git a/src/oidc.js b/src/oidc.js index 7d3285dab..9743f8b9c 100644 --- a/src/oidc.js +++ b/src/oidc.js @@ -266,7 +266,6 @@ class CloudronAdapter { tmp.redirect_uris = client.loginRedirectUri.split(',').map(s => s.trim()).map(s => url.parse(s).protocol ? s : `https://${app.fqdn}${s}`); if (client.logoutRedirectUri) tmp.post_logout_redirect_uris = [ url.parse(client.logoutRedirectUri).protocol ? client.logoutRedirectUri : `https://${app.fqdn}${client.logoutRedirectUri}` ]; - else tmp.post_logout_redirect_uris = [ `https://${app.fqdn}` ]; } else { tmp.redirect_uris = client.loginRedirectUri.split(',').map(s => s.trim()); @@ -622,6 +621,7 @@ async function logoutSource(ctx, form) { ctx.body = ejs.render(fs.readFileSync(path.join(__dirname, 'oidc_templates/logout.ejs'), 'utf8'), data, {}); } +// this is called if client has not specified a post_logout_redirect_uri async function postLogoutSuccessSource(ctx) { // const client = ctx.oidc.client || {}; // client is defined if the user chose to stay logged in with the OP const data = { diff --git a/src/oidc_templates/error.ejs b/src/oidc_templates/error.ejs index 8c35890c5..0ff055392 100644 --- a/src/oidc_templates/error.ejs +++ b/src/oidc_templates/error.ejs @@ -6,6 +6,10 @@ OpenID Connect Error + + + + diff --git a/src/oidc_templates/interaction.ejs b/src/oidc_templates/interaction.ejs index 19b5a0148..7ac33857c 100644 --- a/src/oidc_templates/interaction.ejs +++ b/src/oidc_templates/interaction.ejs @@ -6,6 +6,10 @@ Authorize <%= name %> + + + + diff --git a/src/oidc_templates/login.ejs b/src/oidc_templates/login.ejs index 9fcc54038..f087f953f 100644 --- a/src/oidc_templates/login.ejs +++ b/src/oidc_templates/login.ejs @@ -6,6 +6,10 @@ Login to <%= name %> + + + + diff --git a/src/oidc_templates/logout.ejs b/src/oidc_templates/logout.ejs index deebe2afa..b3fe3b032 100644 --- a/src/oidc_templates/logout.ejs +++ b/src/oidc_templates/logout.ejs @@ -6,6 +6,10 @@ OpenID Logout + + + + diff --git a/src/oidc_templates/post_logout.ejs b/src/oidc_templates/post_logout.ejs index fb0985b5d..6430ff1df 100644 --- a/src/oidc_templates/post_logout.ejs +++ b/src/oidc_templates/post_logout.ejs @@ -6,6 +6,10 @@ Cloudron Logout + + + +