@@ -17,7 +17,7 @@ import type {
1717} from './types.js' ;
1818
1919const DEFAULT_TIMEOUT = 10000 ;
20- const DEVICE_AUTH_SCHEMA_VERSION = 1 as const ;
20+ const DEVICE_AUTH_SCHEMA_VERSION = 2 as const ;
2121const DEVICE_CODE_PATTERN = / ^ [ A - Z a - z 0 - 9 _ - ] { 43 } $ / u;
2222const USER_CODE_PATTERN = / ^ [ A - H J - N P - Z 2 - 9 ] { 4 } - [ A - H J - N P - Z 2 - 9 ] { 4 } $ / u;
2323const CREDENTIAL_PATTERN = / ^ a h c _ [ A - Z a - z 0 - 9 _ - ] { 43 } $ / u;
@@ -171,6 +171,7 @@ function isCanonicalVerificationUrl(
171171 value : string ,
172172 userCode : string ,
173173 deviceCode : string ,
174+ schemaVersion : 1 | 2 ,
174175) : boolean {
175176 let url : URL ;
176177 try {
@@ -180,22 +181,31 @@ function isCanonicalVerificationUrl(
180181 }
181182 const queryEntries = [ ...url . searchParams . entries ( ) ] ;
182183 const continuation = url . searchParams . get ( 'continue' ) ;
184+ const validQuery = schemaVersion === DEVICE_AUTH_SCHEMA_VERSION
185+ ? queryEntries . length === 1
186+ && queryEntries [ 0 ] ?. [ 0 ] === 'user_code'
187+ && url . searchParams . getAll ( 'user_code' ) . length === 1
188+ && continuation === null
189+ : queryEntries . length === 2
190+ && queryEntries . filter ( ( [ key ] ) => key === 'continue' ) . length === 1
191+ && queryEntries . filter ( ( [ key ] ) => key === 'user_code' ) . length === 1
192+ && continuation !== null
193+ && isValidContinuation ( continuation ) ;
183194 return url . protocol === 'https:'
184195 && url . origin === 'https://autohand.ai'
185196 && url . pathname === '/signin'
186197 && url . username === ''
187198 && url . password === ''
188199 && url . hash === ''
189- && queryEntries . length === 2
190- && queryEntries . filter ( ( [ key ] ) => key === 'continue' ) . length === 1
191- && queryEntries . filter ( ( [ key ] ) => key === 'user_code' ) . length === 1
192- && continuation !== null
193- && isValidContinuation ( continuation )
200+ && validQuery
194201 && url . searchParams . get ( 'user_code' ) === userCode
195202 && ! value . includes ( deviceCode ) ;
196203}
197204
198- function parseDeviceChallenge ( data : unknown ) : DeviceAuthInitResponse | null {
205+ function parseDeviceChallenge (
206+ data : unknown ,
207+ expectedSchemaVersion : 1 | 2 ,
208+ ) : DeviceAuthInitResponse | null {
199209 if ( ! isRecord ( data )
200210 || ! hasOnlyKeys ( data , [
201211 'success' ,
@@ -208,7 +218,7 @@ function parseDeviceChallenge(data: unknown): DeviceAuthInitResponse | null {
208218 'interval' ,
209219 ] )
210220 || data . success !== true
211- || data . schemaVersion !== DEVICE_AUTH_SCHEMA_VERSION
221+ || data . schemaVersion !== expectedSchemaVersion
212222 || typeof data . deviceCode !== 'string'
213223 || ! DEVICE_CODE_PATTERN . test ( data . deviceCode )
214224 || typeof data . userCode !== 'string'
@@ -219,6 +229,7 @@ function parseDeviceChallenge(data: unknown): DeviceAuthInitResponse | null {
219229 data . verificationUriComplete ,
220230 data . userCode ,
221231 data . deviceCode ,
232+ expectedSchemaVersion ,
222233 )
223234 || ! Number . isInteger ( data . expiresIn )
224235 || ( data . expiresIn as number ) < 30
@@ -230,7 +241,7 @@ function parseDeviceChallenge(data: unknown): DeviceAuthInitResponse | null {
230241 }
231242 return {
232243 success : true ,
233- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
244+ schemaVersion : expectedSchemaVersion ,
234245 deviceCode : data . deviceCode ,
235246 userCode : data . userCode ,
236247 verificationUri : data . verificationUri ,
@@ -265,10 +276,13 @@ function parseAuthUser(value: unknown): AuthUser | null {
265276 } ;
266277}
267278
268- function parsePollResponse ( data : unknown ) : DeviceAuthPollResponse | null {
279+ function parsePollResponse (
280+ data : unknown ,
281+ schemaVersion : 1 | 2 ,
282+ ) : DeviceAuthPollResponse | null {
269283 if ( ! isRecord ( data )
270284 || data . success !== true
271- || data . schemaVersion !== DEVICE_AUTH_SCHEMA_VERSION
285+ || data . schemaVersion !== schemaVersion
272286 || typeof data . status !== 'string' ) {
273287 return null ;
274288 }
@@ -281,7 +295,7 @@ function parsePollResponse(data: unknown): DeviceAuthPollResponse | null {
281295 }
282296 return {
283297 success : true ,
284- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
298+ schemaVersion,
285299 status : 'pending' ,
286300 interval : data . interval as number ,
287301 } ;
@@ -296,7 +310,7 @@ function parsePollResponse(data: unknown): DeviceAuthPollResponse | null {
296310 }
297311 return {
298312 success : true ,
299- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
313+ schemaVersion,
300314 status : 'authorized' ,
301315 token : data . token ,
302316 user,
@@ -306,7 +320,7 @@ function parsePollResponse(data: unknown): DeviceAuthPollResponse | null {
306320 if ( ! hasOnlyKeys ( data , [ 'success' , 'schemaVersion' , 'status' ] ) ) return null ;
307321 return {
308322 success : true ,
309- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
323+ schemaVersion,
310324 status : data . status ,
311325 } ;
312326 }
@@ -359,7 +373,7 @@ export class AuthClient {
359373 } ;
360374 }
361375
362- return parseDeviceChallenge ( data ) ?? {
376+ return parseDeviceChallenge ( data , DEVICE_AUTH_SCHEMA_VERSION ) ?? {
363377 success : false ,
364378 error : DEVICE_AUTH_ERROR ,
365379 } ;
@@ -375,7 +389,10 @@ export class AuthClient {
375389 /**
376390 * Poll for device authorization status
377391 */
378- async pollDeviceAuth ( deviceCode : string ) : Promise < DeviceAuthPollResponse > {
392+ async pollDeviceAuth (
393+ deviceCode : string ,
394+ schemaVersion : 1 | 2 = DEVICE_AUTH_SCHEMA_VERSION ,
395+ ) : Promise < DeviceAuthPollResponse > {
379396 const controller = new AbortController ( ) ;
380397 const timeoutId = setTimeout ( ( ) => controller . abort ( ) , this . timeout ) ;
381398
@@ -387,7 +404,7 @@ export class AuthClient {
387404 } ,
388405 body : JSON . stringify ( {
389406 deviceCode,
390- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
407+ schemaVersion,
391408 } ) ,
392409 signal : controller . signal ,
393410 } ) ;
@@ -403,7 +420,7 @@ export class AuthClient {
403420 } ;
404421 }
405422
406- return parsePollResponse ( data ) ?? {
423+ return parsePollResponse ( data , schemaVersion ) ?? {
407424 success : false ,
408425 status : 'pending' ,
409426 error : DEVICE_AUTH_STATUS_ERROR ,
@@ -420,7 +437,10 @@ export class AuthClient {
420437 /**
421438 * Cancel an active device authorization transaction.
422439 */
423- async cancelDeviceAuth ( deviceCode : string ) : Promise < DeviceAuthCancelResponse > {
440+ async cancelDeviceAuth (
441+ deviceCode : string ,
442+ schemaVersion : 1 | 2 = DEVICE_AUTH_SCHEMA_VERSION ,
443+ ) : Promise < DeviceAuthCancelResponse > {
424444 const controller = new AbortController ( ) ;
425445 const timeoutId = setTimeout ( ( ) => controller . abort ( ) , this . timeout ) ;
426446
@@ -432,7 +452,7 @@ export class AuthClient {
432452 } ,
433453 body : JSON . stringify ( {
434454 deviceCode,
435- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
455+ schemaVersion,
436456 } ) ,
437457 signal : controller . signal ,
438458 } ) ;
@@ -447,13 +467,13 @@ export class AuthClient {
447467 if ( ! isRecord ( data )
448468 || ! hasOnlyKeys ( data , [ 'success' , 'schemaVersion' , 'status' ] )
449469 || data . success !== true
450- || data . schemaVersion !== DEVICE_AUTH_SCHEMA_VERSION
470+ || data . schemaVersion !== schemaVersion
451471 || data . status !== 'cancelled' ) {
452472 return { success : false , error : DEVICE_AUTH_STATUS_ERROR } ;
453473 }
454474 return {
455475 success : true ,
456- schemaVersion : DEVICE_AUTH_SCHEMA_VERSION ,
476+ schemaVersion,
457477 status : 'cancelled' ,
458478 } ;
459479 } catch ( error ) {
0 commit comments