Update passwordless root user check to user user.type instead of user.id

This commit is contained in:
advplyr 2023-09-23 13:30:28 -05:00
parent 7a131880e5
commit f42ab45e1b
2 changed files with 3 additions and 9 deletions

View File

@ -78,16 +78,10 @@ class Auth {
}).bind(this)))
}
// should be already initialied here - but ci had some problems so check again
// token is required to encrypt/protect the info in jwts
if (!global.ServerSettings.tokenSecret) {
await this.initTokenSecret()
}
// Load the JwtStrategy (always) -> for bearer token auth
passport.use(new JwtStrategy({
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
secretOrKey: global.ServerSettings.tokenSecret
secretOrKey: Database.serverSettings.tokenSecret
}, this.jwtAuthCheck.bind(this)))
// define how to seralize a user (to be put into the session)
@ -330,7 +324,7 @@ class Auth {
}
// Check passwordless root user
if (user.id === 'root' && (!user.pash || user.pash === '')) {
if (user.type === 'root' && (!user.pash || user.pash === '')) {
if (password) {
// deny login
done(null, null)

View File

@ -139,7 +139,7 @@ class Server {
const app = express()
// parse cookies in requests
app.use(cookieParser());
app.use(cookieParser())
// enable express-session
app.use(expressSession({
secret: global.ServerSettings.tokenSecret,