|
|
@@ -239,7 +239,7 @@ module.exports = class UserService extends Schmervice.Service {
|
|
239
|
239
|
* @returns {Token}
|
|
240
|
240
|
*/
|
|
241
|
241
|
validateToken(token) {
|
|
242
|
|
- const key = this.server.registrations['main-app-plugin'].options.jwtKey
|
|
|
242
|
+ const key = process.env.APP_SECRET
|
|
243
|
243
|
try {
|
|
244
|
244
|
return JWT.verify(token, key)
|
|
245
|
245
|
} catch (err) {
|
|
|
@@ -248,7 +248,7 @@ module.exports = class UserService extends Schmervice.Service {
|
|
248
|
248
|
}
|
|
249
|
249
|
/**
|
|
250
|
250
|
* Uses this.validateToken() to verify hashedSessionToken's
|
|
251
|
|
- * existence, expiry, and also valdiates accessToken
|
|
|
251
|
+ * existence, expiry, and also validates accessToken
|
|
252
|
252
|
* @param {HashedSessionToken} hashedSessionToken
|
|
253
|
253
|
* @returns {PayloadFromActiveSessions}
|
|
254
|
254
|
*/
|
|
|
@@ -270,11 +270,12 @@ module.exports = class UserService extends Schmervice.Service {
|
|
270
|
270
|
throw new Error('No session token in userSession')
|
|
271
|
271
|
}
|
|
272
|
272
|
const sessionTokenIsValid = this.validateToken(sessionToken)
|
|
273
|
|
- return {
|
|
274
|
|
- ...sessionTokenIsValid.payload,
|
|
275
|
|
- sessionToken,
|
|
276
|
|
- email: this.activeSessions[hashedSessionToken].email,
|
|
277
|
|
- }
|
|
|
273
|
+ return sessionTokenIsValid
|
|
|
274
|
+ ? {
|
|
|
275
|
+ sessionToken,
|
|
|
276
|
+ email: this.activeSessions[hashedSessionToken].email,
|
|
|
277
|
+ }
|
|
|
278
|
+ : { ...sessionTokenIsValid.payload }
|
|
278
|
279
|
}
|
|
279
|
280
|
removeSession(hashedSessionToken) {
|
|
280
|
281
|
const userSession = this.activeSessions[hashedSessionToken]
|