11import { Alert , AlertDescription } from "../ui/alert" ;
22import type { AuthSessionState } from "@t3tools/contracts" ;
33import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime" ;
4- import React , { startTransition , useEffect , useRef , useState , useCallback } from "react" ;
4+ import React , { startTransition , useEffect , useEffectEvent , useRef , useState } from "react" ;
55
66import { APP_DISPLAY_NAME } from "../../branding" ;
77import { connectPairing } from "../../connection/onboarding" ;
@@ -37,54 +37,51 @@ export function PairingRouteSurface({
3737 initialErrorMessage ?: string ;
3838 onAuthenticated : ( ) => void ;
3939} ) {
40- const autoPairTokenRef = useRef < string | null > ( peekPairingTokenFromUrl ( ) ) ;
41- const [ credential , setCredential ] = useState ( ( ) => autoPairTokenRef . current ?? "" ) ;
40+ const [ autoPairToken ] = useState ( peekPairingTokenFromUrl ) ;
41+ const [ credential , setCredential ] = useState ( autoPairToken ?? "" ) ;
4242 const [ errorMessage , setErrorMessage ] = useState ( initialErrorMessage ?? "" ) ;
4343 const [ isSubmitting , setIsSubmitting ] = useState ( false ) ;
4444 const autoSubmitAttemptedRef = useRef ( false ) ;
4545
46- const submitCredential = useCallback (
47- async ( nextCredential : string ) => {
48- setIsSubmitting ( true ) ;
49- setErrorMessage ( "" ) ;
46+ const submitCredential = async ( nextCredential : string ) => {
47+ setIsSubmitting ( true ) ;
48+ setErrorMessage ( "" ) ;
5049
51- const submitError = await submitServerAuthCredential ( nextCredential ) . then (
52- ( ) => null ,
53- ( error ) => errorMessageFromUnknown ( error ) ,
54- ) ;
50+ const submitError = await submitServerAuthCredential ( nextCredential ) . then (
51+ ( ) => null ,
52+ ( error ) => errorMessageFromUnknown ( error ) ,
53+ ) ;
5554
56- setIsSubmitting ( false ) ;
55+ setIsSubmitting ( false ) ;
5756
58- if ( submitError ) {
59- setErrorMessage ( submitError ) ;
60- return ;
61- }
57+ if ( submitError ) {
58+ setErrorMessage ( submitError ) ;
59+ return ;
60+ }
6261
63- startTransition ( ( ) => {
64- onAuthenticated ( ) ;
65- } ) ;
66- } ,
67- [ onAuthenticated ] ,
68- ) ;
62+ startTransition ( ( ) => {
63+ onAuthenticated ( ) ;
64+ } ) ;
65+ } ;
6966
70- const handleSubmit = useCallback (
71- async ( event ?: React . SubmitEvent < HTMLFormElement > ) => {
72- event ?. preventDefault ( ) ;
73- await submitCredential ( credential ) ;
74- } ,
75- [ submitCredential , credential ] ,
76- ) ;
67+ const handleSubmit = async ( event ?: React . SubmitEvent < HTMLFormElement > ) => {
68+ event ?. preventDefault ( ) ;
69+ await submitCredential ( credential ) ;
70+ } ;
71+
72+ const autoSubmit = useEffectEvent ( ( token : string ) => {
73+ void submitCredential ( token ) ;
74+ } ) ;
7775
7876 useEffect ( ( ) => {
79- const token = autoPairTokenRef . current ;
80- if ( ! token || autoSubmitAttemptedRef . current ) {
77+ if ( ! autoPairToken || autoSubmitAttemptedRef . current ) {
8178 return ;
8279 }
8380
8481 autoSubmitAttemptedRef . current = true ;
8582 stripPairingTokenFromUrl ( ) ;
86- void submitCredential ( token ) ;
87- } , [ submitCredential ] ) ;
83+ autoSubmit ( autoPairToken ) ;
84+ } , [ autoPairToken ] ) ;
8885
8986 return (
9087 < StandalonePage tone = "pairing" >
@@ -145,22 +142,20 @@ export function HostedPairingRouteSurface() {
145142 const connectPairingEnvironment = useAtomCommand ( connectPairing , {
146143 reportFailure : false ,
147144 } ) ;
148- const hostedPairingRequestRef = useRef ( readHostedPairingRequest ( ) ) ;
149- const [ status , setStatus ] = useState < "pairing" | "paired" | "error" > ( ( ) =>
150- hostedPairingRequestRef . current ? "pairing" : "error" ,
145+ const [ request ] = useState ( readHostedPairingRequest ) ;
146+ const [ status , setStatus ] = useState < "pairing" | "paired" | "error" > (
147+ request ? "pairing" : "error" ,
151148 ) ;
152- const [ message , setMessage ] = useState ( ( ) =>
153- hostedPairingRequestRef . current
149+ const [ message , setMessage ] = useState (
150+ request
154151 ? "Connecting to this backend."
155152 : "This pairing link is missing its backend host or token." ,
156153 ) ;
157154 const [ canRetry , setCanRetry ] = useState ( false ) ;
158155 const submitAttemptedRef = useRef ( false ) ;
159156 const tokenSubmittedRef = useRef ( false ) ;
160157
161- const submitHostedPairingRequest = useCallback ( async ( ) => {
162- const request = hostedPairingRequestRef . current ;
163-
158+ const submitHostedPairingRequest = async ( ) => {
164159 if ( ! request ) {
165160 setStatus ( "error" ) ;
166161 setMessage ( "This pairing link is missing its backend host or token." ) ;
@@ -196,7 +191,11 @@ export function HostedPairingRouteSurface() {
196191 setMessage (
197192 `${ errorMessageFromUnknown ( squashAtomCommandFailure ( result ) ) } If the backend accepted this one-time token, request a new pairing link before retrying.` ,
198193 ) ;
199- } , [ connectPairingEnvironment ] ) ;
194+ } ;
195+
196+ const submitOnMount = useEffectEvent ( ( ) => {
197+ void submitHostedPairingRequest ( ) ;
198+ } ) ;
200199
201200 useEffect ( ( ) => {
202201 if ( submitAttemptedRef . current ) {
@@ -205,10 +204,8 @@ export function HostedPairingRouteSurface() {
205204 submitAttemptedRef . current = true ;
206205
207206 stripPairingTokenFromUrl ( ) ;
208- void submitHostedPairingRequest ( ) ;
209- } , [ submitHostedPairingRequest ] ) ;
210-
211- const request = hostedPairingRequestRef . current ;
207+ submitOnMount ( ) ;
208+ } , [ ] ) ;
212209
213210 return (
214211 < StandalonePage tone = "pairing" >
0 commit comments