Commite703a3d

committed

fix(user-controller): use consistent returns (closes#1918)

1 parent26859df commite703a3dCopy full SHA for e703a3d

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 23 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,30 @@ export class ManageUsersController {`
`194`	`194`	`asyncgetUserById(`
`195`	`195`	`@PathParams("id")id:string,`
`196`	`196`	`@QueryParams("select-citizens")selectCitizens:boolean,`
`197`		`-):Promise<APITypes.GetManageUserByIdData>{`
	`197`	`+ @QueryParams("steamId",String)steamId?:string,`
	`198`	`+ @QueryParams("discordId",String)discordId?:string,`
	`199`	`+):Promise<APITypes.GetManageUserByIdData\|APITypes.GetManageUserByIdData[]>{`
	`200`	`+if(steamId\|\|discordId){`
	`201`	`+constusers=awaitprisma.user.findMany({`
	`202`	`+where:{OR:[{ discordId},{ steamId}]},`
	`203`	`+select:manageUsersSelect(selectCitizens),`
	`204`	`+});`
	`205`	`+`
	`206`	`+if(users.length<=0){`
	`207`	`+thrownewNotFound("userNotFound");`
	`208`	`+}`
	`209`	`+`
	`210`	`+returnusers.map((user)=>{`
	`211`	`+const{ User2FA, ...rest}=user;`
	`212`	`+return{`
	`213`	`+twoFactorEnabled:User2FA.length>=1,`
	`214`	`+ ...rest,`
	`215`	`+};`
	`216`	`+});`
	`217`	`+}`
	`218`	`+`
`198`	`219`	`constuser=awaitprisma.user.findFirst({`
`199`		`-where:{OR:[{ id},{discordId:id},{steamId:id}]},`
	`220`	`+where:{OR:[{ id},{ discordId},{ steamId}]},`
`200`	`221`	`select:manageUsersSelect(selectCitizens),`
`201`	`222`	`});`
`202`	`223`

Comments

(0)