MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Merge branch 'develop' into plugins-functionality

This commit is contained in:
argirok 2024-04-19 12:40:17 +03:00
parent 2171875ca5 6b634f93e0
commit ca4cb0ea9e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server.ts
View File

@ -128,8 +128,13 @@ export function app() {
referer = isArray(req.headers.referer) ? req.headers.referer[0] : (<string>req.headers.referer);
referer = referer.split("?")[0];
}
if (referer && (XFRAME_WHITELIST.indexOf(referer) != -1 || referer.indexOf("/customize-layout") != -1 || referer.indexOf(".d4science.org") != -1)) {
// res.header('X-FRAME-OPTIONS', 'allow from ' +req.headers.referer);
if (referer && (XFRAME_WHITELIST.indexOf(referer) != -1 || referer.indexOf("/customize-layout") != -1 || referer.indexOf(".d4science.org") != -1 || referer.indexOf(".di.uoa.gr") != -1 || referer.indexOf(".openaire.eu") != -1 )) {
res.header('X-FRAME-OPTIONS', 'allow from ' +req.headers.referer);
res.header('Access-Control-Allow-Origin',req.headers.origin);
res.header('Access-Control-Allow-Methods', 'GET, HEAD, OPTIONS');
res.header('Access-Control-Allow-Headers', 'Cache-control, Expires, Pragma');
res.header('Allow', 'GET, HEAD, OPTIONS');
} else {
res.header('X-FRAME-OPTIONS', 'SAMEORIGIN');
}

3
src/app/utils/communityAccess.guard.ts
View File

@ -27,9 +27,7 @@ export class CommunityAccessGuard {
this.communityService.getCommunity(community).pipe(take(1))
]).pipe(
map(([user, communityInfo]) => {
console.log(user, communityInfo)
if (communityInfo) {
console.log(communityInfo.status)
if (communityInfo.isPublic()) {
return true;
} else if (communityInfo.isPrivate()) {
@ -46,7 +44,6 @@ export class CommunityAccessGuard {
return false;
}
if (Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager('community', community, user) || Session.isSubscribedTo('community', community, user)) {
console.log("user: has access")
return true;
} else {
this.router.navigate(['/user-info'], {