@oxyhq/services 22.12.3 → 22.12.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/ui/components/oauthNavigation.js +11 -1
- package/lib/commonjs/ui/components/oauthNavigation.js.map +1 -1
- package/lib/commonjs/ui/screens/CreateAccountScreen.js +5 -0
- package/lib/commonjs/ui/screens/CreateAccountScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/fileManagement/hooks/useFileUploadState.js +14 -3
- package/lib/commonjs/ui/screens/fileManagement/hooks/useFileUploadState.js.map +1 -1
- package/lib/commonjs/ui/utils/crossOriginRestore.js +5 -1
- package/lib/commonjs/ui/utils/crossOriginRestore.js.map +1 -1
- package/lib/commonjs/ui/utils/oauthReturn.js +50 -4
- package/lib/commonjs/ui/utils/oauthReturn.js.map +1 -1
- package/lib/module/ui/components/oauthNavigation.js +12 -2
- package/lib/module/ui/components/oauthNavigation.js.map +1 -1
- package/lib/module/ui/screens/CreateAccountScreen.js +5 -0
- package/lib/module/ui/screens/CreateAccountScreen.js.map +1 -1
- package/lib/module/ui/screens/fileManagement/hooks/useFileUploadState.js +14 -3
- package/lib/module/ui/screens/fileManagement/hooks/useFileUploadState.js.map +1 -1
- package/lib/module/ui/utils/crossOriginRestore.js +5 -1
- package/lib/module/ui/utils/crossOriginRestore.js.map +1 -1
- package/lib/module/ui/utils/oauthReturn.js +50 -5
- package/lib/module/ui/utils/oauthReturn.js.map +1 -1
- package/lib/typescript/commonjs/ui/components/oauthNavigation.d.ts +7 -0
- package/lib/typescript/commonjs/ui/components/oauthNavigation.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/CreateAccountScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/fileManagement/hooks/useFileUploadState.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/crossOriginRestore.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/oauthReturn.d.ts +19 -0
- package/lib/typescript/commonjs/ui/utils/oauthReturn.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/oauthNavigation.d.ts +7 -0
- package/lib/typescript/module/ui/components/oauthNavigation.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/CreateAccountScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/fileManagement/hooks/useFileUploadState.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/crossOriginRestore.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/oauthReturn.d.ts +19 -0
- package/lib/typescript/module/ui/utils/oauthReturn.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/ui/components/oauthNavigation.ts +12 -2
- package/src/ui/screens/CreateAccountScreen.tsx +5 -0
- package/src/ui/screens/fileManagement/hooks/useFileUploadState.ts +15 -3
- package/src/ui/utils/crossOriginRestore.ts +5 -1
- package/src/ui/utils/oauthReturn.ts +51 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useEffect","useRef","useState","useQueryClient","toast","queryKeys","prependFileToCache","removeFileFromCache","replaceFileInCache","convertDocumentPickerAssetToFile","formatFileSize","createPendingUploadFile","candidateName","candidateSize","candidateType","candidateUri","getErrorMessage","loadDocumentPicker","MIN_BANNER_MS","revokePreviewUrl","preview","startsWith","URL","revokeObjectURL","useFileUploadState","targetUserId","uploadFileMutation","defaultVisibility","selectMode","multiSelect","afterSelect","onSelect","onPicked","goBack","onClose","imagesOnly","selectedIds","setSelectedIds","t","isPickingDocument","setIsPickingDocument","pendingFiles","setPendingFiles","showUploadPreview","setShowUploadPreview","uploading","setUploading","uploadProgress","setUploadProgress","queryClient","uploadStartRef","postSelectTimerRef","isActiveRef","clearPostSelectTimer","current","clearTimeout","endUpload","started","elapsed","Date","now","remaining","setTimeout","processFileUploads","selectedFiles","length","uploadedFiles","total","maxSize","oversizedFiles","filter","file","fileList","map","f","join","error","files","successCount","failureCount","errors","i","raw","fileName","fileSize","fileType","optimisticId","Math","random","toString","slice","push","previewUri","optimisticMetadata","localPreviewUri","optimisticFile","id","filename","contentType","chunkSize","uploadDate","toISOString","metadata","variants","result","mutateAsync","visibility","merged","originalName","sha256","mime","size","createdAt","errorMessage","success","count","errorDetails","invalidateQueries","queryKey","list","handleFileSelection","MAX_FILE_SIZE","processedFiles","name","undefined","Number","isNaN","fileUri","File","Blob","createObjectURL","handleConfirmUpload","filesToUpload","pf","fileToSelect","has","prev","Set","add","handleCancelUpload","removePendingFile","find","updated","handleFileUpload","picker","getDocumentAsync","type","multiple","copyToCacheDirectory","canceled","assets","conversionPromises","doc","index","then","catch","convertedFiles","Promise","all","includes"],"sourceRoot":"../../../../../../src","sources":["ui/screens/fileManagement/hooks/useFileUploadState.ts"],"mappings":";;AACA,SAASA,WAAW,EAAEC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AAChE,SAASC,cAAc,QAAQ,uBAAuB;AACtD,SAASC,KAAK,QAAQ,cAAc;AAGpC,SAASC,SAAS,QAAQ,qCAAkC;AAC5D,SACIC,kBAAkB,EAClBC,mBAAmB,EACnBC,kBAAkB,QACf,0CAAuC;AAC9C,SAASC,gCAAgC,EAAEC,cAAc,QAAQ,kCAA+B;AAChG,SACIC,uBAAuB,EAGvBC,aAAa,EACbC,aAAa,EACbC,aAAa,EACbC,YAAY,EACZC,eAAe,EACfC,kBAAkB,QACf,cAAW;;AAElB;;AAMA;AACA,MAAMC,aAAa,GAAG,GAAG;AAEzB,SAASC,gBAAgBA,CAACC,OAA2B,EAAQ;EACzD,IAAIA,OAAO,EAAEC,UAAU,CAAC,OAAO,CAAC,EAAE;IAC9BC,GAAG,CAACC,eAAe,CAACH,OAAO,CAAC;EAChC;AACJ;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAMA;;AAoBA;;AAeA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMI,kBAAkB,GAAGA,CAAC;EAC/BC,YAAY;EACZC,kBAAkB;EAClBC,iBAAiB;EACjBC,UAAU;EACVC,WAAW;EACXC,WAAW;EACXC,QAAQ;EACRC,QAAQ;EACRC,MAAM;EACNC,OAAO;EACPC,UAAU,GAAG,KAAK;EAClBC,WAAW;EACXC,cAAc;EACdC;AACsB,CAAC,KAA+B;EACtD,MAAM,CAACC,iBAAiB,EAAEC,oBAAoB,CAAC,GAAGtC,QAAQ,CAAC,KAAK,CAAC;EACjE,MAAM,CAACuC,YAAY,EAAEC,eAAe,CAAC,GAAGxC,QAAQ,CAAsB,EAAE,CAAC;EACzE,MAAM,CAACyC,iBAAiB,EAAEC,oBAAoB,CAAC,GAAG1C,QAAQ,CAAC,KAAK,CAAC;EACjE,MAAM,CAAC2C,SAAS,EAAEC,YAAY,CAAC,GAAG5C,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAAC6C,cAAc,EAAEC,iBAAiB,CAAC,GAAG9C,QAAQ,CAAqC,IAAI,CAAC;EAE9F,MAAM+C,WAAW,GAAG9C,cAAc,CAAC,CAAC;EACpC,MAAM+C,cAAc,GAAGjD,MAAM,CAAgB,IAAI,CAAC;EAClD,MAAMkD,kBAAkB,GAAGlD,MAAM,CAAuC,IAAI,CAAC;EAC7E,MAAMmD,WAAW,GAAGnD,MAAM,CAAC,IAAI,CAAC;EAEhC,MAAMoD,oBAAoB,GAAGtD,WAAW,CAAC,MAAM;IAC3C,IAAIoD,kBAAkB,CAACG,OAAO,EAAE;MAC5BC,YAAY,CAACJ,kBAAkB,CAACG,OAAO,CAAC;MACxCH,kBAAkB,CAACG,OAAO,GAAG,IAAI;IACrC;EACJ,CAAC,EAAE,EAAE,CAAC;EAENtD,SAAS,CAAC,MAAM;IACZoD,WAAW,CAACE,OAAO,GAAG,IAAI;IAC1B,OAAO,MAAM;MACTF,WAAW,CAACE,OAAO,GAAG,KAAK;MAC3BD,oBAAoB,CAAC,CAAC;IAC1B,CAAC;EACL,CAAC,EAAE,CAACA,oBAAoB,CAAC,CAAC;EAE1B,MAAMG,SAAS,GAAGzD,WAAW,CAAC,MAAM;IAChC,MAAM0D,OAAO,GAAGP,cAAc,CAACI,OAAO;IACtC,MAAMI,OAAO,GAAGD,OAAO,GAAGE,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGH,OAAO,GAAGvC,aAAa;IAC9D,MAAM2C,SAAS,GAAGH,OAAO,GAAGxC,aAAa,GAAGA,aAAa,GAAGwC,OAAO,GAAG,CAAC;IACvEI,UAAU,CAAC,MAAM;MACbhB,YAAY,CAAC,KAAK,CAAC;MACnBI,cAAc,CAACI,OAAO,GAAG,IAAI;IACjC,CAAC,EAAEO,SAAS,CAAC;EACjB,CAAC,EAAE,EAAE,CAAC;EAEN,MAAME,kBAAkB,GAAG,MAAOC,aAAgC,IAA8B;IAC5F,IAAIA,aAAa,CAACC,MAAM,KAAK,CAAC,EAAE,OAAO,EAAE;IACzC,IAAI,CAACxC,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9B,MAAMyC,aAA6B,GAAG,EAAE;IACxC,IAAI;MACAlB,iBAAiB,CAAC;QAAEM,OAAO,EAAE,CAAC;QAAEa,KAAK,EAAEH,aAAa,CAACC;MAAO,CAAC,CAAC;MAC9D,MAAMG,OAAO,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;MAClC,MAAMC,cAAc,GAAGL,aAAa,CAACM,MAAM,CAACC,IAAI,IAAI1D,aAAa,CAAC0D,IAAI,CAAC,GAAGH,OAAO,CAAC;MAClF,IAAIC,cAAc,CAACJ,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAMO,QAAQ,GAAGH,cAAc,CAACI,GAAG,CAACC,CAAC,IAAI9D,aAAa,CAAC8D,CAAC,EAAE,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;QAC7EvE,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,qCAAqC,EAAE;UAAEuC,KAAK,EAAEL;QAAS,CAAC,CAAC,CAAC;QAC1E,OAAO,EAAE;MACb;MACA,IAAIM,YAAY,GAAG,CAAC;MACpB,IAAIC,YAAY,GAAG,CAAC;MACpB,MAAMC,MAAgB,GAAG,EAAE;MAC3B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGjB,aAAa,CAACC,MAAM,EAAEgB,CAAC,EAAE,EAAE;QAC3CjC,iBAAiB,CAAC;UAAEM,OAAO,EAAE2B,CAAC,GAAG,CAAC;UAAEd,KAAK,EAAEH,aAAa,CAACC;QAAO,CAAC,CAAC;QAClE,MAAMiB,GAAG,GAAGlB,aAAa,CAACiB,CAAC,CAAC;QAC5B,MAAME,QAAQ,GAAGvE,aAAa,CAACsE,GAAG,EAAE,QAAQD,CAAC,GAAG,CAAC,EAAE,CAAC;QACpD,MAAMG,QAAQ,GAAGvE,aAAa,CAACqE,GAAG,CAAC;QACnC,MAAMG,QAAQ,GAAGvE,aAAa,CAACoE,GAAG,CAAC;QACnC,MAAMI,YAAY,GAAG,QAAQ3B,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIqB,CAAC,IAAIM,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;;QAE3F,IAAI;UACA;UACA,IAAI,CAACR,GAAG,IAAI,CAACC,QAAQ,IAAIC,QAAQ,IAAI,CAAC,EAAE;YACpCL,YAAY,EAAE;YACdC,MAAM,CAACW,IAAI,CAAC,GAAGR,QAAQ,uCAAuC,CAAC;YAC/D;UACJ;;UAEA;UACA;UACA;UACA;UACA,MAAMS,UAAU,GAAG7E,YAAY,CAACmE,GAAG,CAAC;UACpC,MAAMW,kBAA0C,GAAG;YAC/ChD,SAAS,EAAE,IAAI;YACf,IAAI+C,UAAU,GAAG;cAAEE,eAAe,EAAEF;YAAW,CAAC,GAAG,CAAC,CAAC;UACzD,CAAC;UACD,MAAMG,cAA4B,GAAG;YACjCC,EAAE,EAAEV,YAAY;YAChBW,QAAQ,EAAEd,QAAQ;YAClBe,WAAW,EAAEb,QAAQ;YACrBpB,MAAM,EAAEmB,QAAQ;YAChBe,SAAS,EAAE,CAAC;YACZC,UAAU,EAAE,IAAIzC,IAAI,CAAC,CAAC,CAAC0C,WAAW,CAAC,CAAC;YACpCC,QAAQ,EAAET,kBAAkB;YAC5BU,QAAQ,EAAE;UACd,CAAC;UACDjG,kBAAkB,CAAC2C,WAAW,EAAExB,YAAY,EAAEsE,cAAc,CAAC;;UAE7D;UACA,MAAMS,MAAM,GAAG,MAAM9E,kBAAkB,CAAC+E,WAAW,CAAC;YAChDlC,IAAI,EAAEW,GAAuB;YAC7BwB,UAAU,EAAE/E;UAChB,CAAC,CAAC;;UAEF;UACA,MAAM+C,CAAC,GAAG8B,MAAM,EAAEjC,IAAI,IAAIiC,MAAM,EAAE3B,KAAK,GAAG,CAAC,CAAC;UAC5C,IAAIH,CAAC,EAAE;YACH,MAAMiC,MAAoB,GAAG;cACzBX,EAAE,EAAEtB,CAAC,CAACsB,EAAE;cACRC,QAAQ,EAAEvB,CAAC,CAACkC,YAAY,IAAIlC,CAAC,CAACmC,MAAM,IAAI1B,QAAQ;cAChDe,WAAW,EAAExB,CAAC,CAACoC,IAAI,IAAIzB,QAAQ;cAC/BpB,MAAM,EAAES,CAAC,CAACqC,IAAI,IAAI3B,QAAQ;cAC1Be,SAAS,EAAE,CAAC;cACZC,UAAU,EAAE1B,CAAC,CAACsC,SAAS,IAAI,IAAIrD,IAAI,CAAC,CAAC,CAAC0C,WAAW,CAAC,CAAC;cACnDC,QAAQ,EAAE5B,CAAC,CAAC4B,QAAQ,IAAI,CAAC,CAAC;cAC1BC,QAAQ,EAAE7B,CAAC,CAAC6B,QAAQ,IAAI;YAC5B,CAAC;YACD;YACA/F,kBAAkB,CAACyC,WAAW,EAAExB,YAAY,EAAE6D,YAAY,EAAEqB,MAAM,CAAC;YACnEzC,aAAa,CAACyB,IAAI,CAACgB,MAAM,CAAC;YAC1B7B,YAAY,EAAE;UAClB,CAAC,MAAM;YACH;YACA;YACA;YACA;YACA;YACAvE,mBAAmB,CAAC0C,WAAW,EAAExB,YAAY,EAAE6D,YAAY,CAAC;YAC5D;YACAR,YAAY,EAAE;UAClB;QACJ,CAAC,CAAC,OAAOF,KAAc,EAAE;UACrBG,YAAY,EAAE;UACd,MAAMkC,YAAY,GAAGjG,eAAe,CAAC4D,KAAK,CAAC,IAAI,eAAe;UAC9DI,MAAM,CAACW,IAAI,CAAC,GAAGR,QAAQ,KAAK8B,YAAY,EAAE,CAAC;UAC3C;UACA1G,mBAAmB,CAAC0C,WAAW,EAAExB,YAAY,EAAE6D,YAAY,CAAC;QAChE;MACJ;;MAEA;MACA,IAAIR,YAAY,GAAG,CAAC,EAAE;QAClB1E,KAAK,CAAC8G,OAAO,CAAC5E,CAAC,CAAC,qCAAqC,EAAE;UAAE6E,KAAK,EAAErC;QAAa,CAAC,CAAC,CAAC;MACpF;MACA,IAAIC,YAAY,GAAG,CAAC,EAAE;QAClB;QACA,MAAMqC,YAAY,GAAGpC,MAAM,CAACf,MAAM,GAAG,CAAC,GAChC,KAAKe,MAAM,CAACU,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAACf,IAAI,CAAC,IAAI,CAAC,GAAGK,MAAM,CAACf,MAAM,GAAG,CAAC,GAAG,YAAYe,MAAM,CAACf,MAAM,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,GACpG,EAAE;QACR7D,KAAK,CAACwE,KAAK,CAAC,GAAGtC,CAAC,CAAC,oCAAoC,EAAE;UAAE6E,KAAK,EAAEpC;QAAa,CAAC,CAAC,GAAGqC,YAAY,EAAE,CAAC;MACrG;MACA;MACA;MACA,IAAItC,YAAY,GAAG,CAAC,EAAE;QAClB7B,WAAW,CAACoE,iBAAiB,CAAC;UAAEC,QAAQ,EAAEjH,SAAS,CAACwE,KAAK,CAAC0C,IAAI,CAAC9F,YAAY;QAAE,CAAC,CAAC;MACnF;IACJ,CAAC,CAAC,OAAOmD,KAAc,EAAE;MACrBxE,KAAK,CAACwE,KAAK,CAAC5D,eAAe,CAAC4D,KAAK,CAAC,IAAItC,CAAC,CAAC,mCAAmC,CAAC,CAAC;IACjF,CAAC,SAAS;MACNU,iBAAiB,CAAC,IAAI,CAAC;IAC3B;IACA,OAAOkB,aAAa;EACxB,CAAC;EAED,MAAMsD,mBAAmB,GAAGzH,WAAW,CAAC,MAAOiE,aAAgC,IAAK;IAChF,MAAMyD,aAAa,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IACzC,MAAMC,cAAmC,GAAG,EAAE;IAE9C,KAAK,MAAMnD,IAAI,IAAIP,aAAa,EAAE;MAC9B;MACA,IAAI,CAACO,IAAI,EAAE;QACPnE,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,0CAA0C,CAAC,CAAC;QAC1D;MACJ;MAEA,MAAMqF,IAAI,GAAG/G,aAAa,CAAC2D,IAAI,EAAE,EAAE,CAAC;MACpC,IAAI,CAACoD,IAAI,EAAE;QACPvH,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,uCAAuC,CAAC,CAAC;QACvD;MACJ;MAEA,MAAMyE,IAAI,GAAIxC,IAAI,CAAuBwC,IAAI;MAC7C,IAAIA,IAAI,KAAKa,SAAS,IAAIb,IAAI,KAAK,IAAI,IAAIc,MAAM,CAACC,KAAK,CAACf,IAAI,CAAC,EAAE;QAC3D3G,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,uCAAuC,EAAE;UAAEqF;QAAK,CAAC,CAAC,CAAC;QACjE;MACJ;MAEA,IAAIZ,IAAI,IAAI,CAAC,EAAE;QACX3G,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,iCAAiC,EAAE;UAAEqF;QAAK,CAAC,CAAC,CAAC;QAC3D;MACJ;;MAEA;MACA,IAAIZ,IAAI,GAAGU,aAAa,EAAE;QACtBrH,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,oCAAoC,EAAE;UAAEqF,IAAI;UAAEvD,OAAO,EAAE1D,cAAc,CAAC+G,aAAa;QAAE,CAAC,CAAC,CAAC;QACtG;MACJ;MAEA,MAAMpC,QAAQ,GAAGvE,aAAa,CAACyD,IAAI,CAAC;MAEpC,IAAIpC,UAAU,IAAI,CAACkD,QAAQ,CAAChE,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC9CjB,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,0CAA0C,CAAC,CAAC;QAC1D;MACJ;;MAEA;MACA,IAAIlB,OAA2B;MAC/B,IAAIiE,QAAQ,CAAChE,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC/B;QACA,MAAM0G,OAAO,GAAGhH,YAAY,CAACwD,IAAI,CAAC;QAClC,IAAIwD,OAAO,KACNA,OAAO,CAAC1G,UAAU,CAAC,SAAS,CAAC,IAAI0G,OAAO,CAAC1G,UAAU,CAAC,YAAY,CAAC,IAC9D0G,OAAO,CAAC1G,UAAU,CAAC,SAAS,CAAC,IAAI0G,OAAO,CAAC1G,UAAU,CAAC,UAAU,CAAC,IAC/D0G,OAAO,CAAC1G,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE;UAClCD,OAAO,GAAG2G,OAAO;QACrB,CAAC,MAAM;UACH;UACA,IAAI;YACA,IAAK,OAAOC,IAAI,KAAK,WAAW,IAAIzD,IAAI,YAAYyD,IAAI,IACnD,OAAOC,IAAI,KAAK,WAAW,IAAI1D,IAAI,YAAY0D,IAAK,EAAE;cACvD7G,OAAO,GAAGE,GAAG,CAAC4G,eAAe,CAAC3D,IAAY,CAAC;YAC/C;UACJ,CAAC,CAAC,MAAM;YACJ;UAAA;QAER;MACJ;MAEAmD,cAAc,CAAC/B,IAAI,CAAChF,uBAAuB,CAAC4D,IAAI,EAAEnD,OAAO,EAAE2F,IAAI,EAAEY,IAAI,EAAEtC,QAAQ,CAAC,CAAC;IACrF;IAEA,IAAIqC,cAAc,CAACzD,MAAM,KAAK,CAAC,EAAE;MAC7B7D,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,oCAAoC,CAAC,CAAC;MACpD;IACJ;;IAEA;IACAI,eAAe,CAACgF,cAAc,CAAC;IAC/B9E,oBAAoB,CAAC,IAAI,CAAC;EAC9B,CAAC,EAAE,CAACT,UAAU,EAAEG,CAAC,CAAC,CAAC;EAEnB,MAAM6F,mBAAmB,GAAG,MAAAA,CAAA,KAAY;IACpC,IAAI1F,YAAY,CAACwB,MAAM,KAAK,CAAC,EAAE;IAE/BrB,oBAAoB,CAAC,KAAK,CAAC;IAC3BM,cAAc,CAACI,OAAO,GAAGK,IAAI,CAACC,GAAG,CAAC,CAAC;IACnCd,YAAY,CAAC,IAAI,CAAC;IAClBE,iBAAiB,CAAC,IAAI,CAAC;IAEvB,IAAI;MACA,MAAMoF,aAAa,GAAG3F,YAAY,CAACgC,GAAG,CAAC4D,EAAE,IAAIA,EAAE,CAAC9D,IAAI,CAAC;MACrDvB,iBAAiB,CAAC;QAAEM,OAAO,EAAE,CAAC;QAAEa,KAAK,EAAEiE,aAAa,CAACnE;MAAO,CAAC,CAAC;MAC9D,MAAMC,aAAa,GAAG,MAAMH,kBAAkB,CAACqE,aAAa,CAAC;;MAE7D;MACA,KAAK,MAAMC,EAAE,IAAI5F,YAAY,EAAE;QAC3BtB,gBAAgB,CAACkH,EAAE,CAACjH,OAAO,CAAC;MAChC;MACAsB,eAAe,CAAC,EAAE,CAAC;;MAEnB;MACA,IAAId,UAAU,IAAIsC,aAAa,CAACD,MAAM,GAAG,CAAC,EAAE;QACxC;QACAZ,oBAAoB,CAAC,CAAC;QACtBF,kBAAkB,CAACG,OAAO,GAAGQ,UAAU,CAAC,MAAM;UAC1CX,kBAAkB,CAACG,OAAO,GAAG,IAAI;UACjC,IAAI,CAACF,WAAW,CAACE,OAAO,EAAE;UAE1B,MAAMgF,YAAY,GAAGpE,aAAa,CAAC,CAAC,CAAC;UACrC,IAAI,CAACrC,WAAW,IAAIyG,YAAY,EAAE;YAC9B,IAAItG,QAAQ,EAAE;cACV;cACA;cACA;cACAA,QAAQ,CAACsG,YAAY,CAAC;YAC1B,CAAC,MAAM;cACH;cACAvG,QAAQ,GAAGuG,YAAY,CAAC;cACxB,IAAIxG,WAAW,KAAK,MAAM,EAAE;gBACxBG,MAAM,GAAG,CAAC;cACd,CAAC,MAAM,IAAIH,WAAW,KAAK,OAAO,EAAE;gBAChCI,OAAO,GAAG,CAAC;cACf;YACJ;UACJ,CAAC,MAAM,IAAIL,WAAW,EAAE;YACpB;YACA,KAAK,MAAM0C,IAAI,IAAIL,aAAa,EAAE;cAC9B,IAAI,CAAC9B,WAAW,CAACmG,GAAG,CAAChE,IAAI,CAACyB,EAAE,CAAC,EAAE;gBAC3B3D,cAAc,CAACmG,IAAI,IAAI,IAAIC,GAAG,CAACD,IAAI,CAAC,CAACE,GAAG,CAACnE,IAAI,CAACyB,EAAE,CAAC,CAAC;cACtD;YACJ;UACJ;QACJ,CAAC,EAAE,GAAG,CAAC;MACX;MAEAxC,SAAS,CAAC,CAAC;IACf,CAAC,CAAC,OAAOoB,KAAc,EAAE;MACrBxE,KAAK,CAACwE,KAAK,CAAC5D,eAAe,CAAC4D,KAAK,CAAC,IAAItC,CAAC,CAAC,mCAAmC,CAAC,CAAC;MAC7EkB,SAAS,CAAC,CAAC;IACf;EACJ,CAAC;EAED,MAAMmF,kBAAkB,GAAGA,CAAA,KAAM;IAC7BtF,oBAAoB,CAAC,CAAC;;IAEtB;IACA,KAAK,MAAMgF,EAAE,IAAI5F,YAAY,EAAE;MAC3BtB,gBAAgB,CAACkH,EAAE,CAACjH,OAAO,CAAC;IAChC;IACAsB,eAAe,CAAC,EAAE,CAAC;IACnBE,oBAAoB,CAAC,KAAK,CAAC;EAC/B,CAAC;EAED,MAAMgG,iBAAiB,GAAI5C,EAAU,IAAK;IACtC,MAAMzB,IAAI,GAAG9B,YAAY,CAACoG,IAAI,CAAER,EAAE,IAAKA,EAAE,CAACrC,EAAE,KAAKA,EAAE,CAAC;IACpD,IAAI,CAACzB,IAAI,EAAE;IACX,IAAIA,IAAI,CAACnD,OAAO,EAAE;MACdD,gBAAgB,CAACoD,IAAI,CAACnD,OAAO,CAAC;IAClC;IACA,MAAM0H,OAAO,GAAGrG,YAAY,CAAC6B,MAAM,CAAE+D,EAAE,IAAKA,EAAE,CAACrC,EAAE,KAAKA,EAAE,CAAC;IACzDtD,eAAe,CAACoG,OAAO,CAAC;IACxB,IAAIA,OAAO,CAAC7E,MAAM,KAAK,CAAC,EAAE;MACtBrB,oBAAoB,CAAC,KAAK,CAAC;IAC/B;EACJ,CAAC;;EAED;AACJ;AACA;AACA;EACI,MAAMmG,gBAAgB,GAAG,MAAAA,CAAA,KAAY;IACjC;IACA,IAAIxG,iBAAiB,EAAE;MACnBnC,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,wCAAwC,CAAC,CAAC;MACxD;IACJ;IAEA,IAAI;MACAE,oBAAoB,CAAC,IAAI,CAAC;;MAE1B;MACA,MAAMwG,MAAM,GAAG,MAAM/H,kBAAkB,CAAC,CAAC;;MAEzC;MACA;MACA,MAAMuF,MAAM,GAAG,MAAMwC,MAAM,CAACC,gBAAgB,CAAC;QACzCC,IAAI,EAAE/G,UAAU,GAAG,SAAS,GAAG,KAAK;QACpCgH,QAAQ,EAAE,IAAI;QACdC,oBAAoB,EAAE;MAC1B,CAAC,CAAC;MAEF,IAAI5C,MAAM,CAAC6C,QAAQ,EAAE;QACjB7G,oBAAoB,CAAC,KAAK,CAAC;QAC3B;MACJ;MAEA,IAAI,CAACgE,MAAM,CAAC8C,MAAM,IAAI9C,MAAM,CAAC8C,MAAM,CAACrF,MAAM,KAAK,CAAC,EAAE;QAC9CzB,oBAAoB,CAAC,KAAK,CAAC;QAC3BpC,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,uCAAuC,CAAC,CAAC;QACvD;MACJ;;MAEA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMuC,KAAwB,GAAG,EAAE;MACnC,MAAMG,MAAgB,GAAG,EAAE;;MAE3B;MACA;MACA,MAAMuE,kBAAkB,GAAG/C,MAAM,CAAC8C,MAAM,CAAC7E,GAAG,CAAC,CAAC+E,GAAG,EAAEC,KAAK,KACpDhJ,gCAAgC,CAAC+I,GAAG,EAAEC,KAAK,CAAC,CACvCC,IAAI,CAAEnF,IAAI,IAA6B;QACpC,IAAIA,IAAI,EAAE;UACN;UACA,IAAI,CAACA,IAAI,CAACoD,IAAI,IAAKpD,IAAI,CAAuBwC,IAAI,KAAKa,SAAS,EAAE;YAC9D5C,MAAM,CAACW,IAAI,CAAC,SAAS6D,GAAG,CAAC7B,IAAI,IAAI,MAAM,2CAA2C,CAAC;YACnF,OAAO,IAAI;UACf;UACA,OAAOpD,IAAI;QACf;QACA,OAAO,IAAI;MACf,CAAC,CAAC,CACDoF,KAAK,CAAE/E,KAAc,IAAK;QACvBI,MAAM,CAACW,IAAI,CAAC,SAAS6D,GAAG,CAAC7B,IAAI,IAAI,MAAM,MAAM3G,eAAe,CAAC4D,KAAK,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAC7F,OAAO,IAAI;MACf,CAAC,CACT,CAAC;MAED,MAAMgF,cAAc,GAAG,MAAMC,OAAO,CAACC,GAAG,CAACP,kBAAkB,CAAC;;MAE5D;MACA,KAAK,MAAMhF,IAAI,IAAIqF,cAAc,EAAE;QAC/B,IAAIrF,IAAI,EAAE;UACNM,KAAK,CAACc,IAAI,CAACpB,IAAI,CAAC;QACpB;MACJ;;MAEA;MACA,IAAIS,MAAM,CAACf,MAAM,GAAG,CAAC,EAAE;QACnB,MAAMgD,YAAY,GAAGjC,MAAM,CAACU,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAACf,IAAI,CAAC,IAAI,CAAC,IAAIK,MAAM,CAACf,MAAM,GAAG,CAAC,GAAG,YAAYe,MAAM,CAACf,MAAM,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;QACpH7D,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,sCAAsC,EAAE;UAAE0C,MAAM,EAAEiC;QAAa,CAAC,CAAC,CAAC;MACpF;;MAEA;MACA,IAAIpC,KAAK,CAACZ,MAAM,GAAG,CAAC,EAAE;QAClB,MAAMuD,mBAAmB,CAAC3C,KAAK,CAAC;MACpC,CAAC,MAAM;QACH;QACAzE,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,wCAAwC,CAAC,CAAC;MAC5D;IACJ,CAAC,CAAC,OAAOsC,KAAc,EAAE;MACrB,IAAI5D,eAAe,CAAC4D,KAAK,CAAC,EAAEmF,QAAQ,CAAC,sBAAsB,CAAC,IAAI/I,eAAe,CAAC4D,KAAK,CAAC,EAAEmF,QAAQ,CAAC,wCAAwC,CAAC,EAAE;QACxI,IAAI/I,eAAe,CAAC4D,KAAK,CAAC,EAAEmF,QAAQ,CAAC,wCAAwC,CAAC,EAAE;UAC5E3J,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC,MAAM;UACHlC,KAAK,CAACwE,KAAK,CAACtC,CAAC,CAAC,8CAA8C,CAAC,CAAC;QAClE;MACJ,CAAC,MAAM;QACHlC,KAAK,CAACwE,KAAK,CAAC5D,eAAe,CAAC4D,KAAK,CAAC,IAAItC,CAAC,CAAC,yCAAyC,CAAC,CAAC;MACvF;IACJ,CAAC,SAAS;MACN;MACAE,oBAAoB,CAAC,KAAK,CAAC;IAC/B;EACJ,CAAC;EAED,OAAO;IACHD,iBAAiB;IACjBE,YAAY;IACZE,iBAAiB;IACjBE,SAAS;IACTE,cAAc;IACdgG,gBAAgB;IAChBZ,mBAAmB;IACnBQ,kBAAkB;IAClBC;EACJ,CAAC;AACL,CAAC;AAED,eAAepH,kBAAkB","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","useRef","useState","useQueryClient","toast","queryKeys","prependFileToCache","removeFileFromCache","replaceFileInCache","convertDocumentPickerAssetToFile","formatFileSize","createPendingUploadFile","candidateName","candidateSize","candidateType","candidateUri","getErrorMessage","loadDocumentPicker","MIN_BANNER_MS","revokePreviewUrl","preview","startsWith","URL","revokeObjectURL","useFileUploadState","targetUserId","uploadFileMutation","defaultVisibility","selectMode","multiSelect","afterSelect","onSelect","onPicked","goBack","onClose","imagesOnly","selectedIds","setSelectedIds","t","isPickingDocument","setIsPickingDocument","pendingFiles","setPendingFiles","showUploadPreview","setShowUploadPreview","uploading","setUploading","uploadProgress","setUploadProgress","queryClient","uploadStartRef","postSelectTimerRef","endUploadTimerRef","isActiveRef","clearPostSelectTimer","current","clearTimeout","clearEndUploadTimer","endUpload","started","elapsed","Date","now","remaining","setTimeout","processFileUploads","selectedFiles","length","uploadedFiles","total","maxSize","oversizedFiles","filter","file","fileList","map","f","join","error","files","successCount","failureCount","errors","i","raw","fileName","fileSize","fileType","optimisticId","Math","random","toString","slice","push","previewUri","optimisticMetadata","localPreviewUri","optimisticFile","id","filename","contentType","chunkSize","uploadDate","toISOString","metadata","variants","result","mutateAsync","visibility","merged","originalName","sha256","mime","size","createdAt","errorMessage","success","count","errorDetails","invalidateQueries","queryKey","list","handleFileSelection","MAX_FILE_SIZE","processedFiles","name","undefined","Number","isNaN","fileUri","File","Blob","createObjectURL","handleConfirmUpload","filesToUpload","pf","fileToSelect","has","prev","Set","add","handleCancelUpload","removePendingFile","find","updated","handleFileUpload","picker","getDocumentAsync","type","multiple","copyToCacheDirectory","canceled","assets","conversionPromises","doc","index","then","catch","convertedFiles","Promise","all","includes"],"sourceRoot":"../../../../../../src","sources":["ui/screens/fileManagement/hooks/useFileUploadState.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { buildOAuthAuthorizeUrl, generateOAuthState, generatePkcePair, isIdpHubOrigin, isLoopbackOrigin, isOfficialWebOrigin, OXY_CROSS_ORIGIN_RESTORE_ATTEMPTED_KEY, OXY_SILENT_OAUTH_ATTEMPTED_KEY, persistOAuthHandshake, normalizeOAuthRedirectUri, logger } from '@oxyhq/core';
|
|
4
4
|
import { isWebBrowser } from "./isWebBrowser.js";
|
|
5
|
+
import { replaceUrlAfterOAuthReturn } from "./oauthReturn.js";
|
|
5
6
|
import { redirectToAuthorize } from "../components/oauthNavigation.js";
|
|
6
7
|
function sessionStore() {
|
|
7
8
|
return globalThis.sessionStorage;
|
|
@@ -119,7 +120,10 @@ export function consumeSilentOAuthError() {
|
|
|
119
120
|
url.searchParams.delete('error');
|
|
120
121
|
url.searchParams.delete('error_description');
|
|
121
122
|
url.searchParams.delete('state');
|
|
122
|
-
|
|
123
|
+
// Silent restore failed, but the visitor still asked for a specific page.
|
|
124
|
+
// Put them back on it rather than leaving them on the bare origin the IdP
|
|
125
|
+
// redirected to.
|
|
126
|
+
replaceUrlAfterOAuthReturn(`${url.pathname}${url.search}${url.hash}`);
|
|
123
127
|
}
|
|
124
128
|
return error;
|
|
125
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["buildOAuthAuthorizeUrl","generateOAuthState","generatePkcePair","isIdpHubOrigin","isLoopbackOrigin","isOfficialWebOrigin","OXY_CROSS_ORIGIN_RESTORE_ATTEMPTED_KEY","OXY_SILENT_OAUTH_ATTEMPTED_KEY","persistOAuthHandshake","normalizeOAuthRedirectUri","logger","isWebBrowser","redirectToAuthorize","sessionStore","globalThis","sessionStorage","isCrossOriginRestoreBlocked","store","Boolean","getItem","markCrossOriginRestoreAttempted","setItem","clearCrossOriginRestoreGuards","key","removeItem","isSilentRestoreEligibleOrigin","origin","maybeStartSilentOAuthRestore","opts","location","params","URLSearchParams","search","has","codeVerifier","codeChallenge","state","redirectUri","authorizeUrl","authorizeBaseUrl","clientId","scope","prompt","error","warn","component","consumeSilentOAuthError","history","get","replaceState","url","URL","href","searchParams","delete","pathname","hash"],"sourceRoot":"../../../../src","sources":["ui/utils/crossOriginRestore.ts"],"mappings":";;AACA,SACEA,sBAAsB,EACtBC,kBAAkB,EAClBC,gBAAgB,EAChBC,cAAc,EACdC,gBAAgB,EAChBC,mBAAmB,EACnBC,sCAAsC,EACtCC,8BAA8B,EAC9BC,qBAAqB,EACrBC,yBAAyB,EACzBC,MAAM,QACD,aAAa;AACpB,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAASC,mBAAmB,QAAQ,kCAA+B;AAEnE,SAASC,YAAYA,CAAA,EAAwB;EAC3C,OAAQC,UAAU,CAAkCC,cAAc;AACpE;;AAEA;AACA,OAAO,SAASC,2BAA2BA,CAAA,EAAY;EACrD,MAAMC,KAAK,GAAGJ,YAAY,CAAC,CAAC;EAC5B,IAAI,CAACI,KAAK,EAAE,OAAO,KAAK;EACxB,OAAOC,OAAO,CACZD,KAAK,CAACE,OAAO,
|
|
1
|
+
{"version":3,"names":["buildOAuthAuthorizeUrl","generateOAuthState","generatePkcePair","isIdpHubOrigin","isLoopbackOrigin","isOfficialWebOrigin","OXY_CROSS_ORIGIN_RESTORE_ATTEMPTED_KEY","OXY_SILENT_OAUTH_ATTEMPTED_KEY","persistOAuthHandshake","normalizeOAuthRedirectUri","logger","isWebBrowser","replaceUrlAfterOAuthReturn","redirectToAuthorize","sessionStore","globalThis","sessionStorage","isCrossOriginRestoreBlocked","store","Boolean","getItem","markCrossOriginRestoreAttempted","setItem","clearCrossOriginRestoreGuards","key","removeItem","isSilentRestoreEligibleOrigin","origin","maybeStartSilentOAuthRestore","opts","location","params","URLSearchParams","search","has","codeVerifier","codeChallenge","state","redirectUri","authorizeUrl","authorizeBaseUrl","clientId","scope","prompt","error","warn","component","consumeSilentOAuthError","history","get","replaceState","url","URL","href","searchParams","delete","pathname","hash"],"sourceRoot":"../../../../src","sources":["ui/utils/crossOriginRestore.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { clearOAuthHandshake, logger, normalizeOAuthRedirectUri, readOAuthHandshake } from '@oxyhq/core';
|
|
3
|
+
import { clearOAuthHandshake, consumeOAuthReturnPath, logger, normalizeOAuthRedirectUri, readOAuthHandshake } from '@oxyhq/core';
|
|
4
4
|
import { isWebBrowser } from "./isWebBrowser.js";
|
|
5
5
|
/**
|
|
6
6
|
* When the RP lands with `?code=` after password sign-in at auth.oxy.so, exchange
|
|
@@ -32,8 +32,10 @@ export async function tryCompleteOAuthReturn(opts) {
|
|
|
32
32
|
logger.warn('OAuth return ignored: missing or mismatched handshake', {
|
|
33
33
|
component: 'oauthReturn'
|
|
34
34
|
});
|
|
35
|
-
clearOAuthHandshake
|
|
35
|
+
// Consume the return path before clearing the handshake — clearOAuthHandshake
|
|
36
|
+
// drops the persisted path along with the PKCE keys.
|
|
36
37
|
stripOAuthParamsFromUrl();
|
|
38
|
+
clearOAuthHandshake();
|
|
37
39
|
return false;
|
|
38
40
|
}
|
|
39
41
|
const redirectUri = normalizeOAuthRedirectUri(opts.authRedirectUri ?? location.origin);
|
|
@@ -45,8 +47,9 @@ export async function tryCompleteOAuthReturn(opts) {
|
|
|
45
47
|
codeVerifier: handshake.codeVerifier
|
|
46
48
|
});
|
|
47
49
|
// Strip OAuth params before commit so a stale `?code=` cannot re-enter the exchange loop.
|
|
48
|
-
clearOAuthHandshake
|
|
50
|
+
// Read the return path first — clearOAuthHandshake drops it with the PKCE keys.
|
|
49
51
|
stripOAuthParamsFromUrl();
|
|
52
|
+
clearOAuthHandshake();
|
|
50
53
|
await opts.commitSession({
|
|
51
54
|
sessionId: result.sessionId,
|
|
52
55
|
accessToken: result.accessToken,
|
|
@@ -61,11 +64,53 @@ export async function tryCompleteOAuthReturn(opts) {
|
|
|
61
64
|
logger.warn('OAuth return exchange failed', {
|
|
62
65
|
component: 'oauthReturn'
|
|
63
66
|
}, error);
|
|
64
|
-
clearOAuthHandshake();
|
|
65
67
|
stripOAuthParamsFromUrl();
|
|
68
|
+
clearOAuthHandshake();
|
|
66
69
|
return false;
|
|
67
70
|
}
|
|
68
71
|
}
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* Rewrite the address bar after an authorize round trip, and tell the router.
|
|
75
|
+
*
|
|
76
|
+
* Prefers the page the visit started on (see `persistOAuthReturnPath`) over the
|
|
77
|
+
* bare origin the IdP redirected to, falling back to `fallbackUrl` when nothing
|
|
78
|
+
* was recorded.
|
|
79
|
+
*
|
|
80
|
+
* The `popstate` dispatch is the load-bearing part. `history.replaceState`
|
|
81
|
+
* fires no event, and cold boot runs *inside* the mounted app — by the time
|
|
82
|
+
* this executes, a history-based router (React Router, Vue Router, …) has
|
|
83
|
+
* already read `location` and rendered the route for `/`. Without a
|
|
84
|
+
* notification the address bar would show the restored deep link while the page
|
|
85
|
+
* still displayed the home page. `popstate` is the event the History API
|
|
86
|
+
* defines for exactly this, and it is what those routers subscribe to.
|
|
87
|
+
*
|
|
88
|
+
* Only dispatched when the URL actually changed, so the common no-op case does
|
|
89
|
+
* not push a spurious event at every listener on the page.
|
|
90
|
+
*/
|
|
91
|
+
export function replaceUrlAfterOAuthReturn(fallbackUrl) {
|
|
92
|
+
const location = globalThis.location;
|
|
93
|
+
const history = globalThis.history;
|
|
94
|
+
if (!location || !history?.replaceState) return;
|
|
95
|
+
const current = `${location.pathname}${location.search}${location.hash}`;
|
|
96
|
+
const target = consumeOAuthReturnPath() ?? fallbackUrl;
|
|
97
|
+
history.replaceState(history.state, '', target);
|
|
98
|
+
if (target === current) return;
|
|
99
|
+
const dispatch = globalThis.dispatchEvent;
|
|
100
|
+
if (typeof dispatch !== 'function') return;
|
|
101
|
+
try {
|
|
102
|
+
// `PopStateEvent` is web-only; plain `Event` is a good enough carrier for
|
|
103
|
+
// any host that lacks it (routers read `location`, not `event.state`).
|
|
104
|
+
const event = typeof PopStateEvent === 'function' ? new PopStateEvent('popstate', {
|
|
105
|
+
state: history.state
|
|
106
|
+
}) : new Event('popstate');
|
|
107
|
+
dispatch.call(globalThis, event);
|
|
108
|
+
} catch (error) {
|
|
109
|
+
logger.warn('Could not notify router of restored URL', {
|
|
110
|
+
component: 'oauthReturn'
|
|
111
|
+
}, error);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
69
114
|
function stripOAuthParamsFromUrl() {
|
|
70
115
|
const location = globalThis.location;
|
|
71
116
|
const history = globalThis.history;
|
|
@@ -76,7 +121,7 @@ function stripOAuthParamsFromUrl() {
|
|
|
76
121
|
url.searchParams.delete('error');
|
|
77
122
|
url.searchParams.delete('error_description');
|
|
78
123
|
url.searchParams.delete('hub_sync');
|
|
79
|
-
|
|
124
|
+
replaceUrlAfterOAuthReturn(`${url.pathname}${url.search}${url.hash}`);
|
|
80
125
|
}
|
|
81
126
|
|
|
82
127
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["clearOAuthHandshake","logger","normalizeOAuthRedirectUri","readOAuthHandshake","isWebBrowser","tryCompleteOAuthReturn","opts","location","globalThis","params","URLSearchParams","search","code","get","oauthError","stripOAuthParamsFromUrl","clientId","warn","component","returnedState","handshake","state","redirectUri","authRedirectUri","origin","result","oxyServices","exchangeOAuthCode","codeVerifier","commitSession","sessionId","accessToken","deviceId","deviceSecret","userId","user","id","expiresAt","error","history","replaceState","
|
|
1
|
+
{"version":3,"names":["clearOAuthHandshake","consumeOAuthReturnPath","logger","normalizeOAuthRedirectUri","readOAuthHandshake","isWebBrowser","tryCompleteOAuthReturn","opts","location","globalThis","params","URLSearchParams","search","code","get","oauthError","stripOAuthParamsFromUrl","clientId","warn","component","returnedState","handshake","state","redirectUri","authRedirectUri","origin","result","oxyServices","exchangeOAuthCode","codeVerifier","commitSession","sessionId","accessToken","deviceId","deviceSecret","userId","user","id","expiresAt","error","replaceUrlAfterOAuthReturn","fallbackUrl","history","replaceState","current","pathname","hash","target","dispatch","dispatchEvent","event","PopStateEvent","Event","call","url","URL","href","searchParams","delete","consumeHubSyncFailure"],"sourceRoot":"../../../../src","sources":["ui/utils/oauthReturn.ts"],"mappings":";;AACA,SACEA,mBAAmB,EACnBC,sBAAsB,EACtBC,MAAM,EACNC,yBAAyB,EACzBC,kBAAkB,QACb,aAAa;AACpB,SAASC,YAAY,QAAQ,mBAAgB;AAY7C;AACA;AACA;AACA;AACA,OAAO,eAAeC,sBAAsBA,CAACC,IAK5C,EAAoB;EACnB,IAAI,CAACF,YAAY,CAAC,CAAC,EAAE,OAAO,KAAK;EACjC,MAAMG,QAAQ,GAAIC,UAAU,CAA6BD,QAAQ;EACjE,IAAI,CAACA,QAAQ,EAAE,OAAO,KAAK;EAE3B,MAAME,MAAM,GAAG,IAAIC,eAAe,CAACH,QAAQ,CAACI,MAAM,CAAC;EACnD,MAAMC,IAAI,GAAGH,MAAM,CAACI,GAAG,CAAC,MAAM,CAAC;EAC/B,MAAMC,UAAU,GAAGL,MAAM,CAACI,GAAG,CAAC,OAAO,CAAC;EACtC,IAAIC,UAAU,EAAE;IACdC,uBAAuB,CAAC,CAAC;IACzB,OAAO,KAAK;EACd;EACA,IAAI,CAACH,IAAI,EAAE,OAAO,KAAK;EAEvB,MAAMI,QAAQ,GAAGV,IAAI,CAACU,QAAQ;EAC9B,IAAI,CAACA,QAAQ,EAAE;IACbf,MAAM,CAACgB,IAAI,CAAC,wCAAwC,EAAE;MAAEC,SAAS,EAAE;IAAc,CAAC,CAAC;IACnFH,uBAAuB,CAAC,CAAC;IACzB,OAAO,KAAK;EACd;EAEA,MAAMI,aAAa,GAAGV,MAAM,CAACI,GAAG,CAAC,OAAO,CAAC;EACzC,MAAMO,SAAS,GAAGjB,kBAAkB,CAAC,CAAC;EACtC,IAAI,CAACiB,SAAS,IAAI,CAACD,aAAa,IAAIC,SAAS,CAACC,KAAK,KAAKF,aAAa,EAAE;IACrElB,MAAM,CAACgB,IAAI,CAAC,uDAAuD,EAAE;MACnEC,SAAS,EAAE;IACb,CAAC,CAAC;IACF;IACA;IACAH,uBAAuB,CAAC,CAAC;IACzBhB,mBAAmB,CAAC,CAAC;IACrB,OAAO,KAAK;EACd;EAEA,MAAMuB,WAAW,GAAGpB,yBAAyB,CAC3CI,IAAI,CAACiB,eAAe,IAAIhB,QAAQ,CAACiB,MACnC,CAAC;EAED,IAAI;IACF,MAAMC,MAAM,GAAG,MAAMnB,IAAI,CAACoB,WAAW,CAACC,iBAAiB,CAAC;MACtDf,IAAI;MACJI,QAAQ;MACRM,WAAW;MACXM,YAAY,EAAER,SAAS,CAACQ;IAC1B,CAAC,CAAC;IACF;IACA;IACAb,uBAAuB,CAAC,CAAC;IACzBhB,mBAAmB,CAAC,CAAC;IACrB,MAAMO,IAAI,CAACuB,aAAa,CAAC;MACvBC,SAAS,EAAEL,MAAM,CAACK,SAAS;MAC3BC,WAAW,EAAEN,MAAM,CAACM,WAAW;MAC/BC,QAAQ,EAAEP,MAAM,CAACO,QAAQ;MACzBC,YAAY,EAAER,MAAM,CAACQ,YAAY;MACjCC,MAAM,EAAET,MAAM,CAACU,IAAI,CAACC,EAAE;MACtBC,SAAS,EAAEZ,MAAM,CAACY,SAAS;MAC3BF,IAAI,EAAEV,MAAM,CAACU;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACb,CAAC,CAAC,OAAOG,KAAK,EAAE;IACdrC,MAAM,CAACgB,IAAI,CAAC,8BAA8B,EAAE;MAAEC,SAAS,EAAE;IAAc,CAAC,EAAEoB,KAAK,CAAC;IAChFvB,uBAAuB,CAAC,CAAC;IACzBhB,mBAAmB,CAAC,CAAC;IACrB,OAAO,KAAK;EACd;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASwC,0BAA0BA,CAACC,WAAmB,EAAQ;EACpE,MAAMjC,QAAQ,GAAIC,UAAU,CAA6BD,QAAQ;EACjE,MAAMkC,OAAO,GAAIjC,UAAU,CAA2BiC,OAAO;EAC7D,IAAI,CAAClC,QAAQ,IAAI,CAACkC,OAAO,EAAEC,YAAY,EAAE;EAEzC,MAAMC,OAAO,GAAG,GAAGpC,QAAQ,CAACqC,QAAQ,GAAGrC,QAAQ,CAACI,MAAM,GAAGJ,QAAQ,CAACsC,IAAI,EAAE;EACxE,MAAMC,MAAM,GAAG9C,sBAAsB,CAAC,CAAC,IAAIwC,WAAW;EACtDC,OAAO,CAACC,YAAY,CAACD,OAAO,CAACpB,KAAK,EAAE,EAAE,EAAEyB,MAAM,CAAC;EAC/C,IAAIA,MAAM,KAAKH,OAAO,EAAE;EAExB,MAAMI,QAAQ,GAAIvC,UAAU,CAAmDwC,aAAa;EAC5F,IAAI,OAAOD,QAAQ,KAAK,UAAU,EAAE;EACpC,IAAI;IACF;IACA;IACA,MAAME,KAAK,GACT,OAAOC,aAAa,KAAK,UAAU,GAC/B,IAAIA,aAAa,CAAC,UAAU,EAAE;MAAE7B,KAAK,EAAEoB,OAAO,CAACpB;IAAM,CAAC,CAAC,GACvD,IAAI8B,KAAK,CAAC,UAAU,CAAC;IAC3BJ,QAAQ,CAACK,IAAI,CAAC5C,UAAU,EAAEyC,KAAK,CAAC;EAClC,CAAC,CAAC,OAAOX,KAAK,EAAE;IACdrC,MAAM,CAACgB,IAAI,CAAC,yCAAyC,EAAE;MAAEC,SAAS,EAAE;IAAc,CAAC,EAAEoB,KAAK,CAAC;EAC7F;AACF;AAEA,SAASvB,uBAAuBA,CAAA,EAAS;EACvC,MAAMR,QAAQ,GAAIC,UAAU,CAAgDD,QAAQ;EACpF,MAAMkC,OAAO,GAAIjC,UAAU,CAA2BiC,OAAO;EAC7D,IAAI,CAAClC,QAAQ,IAAI,CAACkC,OAAO,EAAEC,YAAY,EAAE;EACzC,MAAMW,GAAG,GAAG,IAAIC,GAAG,CAAC/C,QAAQ,CAACgD,IAAI,CAAC;EAClCF,GAAG,CAACG,YAAY,CAACC,MAAM,CAAC,MAAM,CAAC;EAC/BJ,GAAG,CAACG,YAAY,CAACC,MAAM,CAAC,OAAO,CAAC;EAChCJ,GAAG,CAACG,YAAY,CAACC,MAAM,CAAC,OAAO,CAAC;EAChCJ,GAAG,CAACG,YAAY,CAACC,MAAM,CAAC,mBAAmB,CAAC;EAC5CJ,GAAG,CAACG,YAAY,CAACC,MAAM,CAAC,UAAU,CAAC;EACnClB,0BAA0B,CAAC,GAAGc,GAAG,CAACT,QAAQ,GAAGS,GAAG,CAAC1C,MAAM,GAAG0C,GAAG,CAACR,IAAI,EAAE,CAAC;AACvE;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASa,qBAAqBA,CAAA,EAAY;EAC/C,IAAI,CAACtD,YAAY,CAAC,CAAC,EAAE,OAAO,KAAK;EACjC,MAAMG,QAAQ,GAAIC,UAAU,CAAgDD,QAAQ;EACpF,MAAMkC,OAAO,GAAIjC,UAAU,CAA2BiC,OAAO;EAC7D,IAAI,CAAClC,QAAQ,EAAE,OAAO,KAAK;EAE3B,MAAME,MAAM,GAAG,IAAIC,eAAe,CAACH,QAAQ,CAACI,MAAM,CAAC;EACnD,IAAIF,MAAM,CAACI,GAAG,CAAC,UAAU,CAAC,KAAK,QAAQ,EAAE,OAAO,KAAK;EAErDZ,MAAM,CAACgB,IAAI,CAAC,yDAAyD,EAAE;IACrEC,SAAS,EAAE;EACb,CAAC,CAAC;EAEF,IAAIuB,OAAO,EAAEC,YAAY,EAAE;IACzB,MAAMW,GAAG,GAAG,IAAIC,GAAG,CAAC/C,QAAQ,CAACgD,IAAI,CAAC;IAClCF,GAAG,CAACG,YAAY,CAACC,MAAM,CAAC,UAAU,CAAC;IACnChB,OAAO,CAACC,YAAY,CAACD,OAAO,CAACpB,KAAK,EAAE,EAAE,EAAE,GAAGgC,GAAG,CAACT,QAAQ,GAAGS,GAAG,CAAC1C,MAAM,GAAG0C,GAAG,CAACR,IAAI,EAAE,CAAC;EACpF;EACA,OAAO,IAAI;AACb","ignoreList":[]}
|
|
@@ -21,6 +21,13 @@ export interface OpenAuthorizeResult {
|
|
|
21
21
|
* Web: hand the TOP-LEVEL document to the OAuth authorize URL (a full-page
|
|
22
22
|
* redirect, not a popup) so the RP returns to its registered `redirect_uri`.
|
|
23
23
|
* No-op where `location` is unavailable (SSR / non-browser hosts).
|
|
24
|
+
*
|
|
25
|
+
* Records the current page first. `redirect_uri` is a registered apex origin
|
|
26
|
+
* (see `normalizeOAuthRedirectUri`), so the IdP always returns the tab to `/`,
|
|
27
|
+
* and the return handlers restore this path. Doing it here rather than at each
|
|
28
|
+
* call site is deliberate: every web authorize redirect — silent restore,
|
|
29
|
+
* interactive sign-in, the passkey hub — funnels through this function, so a
|
|
30
|
+
* new flow cannot forget to preserve the page the visitor came from.
|
|
24
31
|
*/
|
|
25
32
|
export declare function redirectToAuthorize(url: string): void;
|
|
26
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthNavigation.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/oauthNavigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAChC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED
|
|
1
|
+
{"version":3,"file":"oauthNavigation.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/oauthNavigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAChC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKrD;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC,CAgC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiRlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAQlF,OAAO,EAEH,KAAK,iBAAiB,EAQzB,MAAM,WAAW,CAAC;AAEnB,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAsBD,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,cAAc,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACnD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,iLAehC,wBAAwB,KAAG,
|
|
1
|
+
{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAQlF,OAAO,EAEH,KAAK,iBAAiB,EAQzB,MAAM,WAAW,CAAC;AAEnB,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAsBD,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,cAAc,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACnD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,iLAehC,wBAAwB,KAAG,wBA8b7B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossOriginRestore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/crossOriginRestore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"crossOriginRestore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/crossOriginRestore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAsB/C,8EAA8E;AAC9E,wBAAgB,2BAA2B,IAAI,OAAO,CAOrD;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,IAAI,IAAI,CAKtD;AAED,qEAAqE;AACrE,wBAAgB,6BAA6B,IAAI,IAAI,CAMpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAIrE;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAiDlB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,gBAAgB,GAAG,kBAAkB,GAAG,IAAI,CAyBtF"}
|
|
@@ -22,6 +22,25 @@ export declare function tryCompleteOAuthReturn(opts: {
|
|
|
22
22
|
authRedirectUri?: string;
|
|
23
23
|
commitSession: (input: OAuthReturnCommitInput) => Promise<void>;
|
|
24
24
|
}): Promise<boolean>;
|
|
25
|
+
/**
|
|
26
|
+
* Rewrite the address bar after an authorize round trip, and tell the router.
|
|
27
|
+
*
|
|
28
|
+
* Prefers the page the visit started on (see `persistOAuthReturnPath`) over the
|
|
29
|
+
* bare origin the IdP redirected to, falling back to `fallbackUrl` when nothing
|
|
30
|
+
* was recorded.
|
|
31
|
+
*
|
|
32
|
+
* The `popstate` dispatch is the load-bearing part. `history.replaceState`
|
|
33
|
+
* fires no event, and cold boot runs *inside* the mounted app — by the time
|
|
34
|
+
* this executes, a history-based router (React Router, Vue Router, …) has
|
|
35
|
+
* already read `location` and rendered the route for `/`. Without a
|
|
36
|
+
* notification the address bar would show the restored deep link while the page
|
|
37
|
+
* still displayed the home page. `popstate` is the event the History API
|
|
38
|
+
* defines for exactly this, and it is what those routers subscribe to.
|
|
39
|
+
*
|
|
40
|
+
* Only dispatched when the URL actually changed, so the common no-op case does
|
|
41
|
+
* not push a spurious event at every listener on the page.
|
|
42
|
+
*/
|
|
43
|
+
export declare function replaceUrlAfterOAuthReturn(fallbackUrl: string): void;
|
|
25
44
|
/**
|
|
26
45
|
* When auth.oxy.so hub-sync redeem fails, the IdP redirects back with
|
|
27
46
|
* `?hub_sync=failed`. Strip the param and log so cold boot can continue
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthReturn.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/oauthReturn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"oauthReturn.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/oauthReturn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAU/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE,GAAG,OAAO,CAAC,OAAO,CAAC,CAiEnB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAuBpE;AAeD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAmB/C"}
|
|
@@ -21,6 +21,13 @@ export interface OpenAuthorizeResult {
|
|
|
21
21
|
* Web: hand the TOP-LEVEL document to the OAuth authorize URL (a full-page
|
|
22
22
|
* redirect, not a popup) so the RP returns to its registered `redirect_uri`.
|
|
23
23
|
* No-op where `location` is unavailable (SSR / non-browser hosts).
|
|
24
|
+
*
|
|
25
|
+
* Records the current page first. `redirect_uri` is a registered apex origin
|
|
26
|
+
* (see `normalizeOAuthRedirectUri`), so the IdP always returns the tab to `/`,
|
|
27
|
+
* and the return handlers restore this path. Doing it here rather than at each
|
|
28
|
+
* call site is deliberate: every web authorize redirect — silent restore,
|
|
29
|
+
* interactive sign-in, the passkey hub — funnels through this function, so a
|
|
30
|
+
* new flow cannot forget to preserve the page the visitor came from.
|
|
24
31
|
*/
|
|
25
32
|
export declare function redirectToAuthorize(url: string): void;
|
|
26
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthNavigation.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/oauthNavigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAChC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED
|
|
1
|
+
{"version":3,"file":"oauthNavigation.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/oauthNavigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAChC;;;;;OAKG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKrD;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC,CAgC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAiF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAiF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiRlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iDAA8C,CAAC;AAQlF,OAAO,EAEH,KAAK,iBAAiB,EAQzB,MAAM,cAAW,CAAC;AAEnB,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAsBD,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,cAAc,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACnD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,iLAehC,wBAAwB,KAAG,
|
|
1
|
+
{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iDAA8C,CAAC;AAQlF,OAAO,EAEH,KAAK,iBAAiB,EAQzB,MAAM,cAAW,CAAC;AAEnB,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAsBD,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,cAAc,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACnD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,iLAehC,wBAAwB,KAAG,wBA8b7B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossOriginRestore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/crossOriginRestore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"crossOriginRestore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/crossOriginRestore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAsB/C,8EAA8E;AAC9E,wBAAgB,2BAA2B,IAAI,OAAO,CAOrD;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,IAAI,IAAI,CAKtD;AAED,qEAAqE;AACrE,wBAAgB,6BAA6B,IAAI,IAAI,CAMpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAIrE;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAiDlB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,gBAAgB,GAAG,kBAAkB,GAAG,IAAI,CAyBtF"}
|
|
@@ -22,6 +22,25 @@ export declare function tryCompleteOAuthReturn(opts: {
|
|
|
22
22
|
authRedirectUri?: string;
|
|
23
23
|
commitSession: (input: OAuthReturnCommitInput) => Promise<void>;
|
|
24
24
|
}): Promise<boolean>;
|
|
25
|
+
/**
|
|
26
|
+
* Rewrite the address bar after an authorize round trip, and tell the router.
|
|
27
|
+
*
|
|
28
|
+
* Prefers the page the visit started on (see `persistOAuthReturnPath`) over the
|
|
29
|
+
* bare origin the IdP redirected to, falling back to `fallbackUrl` when nothing
|
|
30
|
+
* was recorded.
|
|
31
|
+
*
|
|
32
|
+
* The `popstate` dispatch is the load-bearing part. `history.replaceState`
|
|
33
|
+
* fires no event, and cold boot runs *inside* the mounted app — by the time
|
|
34
|
+
* this executes, a history-based router (React Router, Vue Router, …) has
|
|
35
|
+
* already read `location` and rendered the route for `/`. Without a
|
|
36
|
+
* notification the address bar would show the restored deep link while the page
|
|
37
|
+
* still displayed the home page. `popstate` is the event the History API
|
|
38
|
+
* defines for exactly this, and it is what those routers subscribe to.
|
|
39
|
+
*
|
|
40
|
+
* Only dispatched when the URL actually changed, so the common no-op case does
|
|
41
|
+
* not push a spurious event at every listener on the page.
|
|
42
|
+
*/
|
|
43
|
+
export declare function replaceUrlAfterOAuthReturn(fallbackUrl: string): void;
|
|
25
44
|
/**
|
|
26
45
|
* When auth.oxy.so hub-sync redeem fails, the IdP redirects back with
|
|
27
46
|
* `?hub_sync=failed`. Strip the param and log so cold boot can continue
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthReturn.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/oauthReturn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"oauthReturn.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/oauthReturn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAU/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE,GAAG,OAAO,CAAC,OAAO,CAAC,CAiEnB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAuBpE;AAeD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAmB/C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "22.12.
|
|
3
|
+
"version": "22.12.5",
|
|
4
4
|
"description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
},
|
|
128
128
|
"dependencies": {
|
|
129
129
|
"@oxyhq/contracts": "0.17.0",
|
|
130
|
-
"@oxyhq/core": "^12.10.
|
|
130
|
+
"@oxyhq/core": "^12.10.6",
|
|
131
131
|
"@simplewebauthn/browser": "^13.3.0",
|
|
132
132
|
"color": "^4.2.3"
|
|
133
133
|
},
|
|
@@ -136,7 +136,7 @@
|
|
|
136
136
|
"@commitlint/cli": "^17.6.5",
|
|
137
137
|
"@commitlint/config-conventional": "^17.6.5",
|
|
138
138
|
"@expo/vector-icons": "^15.0.3",
|
|
139
|
-
"@oxyhq/core": "12.10.
|
|
139
|
+
"@oxyhq/core": "12.10.6",
|
|
140
140
|
"@react-native-async-storage/async-storage": "^2.0.0",
|
|
141
141
|
"@react-native-community/netinfo": "^11.4.1",
|
|
142
142
|
"@react-native/babel-preset": "^0.86.0",
|
|
@@ -176,8 +176,8 @@
|
|
|
176
176
|
},
|
|
177
177
|
"peerDependencies": {
|
|
178
178
|
"@expo/vector-icons": "^15.0.3",
|
|
179
|
-
"@oxyhq/bloom": "^0.50.
|
|
180
|
-
"@oxyhq/core": "^12.10.
|
|
179
|
+
"@oxyhq/bloom": "^0.50.2",
|
|
180
|
+
"@oxyhq/core": "^12.10.6",
|
|
181
181
|
"@react-native-async-storage/async-storage": "^2.0.0",
|
|
182
182
|
"@react-native-community/netinfo": "^11.4.1",
|
|
183
183
|
"@tanstack/query-async-storage-persister": "^5.101",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
import { Linking } from 'react-native';
|
|
12
|
-
import { logger } from '@oxyhq/core';
|
|
12
|
+
import { logger, persistOAuthReturnPath } from '@oxyhq/core';
|
|
13
13
|
|
|
14
14
|
/** Minimal shape of the optional `expo-web-browser` auth-session result. */
|
|
15
15
|
interface WebBrowserAuthResult {
|
|
@@ -37,9 +37,19 @@ export interface OpenAuthorizeResult {
|
|
|
37
37
|
* Web: hand the TOP-LEVEL document to the OAuth authorize URL (a full-page
|
|
38
38
|
* redirect, not a popup) so the RP returns to its registered `redirect_uri`.
|
|
39
39
|
* No-op where `location` is unavailable (SSR / non-browser hosts).
|
|
40
|
+
*
|
|
41
|
+
* Records the current page first. `redirect_uri` is a registered apex origin
|
|
42
|
+
* (see `normalizeOAuthRedirectUri`), so the IdP always returns the tab to `/`,
|
|
43
|
+
* and the return handlers restore this path. Doing it here rather than at each
|
|
44
|
+
* call site is deliberate: every web authorize redirect — silent restore,
|
|
45
|
+
* interactive sign-in, the passkey hub — funnels through this function, so a
|
|
46
|
+
* new flow cannot forget to preserve the page the visitor came from.
|
|
40
47
|
*/
|
|
41
48
|
export function redirectToAuthorize(url: string): void {
|
|
42
|
-
(globalThis as { location?: Location }).location
|
|
49
|
+
const location = (globalThis as { location?: Location }).location;
|
|
50
|
+
if (!location) return;
|
|
51
|
+
persistOAuthReturnPath(`${location.pathname}${location.search}${location.hash}`);
|
|
52
|
+
location.assign(url);
|
|
43
53
|
}
|
|
44
54
|
|
|
45
55
|
/**
|
|
@@ -118,8 +118,10 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
|
|
|
118
118
|
const [isCreating, setIsCreating] = useState(false);
|
|
119
119
|
|
|
120
120
|
const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
121
|
+
const usernameCheckSeqRef = useRef(0);
|
|
121
122
|
|
|
122
123
|
useEffect(() => () => {
|
|
124
|
+
usernameCheckSeqRef.current += 1;
|
|
123
125
|
if (debounceTimerRef.current) {
|
|
124
126
|
clearTimeout(debounceTimerRef.current);
|
|
125
127
|
}
|
|
@@ -152,9 +154,11 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
|
|
|
152
154
|
setUsernameStatus('checking');
|
|
153
155
|
setUsernameMessage('');
|
|
154
156
|
|
|
157
|
+
const seq = ++usernameCheckSeqRef.current;
|
|
155
158
|
debounceTimerRef.current = setTimeout(async () => {
|
|
156
159
|
try {
|
|
157
160
|
const result = await oxyServices.checkUsernameAvailability(value);
|
|
161
|
+
if (seq !== usernameCheckSeqRef.current) return;
|
|
158
162
|
setUsernameStatus(result.available ? 'available' : 'taken');
|
|
159
163
|
setUsernameMessage(
|
|
160
164
|
result.message
|
|
@@ -163,6 +167,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
|
|
|
163
167
|
: (t('accounts.create.username.taken') || 'Username is taken')),
|
|
164
168
|
);
|
|
165
169
|
} catch {
|
|
170
|
+
if (seq !== usernameCheckSeqRef.current) return;
|
|
166
171
|
setUsernameStatus('idle');
|
|
167
172
|
setUsernameMessage(t('accounts.create.username.checkFailed') || 'Could not check availability');
|
|
168
173
|
}
|
|
@@ -115,6 +115,7 @@ export const useFileUploadState = ({
|
|
|
115
115
|
const queryClient = useQueryClient();
|
|
116
116
|
const uploadStartRef = useRef<number | null>(null);
|
|
117
117
|
const postSelectTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
118
|
+
const endUploadTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
118
119
|
const isActiveRef = useRef(true);
|
|
119
120
|
|
|
120
121
|
const clearPostSelectTimer = useCallback(() => {
|
|
@@ -124,23 +125,34 @@ export const useFileUploadState = ({
|
|
|
124
125
|
}
|
|
125
126
|
}, []);
|
|
126
127
|
|
|
128
|
+
const clearEndUploadTimer = useCallback(() => {
|
|
129
|
+
if (endUploadTimerRef.current) {
|
|
130
|
+
clearTimeout(endUploadTimerRef.current);
|
|
131
|
+
endUploadTimerRef.current = null;
|
|
132
|
+
}
|
|
133
|
+
}, []);
|
|
134
|
+
|
|
127
135
|
useEffect(() => {
|
|
128
136
|
isActiveRef.current = true;
|
|
129
137
|
return () => {
|
|
130
138
|
isActiveRef.current = false;
|
|
131
139
|
clearPostSelectTimer();
|
|
140
|
+
clearEndUploadTimer();
|
|
132
141
|
};
|
|
133
|
-
}, [clearPostSelectTimer]);
|
|
142
|
+
}, [clearPostSelectTimer, clearEndUploadTimer]);
|
|
134
143
|
|
|
135
144
|
const endUpload = useCallback(() => {
|
|
136
145
|
const started = uploadStartRef.current;
|
|
137
146
|
const elapsed = started ? Date.now() - started : MIN_BANNER_MS;
|
|
138
147
|
const remaining = elapsed < MIN_BANNER_MS ? MIN_BANNER_MS - elapsed : 0;
|
|
139
|
-
|
|
148
|
+
clearEndUploadTimer();
|
|
149
|
+
endUploadTimerRef.current = setTimeout(() => {
|
|
150
|
+
endUploadTimerRef.current = null;
|
|
151
|
+
if (!isActiveRef.current) return;
|
|
140
152
|
setUploading(false);
|
|
141
153
|
uploadStartRef.current = null;
|
|
142
154
|
}, remaining);
|
|
143
|
-
}, []);
|
|
155
|
+
}, [clearEndUploadTimer]);
|
|
144
156
|
|
|
145
157
|
const processFileUploads = async (selectedFiles: UploadCandidate[]): Promise<FileMetadata[]> => {
|
|
146
158
|
if (selectedFiles.length === 0) return [];
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
logger,
|
|
14
14
|
} from '@oxyhq/core';
|
|
15
15
|
import { isWebBrowser } from './isWebBrowser';
|
|
16
|
+
import { replaceUrlAfterOAuthReturn } from './oauthReturn';
|
|
16
17
|
import { redirectToAuthorize } from '../components/oauthNavigation';
|
|
17
18
|
|
|
18
19
|
function sessionStore(): Storage | undefined {
|
|
@@ -157,7 +158,10 @@ export function consumeSilentOAuthError(): 'login_required' | 'consent_required'
|
|
|
157
158
|
url.searchParams.delete('error');
|
|
158
159
|
url.searchParams.delete('error_description');
|
|
159
160
|
url.searchParams.delete('state');
|
|
160
|
-
|
|
161
|
+
// Silent restore failed, but the visitor still asked for a specific page.
|
|
162
|
+
// Put them back on it rather than leaving them on the bare origin the IdP
|
|
163
|
+
// redirected to.
|
|
164
|
+
replaceUrlAfterOAuthReturn(`${url.pathname}${url.search}${url.hash}`);
|
|
161
165
|
}
|
|
162
166
|
return error;
|
|
163
167
|
}
|