Add oidc views footer

This commit is contained in:
Johannes Zellner
2023-08-11 13:36:46 +02:00
parent 34f2386a9d
commit cacf0d34f5
6 changed files with 32 additions and 3 deletions
+12
View File
@@ -33,6 +33,7 @@
"jsonwebtoken": "^9.0.1",
"ldapjs": "^2.3.3",
"lodash": "^4.17.21",
"marked": "^7.0.2",
"moment": "^2.29.4",
"moment-timezone": "^0.5.43",
"morgan": "^1.10.0",
@@ -3517,6 +3518,17 @@
"node": ">=12"
}
},
"node_modules/marked": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/marked/-/marked-7.0.2.tgz",
"integrity": "sha512-ADEBjnCHOrsLoV7JPvUNWtELZ0b4SeIALhrfxuA9uhS3hw2PCezROoFduIqMOjeagBPto732+YC5tZHBMQRdqg==",
"bin": {
"marked": "bin/marked.js"
},
"engines": {
"node": ">= 16"
}
},
"node_modules/media-typer": {
"version": "0.3.0",
"license": "MIT",
+1
View File
@@ -41,6 +41,7 @@
"jsonwebtoken": "^9.0.1",
"ldapjs": "^2.3.3",
"lodash": "^4.17.21",
"marked": "^7.0.2",
"moment": "^2.29.4",
"moment-timezone": "^0.5.43",
"morgan": "^1.10.0",
+7 -3
View File
@@ -25,6 +25,7 @@ const assert = require('assert'),
express = require('express'),
eventlog = require('./eventlog.js'),
fs = require('fs'),
marked = require('marked'),
middleware = require('./middleware'),
path = require('path'),
paths = require('./paths.js'),
@@ -445,7 +446,8 @@ function renderInteractionPage(provider) {
const options = {
submitUrl: `${ROUTE_PREFIX}/interaction/${uid}/login`,
iconUrl: '/api/v1/cloudron/avatar',
name: client?.name || await branding.getCloudronName()
name: client?.name || await branding.getCloudronName(),
footer: marked.parse(await branding.renderFooter())
};
if (app) {
@@ -463,7 +465,8 @@ function renderInteractionPage(provider) {
hasAccess: false,
submitUrl: '',
iconUrl: '/api/v1/cloudron/avatar',
name: client?.name || ''
name: client?.name || '',
footer: marked.parse(await branding.renderFooter())
};
// check if user has access to the app if client refers to an app
@@ -665,7 +668,8 @@ async function findAccount(ctx, id) {
async function renderError(ctx, out, error) {
const data = {
dashboardOrigin: `https://${settings.dashboardFqdn()}`,
errorMessage: error.error_description || error.error_detail || 'Unknown error'
errorMessage: error.error_description || error.error_detail || 'Unknown error',
footer: marked.parse(await branding.renderFooter())
};
debug('renderError: %o', error);
+4
View File
@@ -61,6 +61,10 @@
</div>
</div>
</div>
<footer class="text-center">
<span class="text-muted"><%- footer %></span>
</footer>
</div>
</body>
+4
View File
@@ -66,6 +66,10 @@
</div>
</div>
</div>
<footer class="text-center">
<span class="text-muted"><%- footer %></span>
</footer>
</div>
<% } -%>
+4
View File
@@ -88,6 +88,10 @@
</div>
</div>
</div>
<footer class="text-center">
<span class="text-muted"><%- footer %></span>
</footer>
</div>
<script>