Browse Source

fix: token_version null handling

Signed-off-by: mertmit <mertmit99@gmail.com>
pull/2393/head
mertmit 2 years ago
parent
commit
c9bf931dd9
  1. 3
      packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
  2. 8
      packages/nocodb/src/lib/meta/api/userApi/initStrategies.ts

3
packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts

@ -174,9 +174,6 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
await NocoCache.del( await NocoCache.del(
`${CacheScope.USER}:${existingUserWithNewEmail.email}` `${CacheScope.USER}:${existingUserWithNewEmail.email}`
); );
await NocoCache.del(
`${CacheScope.USER}:${existingUserWithNewEmail.email}`
);
// Update email and password of super admin account // Update email and password of super admin account
await User.update( await User.update(

8
packages/nocodb/src/lib/meta/api/userApi/initStrategies.ts

@ -103,8 +103,8 @@ export function initStrategies(router): void {
if (cachedVal) { if (cachedVal) {
if ( if (
cachedVal.token_version && !cachedVal.token_version ||
jwtPayload.token_version && !jwtPayload.token_version ||
cachedVal.token_version !== jwtPayload.token_version cachedVal.token_version !== jwtPayload.token_version
) { ) {
return done(new Error('Token Expired. Please login again.')); return done(new Error('Token Expired. Please login again.'));
@ -115,8 +115,8 @@ export function initStrategies(router): void {
User.getByEmail(jwtPayload?.email) User.getByEmail(jwtPayload?.email)
.then(async user => { .then(async user => {
if ( if (
user.token_version && !user.token_version ||
jwtPayload.token_version && !jwtPayload.token_version ||
user.token_version !== jwtPayload.token_version user.token_version !== jwtPayload.token_version
) { ) {
return done(new Error('Token Expired. Please login again.')); return done(new Error('Token Expired. Please login again.'));

Loading…
Cancel
Save