Skip to content

Feature/admin forth/893/bug with login via google #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feature/admin forth/893/bug with login via google #15

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1b2773
fix: read cookie duration from extra in blc hook
ivictbor Oct 24, 2025
d24c462
chore - use better location for param
ivictbor Oct 24, 2025
741a685
chore: pass rememberMeDays in proceesLoginCallbacks called by passkey…
ivictbor Oct 24, 2025
b4338ad
fix: rename rememberMeDays to sessionDuration for consistency in 2FA …
SerVitasik Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation;
const beforeLoginConfirmationArray = Array.isArray(beforeLoginConfirmation) ? beforeLoginConfirmation : [beforeLoginConfirmation];
beforeLoginConfirmationArray.push(
async({ adminUser, response, extra }: { adminUser: AdminUser, response: IAdminForthHttpResponse, extra?: any} )=> {
async({ adminUser, response, extra, sessionDuration }: { adminUser: AdminUser, response: IAdminForthHttpResponse, extra?: any, sessionDuration?: number} )=> {
if (extra?.body?.loginAllowedByPasskeyDirectSignIn === true) {
return { body: { loginAllowed: true }, ok: true };
}
Expand All @@ -307,8 +307,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
const authResource = adminforth.config.resources.find((res)=>res.resourceId === adminforth.config.auth.usersResourceId )
const authPk = authResource.columns.find((col)=>col.primaryKey).name
const userPk = adminUser.dbUser[authPk]
const rememberMe = extra?.body?.rememberMe || false;
const rememberMeDays = rememberMe ? adminforth.config.auth.rememberMeDays || 30 : 1;

const useSessionDuration = sessionDuration || 1; // default 1 day, but should never happen for new versions
let newSecret = null;

const userNeeds2FA = this.options.usersFilterToApply ? this.options.usersFilterToApply(adminUser) : true;
Expand All @@ -321,7 +321,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
const tempSecret = twofactor.generateSecret({name: issuerName,account: userName})
newSecret = tempSecret.secret;

const totpTemporaryJWT = this.adminforth.auth.issueJWT({userName, newSecret, issuer:issuerName, pk:userPk, userCanSkipSetup, rememberMeDays }, 'temp2FA', this.options.passkeys?.challengeValidityPeriod || '1m');
const totpTemporaryJWT = this.adminforth.auth.issueJWT({userName, newSecret, issuer:issuerName, pk:userPk, userCanSkipSetup, sessionDuration: useSessionDuration }, 'temp2FA', this.options.passkeys?.challengeValidityPeriod || '1m');
this.adminforth.auth.setCustomCookie({response, payload: {name: "2FaTemporaryJWT", value: totpTemporaryJWT, expiry: undefined, expirySeconds: 10 * 60, httpOnly: true}});

return {
Expand All @@ -333,7 +333,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
}

} else {
const value = this.adminforth.auth.issueJWT({userName, issuer:issuerName, pk:userPk, userCanSkipSetup, rememberMeDays }, 'temp2FA', this.options.passkeys?.challengeValidityPeriod || '1m');
const value = this.adminforth.auth.issueJWT({userName, issuer:issuerName, pk:userPk, userCanSkipSetup, sessionDuration: useSessionDuration }, 'temp2FA', this.options.passkeys?.challengeValidityPeriod || '1m');
this.adminforth.auth.setCustomCookie({response, payload: {name: "2FaTemporaryJWT", value: value, expiry: undefined, expirySeconds: 10 * 60, httpOnly: true}});

return {
Expand Down Expand Up @@ -389,7 +389,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
await connector.updateRecord({resource:this.authResource, recordId:decoded.pk, newValues:{[this.options.twoFaSecretFieldName]: decoded.newSecret}})
}
this.adminforth.auth.removeCustomCookie({response, name:'2FaTemporaryJWT'})
this.adminforth.auth.setAuthCookie({expireInDays: decoded.rememberMeDays, response, username:decoded.userName, pk:decoded.pk})
this.adminforth.auth.setAuthCookie({expireInDays: decoded.sessionDuration, response, username:decoded.userName, pk:decoded.pk})
return { status: 'ok', allowedLogin: true }
} else {
return {error: 'Wrong or expired OTP code'}
Expand Down Expand Up @@ -420,7 +420,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
}
if (verified) {
this.adminforth.auth.removeCustomCookie({response, name:'2FaTemporaryJWT'})
this.adminforth.auth.setAuthCookie({expireInDays: decoded.rememberMeDays, response, username:decoded.userName, pk:decoded.pk})
this.adminforth.auth.setAuthCookie({expireInDays: decoded.sessionDuration, response, username:decoded.userName, pk:decoded.pk})
return { status: 'ok', allowedLogin: true }
} else {
return {error: 'Verification failed'}
Expand Down Expand Up @@ -496,6 +496,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {

const toReturn = { allowedLogin: true, error: '' };

const sessionDuration = this.options.passkeys.rememberDaysAfterPasskeyLogin ? this.options.passkeys.rememberDaysAfterPasskeyLogin : this.adminforth.config.auth.rememberMeDays;
await this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, {
headers,
cookies,
Expand All @@ -504,14 +505,14 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
body: {
loginAllowedByPasskeyDirectSignIn: true
},
});
}, sessionDuration );

if ( toReturn.allowedLogin === true ) {
this.adminforth.auth.setAuthCookie({
response,
username,
pk: user.id,
expireInDays: this.options.passkeys.rememberDaysAfterPasskeyLogin ? this.options.passkeys.rememberDaysAfterPasskeyLogin : this.adminforth.config.auth.rememberMeDays,
expireInDays: sessionDuration,
});
}
return toReturn;
Expand Down