@@ -83,7 +83,7 @@ const CustomFormWizard = (props) => { | |||||
const responseToData = () => { | const responseToData = () => { | ||||
//let rd = JSON.parse("{\"emailAddress\":\"[email protected]\",\"postalAddress\":{\"EngPremisesAddress\":{\"EngDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"TSING YI\"},\"EngEstate\":{\"EstateName\":\"Cheung Hang Estate\",\"EngPhase\":{\"PhaseName\":\"N/A\"}},\"BuildingName\":\"Hang Lai House\",\"EngBlock\":{\"BlockDescriptor\":\"Block\",\"BlockNo\":\"2\"},\"Region\":\"NT\",\"EngStreet\":{\"StreetName\":\"Liu To Road\",\"BuildingNoFrom\":\"6\"},\"Eng3dAddress\":{\"EngFloor\":{\"FloorNum\":\"33\"},\"EngUnit\":{\"UnitDescriptor\":\"Room\",\"UnitNo\":\"3301\"}}}},\"mobileNumber\":{\"CountryCode\":\"852\",\"SubscriberNumber\":\"99999999\"},\"residentialAddress\":{\"ChiPremisesAddress\":{\"Chi3dAddress\":{\"ChiUnit\":{\"UnitDescriptor\":\"室\",\"UnitNo\":\"1010\"},\"ChiFloor\":{\"FloorNum\":\"10\"}},\"ChiBlock\":{\"BlockDescriptor\":\"座\",\"BlockNo\":\"2\"},\"BuildingName\":\"亨麗樓(第2座)\",\"ChiDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"青衣\"},\"Region\":\"新界\",\"ChiEstate\":{\"EstateName\":\"長亨邨\"},\"ChiStreet\":{\"StreetName\":\"寮肚路\",\"BuildingNoFrom\":\"6\"}}},\"enName\":{\"UnstructuredName\":\"Testing Co One\"},\"idNo\":{\"Identification\":\"G561107\",\"CheckDigit\":\"4\"},\"chName\":{\"ChineseName\":\"測試商一\"}}"); | //let rd = JSON.parse("{\"emailAddress\":\"[email protected]\",\"postalAddress\":{\"EngPremisesAddress\":{\"EngDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"TSING YI\"},\"EngEstate\":{\"EstateName\":\"Cheung Hang Estate\",\"EngPhase\":{\"PhaseName\":\"N/A\"}},\"BuildingName\":\"Hang Lai House\",\"EngBlock\":{\"BlockDescriptor\":\"Block\",\"BlockNo\":\"2\"},\"Region\":\"NT\",\"EngStreet\":{\"StreetName\":\"Liu To Road\",\"BuildingNoFrom\":\"6\"},\"Eng3dAddress\":{\"EngFloor\":{\"FloorNum\":\"33\"},\"EngUnit\":{\"UnitDescriptor\":\"Room\",\"UnitNo\":\"3301\"}}}},\"mobileNumber\":{\"CountryCode\":\"852\",\"SubscriberNumber\":\"99999999\"},\"residentialAddress\":{\"ChiPremisesAddress\":{\"Chi3dAddress\":{\"ChiUnit\":{\"UnitDescriptor\":\"室\",\"UnitNo\":\"1010\"},\"ChiFloor\":{\"FloorNum\":\"10\"}},\"ChiBlock\":{\"BlockDescriptor\":\"座\",\"BlockNo\":\"2\"},\"BuildingName\":\"亨麗樓(第2座)\",\"ChiDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"青衣\"},\"Region\":\"新界\",\"ChiEstate\":{\"EstateName\":\"長亨邨\"},\"ChiStreet\":{\"StreetName\":\"寮肚路\",\"BuildingNoFrom\":\"6\"}}},\"enName\":{\"UnstructuredName\":\"Testing Co One\"},\"idNo\":{\"Identification\":\"G561107\",\"CheckDigit\":\"4\"},\"chName\":{\"ChineseName\":\"測試商一\"}}"); | ||||
let rd = location.state?.responseData; | |||||
let rd = JSON.parse(location.state?.responseData.data); | |||||
let data = { | let data = { | ||||
"enName": rd?.enName?.UnstructuredName ?? "", | "enName": rd?.enName?.UnstructuredName ?? "", | ||||
"chName": rd?.chName?.ChineseName ?? "", | "chName": rd?.chName?.ChineseName ?? "", | ||||
@@ -18,10 +18,10 @@ const Index = () => { | |||||
const navigate = useNavigate() | const navigate = useNavigate() | ||||
React.useEffect(() => { | React.useEffect(() => { | ||||
getPrfile(); | |||||
goLogin(); | |||||
}, []); | }, []); | ||||
function getPrfile(){ | |||||
function goLogin(){ | |||||
dispatch(handleLogoutFunction()); | dispatch(handleLogoutFunction()); | ||||
let params = new URLSearchParams(window.location.search) | let params = new URLSearchParams(window.location.search) | ||||
@@ -32,10 +32,8 @@ const Index = () => { | |||||
code: params.get("code") | code: params.get("code") | ||||
}, | }, | ||||
onSuccess: (responseData) => { | onSuccess: (responseData) => { | ||||
//navigate('/iAmSmartRegisterFrom', { state: { responseData: responseData } }); | |||||
console.log(response) | |||||
console.log("responseData"); | |||||
console.log(responseData); | |||||
const userData = { | const userData = { | ||||
id: responseData.id, | id: responseData.id, | ||||
fullenName: responseData.name, | fullenName: responseData.name, | ||||
@@ -48,17 +46,17 @@ const Index = () => { | |||||
//avatar: require('src/assets/images/users/avatar-3.png').default, | //avatar: require('src/assets/images/users/avatar-3.png').default, | ||||
} | } | ||||
const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } | const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } | ||||
// setSuccess(true) | |||||
dispatch(handleLogin(data)) | dispatch(handleLogin(data)) | ||||
navigate('/dashboard'); | navigate('/dashboard'); | ||||
location.reload() | |||||
}, | }, | ||||
onFail: ()=>{ | |||||
window.location.assign("/login"); | |||||
onFail: (response)=>{ | |||||
console.log("Fail"); | |||||
console.log(response); | |||||
window.location.assign("/iamsmart/loginFail"); | |||||
}, | }, | ||||
onError:()=>{ | |||||
window.location.assign("/login"); | |||||
onError:(error)=>{ | |||||
console.log(error); | |||||
//window.location.assign("/iamsmart/loginFail"); | |||||
} | } | ||||
}); | }); | ||||
} | } | ||||
@@ -57,10 +57,6 @@ const LoginRoutes = { | |||||
path: 'error', | path: 'error', | ||||
element: <ErrorPage/> | element: <ErrorPage/> | ||||
}, | }, | ||||
{ | |||||
path: 'iamsmart/fallcallback', | |||||
element: <IAmSmart_AuthCallback/> | |||||
}, | |||||
{ | { | ||||
path: 'iamsmart/authcallback', | path: 'iamsmart/authcallback', | ||||
element: <IAmSmart_AuthCallback/> | element: <IAmSmart_AuthCallback/> | ||||
@@ -70,7 +66,7 @@ const LoginRoutes = { | |||||
element: <IAmSmart_RegistryCallback/> | element: <IAmSmart_RegistryCallback/> | ||||
}, | }, | ||||
{ | { | ||||
path: 'iamsmart/loginFall', | |||||
path: 'iamsmart/loginFail', | |||||
element: <IAmSmart_FailCallback/> | element: <IAmSmart_FailCallback/> | ||||
}, | }, | ||||
{ | { | ||||