Skip to content

Dev #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
umeshmore45 merged 6 commits into from
May 6, 2024
Merged

Dev #88

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7af1553
reafctor:UI upload
AishDani May 6, 2024
c8354f1
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani May 6, 2024
f4ad95f
refactor:PR comments resolved
AishDani May 6, 2024
60e23ca
Merge pull request #86 from contentstack/feature/project-dashboard
snehalsankhe May 6, 2024
c70c7ec
apply admin role cond in login api
shristi-sinha May 6, 2024
9517e1b
Merge pull request #87 from contentstack/feature/admin-role-cond
umeshmore45 May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apply admin role cond in login api
  • Loading branch information
@shristi-sinha
shristi-sinha committed May 6, 2024
commit c70c7ec306ba07b48e9038aba399d537b60156e2
17 changes: 12 additions & 5 deletions api/src/services/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,18 @@ const login = async (req: Request): Promise<LoginServiceType> => {
status: err?.response?.status,
};
}
const orgs = (res?.data?.user?.organizations || [])
?.filter((org: any) => org?.org_roles?.some((item: any) => item.admin))
?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
if (!orgs.length) {
throw new BadRequestError(HTTP_TEXTS.ADMIN_LOGIN_ERROR);
if (res?.data?.user?.organizations === undefined) {
return {
data: res?.data,
status: res?.status,
};
} else {
const orgs = (res?.data?.user?.organizations || [])
?.filter((org: any) => org?.org_roles?.some((item: any) => item.admin))
?.map(({ uid, name }: any) => ({ org_id: uid, org_name: name }));
if (!orgs.length) {
throw new BadRequestError(HTTP_TEXTS.ADMIN_LOGIN_ERROR);
}
}

if (res?.status === HTTP_CODES.SUPPORT_DOC)
Expand Down