Commit78e3ae0

committed

fix(router): user page subPath

1 parent2beba95 commit78e3ae0Copy full SHA for 78e3ae0

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import {`
`13`	`13`	`makeGQClient,`
`14`	`14`	`queryStringToJSON,`
`15`	`15`	`nilOrEmpty,`
`16`		`-getSubPath,`
	`16`	`+parseURL,`
`17`	`17`	`pagedFilter,`
`18`	`18`	`ssrAmbulance,`
`19`	`19`	`parseTheme,`
`@@ -47,7 +47,8 @@ async function fetchData(props, opt) {`
`47`	`47`	`consttoken=realname ?getJwtToken(props) :null`
`48`	`48`	`constgqClient=makeGQClient(token)`
`49`	`49`	`constuserHasLogin=nilOrEmpty(token)===false`
`50`		`-constlogin=R.toLower(getSubPath(props))`
	`50`	`+const{ subPath}=parseURL(props)`
	`51`	`+constlogin=R.toLower(subPath)`
`51`	`52`
`52`	`53`	`constsessionState=gqClient.request(P.sessionState)`
`53`	`54`	`constuser=gqClient.request(P.user,{ login, userHasLogin})`
`@@ -69,6 +70,7 @@ export default class UserPage extends React.Component {`
`69`	`70`	`const{ asPath}=props`
`70`	`71`
`71`	`72`	`constquery=queryStringToJSON(asPath)`
	`73`	`+const{ subPath}=parseURL(props)`
`72`	`74`
`73`	`75`	`letresp`
`74`	`76`	`try{`
`@@ -77,7 +79,7 @@ export default class UserPage extends React.Component {`
`77`	`79`	`if(ssrAmbulance.hasLoginError(errors)){`
`78`	`80`	`resp=awaitfetchData(props,{realname:false})`
`79`	`81`	`}else{`
`80`		`-return{statusCode:404,target:getSubPath(props)}`
	`82`	`+return{statusCode:404,target:subPath}`
`81`	`83`	`}`
`82`	`84`	`}`
`83`	`85`

Comments

(0)