Skip to content

Conversation

@kjetilk
Copy link
Member

@kjetilk kjetilk commented Dec 19, 2018

This should fix #1026 .

resourcePath += '/'
}

let trustedOrigins = [ldp.resourceMapper.resolveUrl(req.hostname)].concat(ldp.trustedOrigins)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An even more readable version would be to have it in separate function; but this is good ^_^

@kjetilk kjetilk merged commit 44e2d62 into release/v5.0.0 Dec 20, 2018
@ghost ghost removed the in progress label Dec 20, 2018
}

let trustedOrigins = [ldp.resourceMapper.resolveUrl(req.hostname)].concat(ldp.trustedOrigins)
if (ldp.multiuser) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we also include serverUri as a trusted origin in single-user mode?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so the resolveUrl(req.hostname) would then be that... So, you could turn this patch around, actually, with the same result. I think.

@kjetilk kjetilk deleted the fix/multiuser-origin branch April 3, 2019 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants