ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-05-03 20:42:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: improve error handling

Browse Source
This commit is contained in:
Marcell Fülöp 2023-02-24 18:54:38 +00:00
parent bc0b466a8e
commit baee4641db
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/routes/api/oidc.js
View File

@ -1,4 +1,5 @@
const crypto = require('crypto'); const crypto = require('crypto');
const error = require('../../lib/error');
const express = require('express'); const express = require('express');
const jwtdecode = require('../../lib/express/jwt-decode'); const jwtdecode = require('../../lib/express/jwt-decode');
const oidc = require('openid-client'); const oidc = require('openid-client');
@ -35,7 +36,8 @@ router
.where({id: 'oidc-config'}) .where({id: 'oidc-config'})
.first() .first()
.then( row => getInitParams(req, row)) .then( row => getInitParams(req, row))
.then( params => redirectToAuthorizationURL(res, params)); .then( params => redirectToAuthorizationURL(res, params))
.catch( err => redirectWithError(res, err));
}); });
@ -73,7 +75,12 @@ router
* @param {Setting} row * @param {Setting} row
* */ * */
let getClient = async row => { let getClient = async row => {
let issuer = await oidc.Issuer.discover(row.meta.issuerURL); let issuer;
try {
issuer = await oidc.Issuer.discover(row.meta.issuerURL);
} catch(err) {
throw new error.AuthError(`Discovery failed for the specified URL with message: ${err.message}`);
}
return new issuer.Client({ return new issuer.Client({
client_id: row.meta.clientID, client_id: row.meta.clientID,

2
frontend/js/app/settings/oidc-config/main.ejs
View File

@ -41,7 +41,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="form-label">Enabled</div> <div class="form-label">Enabled</div>
<input class="form-check enabled-input" name="meta[enabled]" placeholder="" type="checkbox" <%- meta && typeof meta.enabled !== 'undefined' && meta.enabled === true ? 'checked="checked"' : '' %> > <input class="form-check enabled-input" name="meta[enabled]" placeholder="" type="checkbox" <%- meta && (typeof meta.enabled !== 'undefined' && meta.enabled === true) || (JSON.stringify(meta) === '{}') ? 'checked="checked"' : '' %> >
</div> </div>
</div> </div>
</div> </div>

1
frontend/js/app/settings/oidc-config/main.js
View File

@ -3,7 +3,6 @@ const App = require('../../main');
const template = require('./main.ejs'); const template = require('./main.ejs');
require('jquery-serializejson'); require('jquery-serializejson');
require('selectize');
module.exports = Mn.View.extend({ module.exports = Mn.View.extend({
template: template, template: template,