feat: configurable OTP length with 6-digit default support #14
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /** | ||
| * Tests for buildOtpInputProps — derives HTML input attributes from OTP config. | ||
| * | ||
| * Covers: | ||
| * 1. Correct pattern and placeholder for numeric charset | ||
| * 2. Correct pattern and placeholder for alphanumeric charset | ||
| * 3. Pattern and placeholder length match the requested otpLength | ||
| * 4. Numeric pattern rejects letters | ||
| * 5. Alphanumeric pattern accepts both letters and digits | ||
| */ | ||
| import { describe, it, expect } from 'vitest' | ||
| import { buildOtpInputProps } from '../otp-input.js' | ||
|
|
||
| describe('Recovery flow: OTP input props', () => { | ||
| it('numeric charset produces digit-only pattern and zero placeholder', () => { | ||
| const props = buildOtpInputProps(8, 'numeric') | ||
| expect(props.pattern).toBe('[0-9]{8}') | ||
| expect(props.placeholder).toBe('00000000') | ||
| expect(props.inputmode).toBe('numeric') | ||
| expect(props.autocapitalize).toBe('off') | ||
| }) | ||
|
|
||
| it('alphanumeric charset produces alphanumeric pattern and X placeholder', () => { | ||
| const props = buildOtpInputProps(8, 'alphanumeric') | ||
| expect(props.pattern).toBe('[A-Z0-9]{8}') | ||
| expect(props.placeholder).toBe('XXXXXXXX') | ||
| expect(props.inputmode).toBe('text') | ||
| expect(props.autocapitalize).toBe('characters') | ||
| }) | ||
|
|
||
| it('pattern and placeholder length match otpLength', () => { | ||
| const numeric = buildOtpInputProps(6, 'numeric') | ||
| expect(numeric.pattern).toBe('[0-9]{6}') | ||
| expect(numeric.placeholder).toHaveLength(6) | ||
| const numericRe = new RegExp(`^${numeric.pattern}$`) | ||
| expect(numericRe.test('123456')).toBe(true) | ||
| expect(numericRe.test('12345')).toBe(false) // too short | ||
| expect(numericRe.test('1234567')).toBe(false) // too long | ||
|
|
||
| const alpha = buildOtpInputProps(6, 'alphanumeric') | ||
| expect(alpha.pattern).toBe('[A-Z0-9]{6}') | ||
| expect(alpha.placeholder).toHaveLength(6) | ||
| const alphaRe = new RegExp(`^${alpha.pattern}$`) | ||
| expect(alphaRe.test('A1B2C3')).toBe(true) | ||
| expect(alphaRe.test('A1B2C')).toBe(false) // too short | ||
| expect(alphaRe.test('A1B2C3D')).toBe(false) // too long | ||
| }) | ||
|
|
||
| it('numeric pattern does not accept letters', () => { | ||
| const { pattern } = buildOtpInputProps(8, 'numeric') | ||
| const re = new RegExp(`^${pattern}$`) | ||
| expect(re.test('12345678')).toBe(true) | ||
| expect(re.test('1234567A')).toBe(false) | ||
| }) | ||
|
|
||
| it('alphanumeric pattern accepts both letters and digits', () => { | ||
| const { pattern } = buildOtpInputProps(8, 'alphanumeric') | ||
| const re = new RegExp(`^${pattern}$`) | ||
| expect(re.test('A1B2C3D4')).toBe(true) | ||
| expect(re.test('12345678')).toBe(true) | ||
| expect(re.test('ABCDEFGH')).toBe(true) | ||
| expect(re.test('abcdefgh')).toBe(false) // lowercase rejected | ||
| expect(re.test('A1B2C3D')).toBe(false) // one short | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,12 @@ export function createAuthService(config: AuthServiceConfig): { | |
|
|
||
| // Mount better-auth BEFORE express.json() so it can parse its own request bodies. | ||
| // All better-auth endpoints live under /api/auth/*. | ||
| const betterAuthInstance = createBetterAuth( | ||
| ctx.emailSender, | ||
| ctx.db, | ||
| config.otpLength, | ||
| config.otpCharset, | ||
| ) | ||
| app.all('/api/auth/*', toNodeHandler(betterAuthInstance)) | ||
|
|
||
| // Middleware | ||
|
|
@@ -75,7 +80,7 @@ export function createAuthService(config: AuthServiceConfig): { | |
| app.use(createLoginPageRouter(ctx)) | ||
| app.use(createConsentRouter(ctx)) | ||
| app.use(createRecoveryRouter(ctx, betterAuthInstance)) | ||
| app.use(createAccountLoginRouter(betterAuthInstance, ctx)) | ||
| app.use(createAccountSettingsRouter(ctx, betterAuthInstance)) | ||
| app.use(createCompleteRouter(ctx, betterAuthInstance)) | ||
| app.use(createChooseHandleRouter(ctx, betterAuthInstance)) | ||
|
|
@@ -132,9 +137,35 @@ async function main() { | |
| fromName: process.env.SMTP_FROM_NAME || 'ePDS', | ||
| }, | ||
| dbLocation: process.env.DB_LOCATION || './data/epds.sqlite', | ||
| otpLength: Number(process.env.OTP_LENGTH ?? '8'), | ||
| otpCharset: (process.env.OTP_CHARSET || 'numeric') as | ||
| | 'numeric' | ||
| | 'alphanumeric', | ||
| } | ||
|
|
||
| if ( | ||
| isNaN(config.otpLength) || | ||
| config.otpLength < 4 || | ||
| config.otpLength > 12 | ||
| ) { | ||
| throw new Error( | ||
| `Invalid OTP_LENGTH: must be between 4 and 12, got "${process.env.OTP_LENGTH}"`, | ||
| ) | ||
| } | ||
|
|
||
| const validCharsets = ['numeric', 'alphanumeric'] | ||
| if (!validCharsets.includes(config.otpCharset)) { | ||
| throw new Error( | ||
| `Invalid OTP_CHARSET: must be 'numeric' or 'alphanumeric', got "${process.env.OTP_CHARSET}"`, | ||
| ) | ||
| } | ||
|
Comment on lines
+146
to
+161
Contributor
There was a problem hiding this comment. In general please always look for opportunities to keep functions small and extract logic out into smaller chunks. Keeping everything smaller yields an enormous boost in code quality / maintainability / legibility (even for agents). For example these bits could be refactored as Feel free to adopt https://github.com/aspiers/ai-config/blob/main/.agents/skills/code-refactoring-small/SKILL.md |
||
|
|
||
| await runBetterAuthMigrations( | ||
| config.dbLocation, | ||
| config.hostname, | ||
| config.otpLength, | ||
| config.otpCharset, | ||
| ) | ||
|
|
||
| const { app, ctx } = createAuthService(config) | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Kzoeps Please can you check if you need to add these two vars to
scripts/setup.sh?