Merge pull request #655 from contentstack/feature/dropdown-field-choices

fix:added login functionality for org owner

Author: sayalijoshi27

api/src/services/auth.service.ts

@@ -68,9 +68,13 @@ const login = async (req: Request): Promise<LoginServiceType> => {
       };
     } else {
       const orgs = (res?.data?.user?.organizations || [])
-        ?.filter((org: any) => org?.org_roles?.some((item: any) => item.admin))
+        ?.filter((org: any) => org?.org_roles?.some((item: any) => item?.admin))
         ?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
-      if (!orgs.length) {
+
+      const ownerOrgs = (res?.data?.user?.organizations || [])?.filter((org:any)=> org?.is_owner)
+      ?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
+
+      if (!orgs?.length && ! ownerOrgs?.length) {
         throw new BadRequestError(HTTP_TEXTS.ADMIN_LOGIN_ERROR);
       }
     }

api/src/services/user.service.ts

@@ -69,13 +69,17 @@ const getUserProfile = async (req: Request): Promise<LoginServiceType> => {
       ?.filter((org: any) => org?.org_roles?.some((item: any) => item.admin))
       ?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
 
+    const ownerOrgs = (res?.data?.user?.organizations || [])?.filter((org:any)=> org?.is_owner)
+    ?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
+
+    const allOrgs = [...orgs, ...ownerOrgs]
     return {
       data: {
         user: {
           email: res?.data?.user?.email,
           first_name: res?.data?.user?.first_name,
           last_name: res?.data?.user?.last_name,
-          orgs: orgs,
+          orgs: allOrgs,
         },
       },
       status: res.status,

ui/src/components/Card/index.tsx

@@ -79,7 +79,7 @@ const CardList = ({ project }: ProjectType) => {
                 <div className="ProjectCard__Staus-unit">
                   <span className="ProjectCard__stats-Title">Source</span>
                   <div className="ProjectCard__cms">
-                    {project?.legacy_cms?.cms ? project?.legacy_cms?.cms : '-'}
+                    {project?.legacy_cms?.cms ?? '-'}
                   </div>
                 </div>
                 <div className="ProjectCard__unit">