Fix: User can view content using logged out token

Fix: User can view content using logged out token
Only the last commit  is relevant to the review.