Skip to content

Commit aa54086

Browse files
committed
fix:added login functionality for org owner
1 parent 59095a5 commit aa54086

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

api/src/services/auth.service.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,13 @@ const login = async (req: Request): Promise<LoginServiceType> => {
6868
};
6969
} else {
7070
const orgs = (res?.data?.user?.organizations || [])
71-
?.filter((org: any) => org?.org_roles?.some((item: any) => item.admin))
71+
?.filter((org: any) => org?.org_roles?.some((item: any) => item?.admin))
7272
?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
73-
if (!orgs.length) {
73+
74+
const ownerOrgs = (res?.data?.user?.organizations || [])?.filter((org:any)=> org?.is_owner)
75+
?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
76+
77+
if (!orgs?.length && ! ownerOrgs?.length) {
7478
throw new BadRequestError(HTTP_TEXTS.ADMIN_LOGIN_ERROR);
7579
}
7680
}

api/src/services/user.service.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,17 @@ const getUserProfile = async (req: Request): Promise<LoginServiceType> => {
6969
?.filter((org: any) => org?.org_roles?.some((item: any) => item.admin))
7070
?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
7171

72+
const ownerOrgs = (res?.data?.user?.organizations || [])?.filter((org:any)=> org?.is_owner)
73+
?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
74+
75+
const allOrgs = [...orgs, ...ownerOrgs]
7276
return {
7377
data: {
7478
user: {
7579
email: res?.data?.user?.email,
7680
first_name: res?.data?.user?.first_name,
7781
last_name: res?.data?.user?.last_name,
78-
orgs: orgs,
82+
orgs: allOrgs,
7983
},
8084
},
8185
status: res.status,

ui/src/components/Card/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const CardList = ({ project }: ProjectType) => {
7979
<div className="ProjectCard__Staus-unit">
8080
<span className="ProjectCard__stats-Title">Source</span>
8181
<div className="ProjectCard__cms">
82-
{project?.legacy_cms?.cms ? project?.legacy_cms?.cms : '-'}
82+
{project?.legacy_cms?.cms ?? '-'}
8383
</div>
8484
</div>
8585
<div className="ProjectCard__unit">

0 commit comments

Comments
 (0)