@@ -40,10 +40,13 @@ export const LoginDialog = ({ isOpen, setIsOpen }: LoginDialogProps) => {
4040 revalidateToken ( ) ;
4141 } , [ isOpen ] ) ;
4242
43- const getAdminToken = ( credentials : $LoginCredentials ) : ResultAsync < { accessToken : string } , string > => {
43+ const getAdminToken = (
44+ credentials : $LoginCredentials ,
45+ baseUrl : string
46+ ) : ResultAsync < { accessToken : string } , string > => {
4447 return asyncResultify ( async ( ) => {
4548 try {
46- const response = await axios . post ( `${ apiBaseUrl } /v1/auth/login` , credentials , {
49+ const response = await axios . post ( `${ baseUrl } /v1/auth/login` , credentials , {
4750 headers : {
4851 Accept : 'application/json'
4952 } ,
@@ -60,10 +63,10 @@ export const LoginDialog = ({ isOpen, setIsOpen }: LoginDialogProps) => {
6063 } ) ;
6164 } ;
6265
63- const getLimitedToken = ( adminToken : string ) : ResultAsync < { accessToken : string } , string > => {
66+ const getLimitedToken = ( adminToken : string , baseUrl : string ) : ResultAsync < { accessToken : string } , string > => {
6467 return asyncResultify ( async ( ) => {
6568 try {
66- const response = await axios . get ( `${ apiBaseUrl } /v1/auth/create-instrument-token` , {
69+ const response = await axios . get ( `${ baseUrl } /v1/auth/create-instrument-token` , {
6770 headers : {
6871 Accept : 'application/json' ,
6972 Authorization : `Bearer ${ adminToken } `
@@ -83,7 +86,7 @@ export const LoginDialog = ({ isOpen, setIsOpen }: LoginDialogProps) => {
8386
8487 const handleSubmit = async ( { apiBaseUrl, legacyLogin, ...credentials } : $LoginData ) => {
8588 updateSettings ( { apiBaseUrl } ) ;
86- const adminTokenResult = await getAdminToken ( credentials ) ;
89+ const adminTokenResult = await getAdminToken ( credentials , apiBaseUrl ) ;
8790 if ( adminTokenResult . isErr ( ) ) {
8891 addNotification ( { type : 'error' , title : 'Login Failed' , message : adminTokenResult . error } ) ;
8992 return ;
@@ -92,7 +95,7 @@ export const LoginDialog = ({ isOpen, setIsOpen }: LoginDialogProps) => {
9295 if ( legacyLogin ) {
9396 login ( adminTokenResult . value . accessToken ) ;
9497 } else {
95- const limitedTokenResult = await getLimitedToken ( adminTokenResult . value . accessToken ) ;
98+ const limitedTokenResult = await getLimitedToken ( adminTokenResult . value . accessToken , apiBaseUrl ) ;
9699 if ( limitedTokenResult . isErr ( ) ) {
97100 addNotification ( { type : 'error' , title : 'Failed to Get Limited Token' , message : limitedTokenResult . error } ) ;
98101 return ;
0 commit comments