Skip to content

Polish login-logout #917

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
merged 2 commits into from
Nov 9, 2018
Merged

Polish login-logout #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e4ad8c
Fix logout on user page not handling view updates
rubensworks Nov 8, 2018
691a0c2
Add logout button to server index page
rubensworks Nov 8, 2018
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
4 changes: 4 additions & 0 deletions default-templates/new-account/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,15 @@ <h1>Account settings</h1>
loggedIn = !!session;
button.innerText = loggedIn ? 'Log out' : 'Log in';
button.classList.remove('btn-default');
button.classList.remove('btn-danger');
button.classList.remove('btn-primary');
button.classList.add(loggedIn ? 'btn-danger' : 'btn-primary');
if (loggedIn) {
var sessionOrigin = getOriginFromWebId(session.webId);
var isOwner = sessionOrigin === location.origin;
accountSettings.classList.toggle('hidden', !isOwner);
} else {
accountSettings.classList.toggle('hidden', true);
}
});

Expand Down
52 changes: 27 additions & 25 deletions default-templates/server/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="pull-right">
<a href="/register" class="btn btn-primary">Register</a>

<a onclick="login()" class="btn btn-success">Login</a>
<button id="session-action" type="button" class="session-action btn btn-default">Loading...</button>
</div>

<h1>Welcome to the Solid Prototype</h1>
Expand All @@ -34,33 +34,35 @@ <h1>Welcome to the Solid Prototype</h1>
</div>
<script src="/common/js/solid-auth-client.bundle.js"></script>
<script>
const elements = {};
['loggedIn', 'profileLink'].forEach(id => {
elements[id] = document.getElementById(id)
})
(function () {
const elements = {};
['loggedIn', 'profileLink'].forEach(id => {
elements[id] = document.getElementById(id)
})
var button = document.getElementById('session-action')
var loggedIn = false

async function login () {
const session = await solid.auth.popupLogin()
if (session) {
// Make authenticated request to the server to establish a session cookie
const {status} = await solid.auth.fetch(location)
if (status === 401) {
alert(`Invalid login.`)
await solid.auth.logout()
solid.auth.trackSession(async session => {
loggedIn = !!session;
button.innerText = loggedIn ? 'Log out' : 'Log in';
button.classList.remove('btn-default');
button.classList.remove('btn-danger');
button.classList.remove('btn-success');
button.classList.add(loggedIn ? 'btn-danger' : 'btn-success');
if (!session) {
elements.loggedIn.classList.add('hidden')
}
}
}
else {
elements.loggedIn.classList.remove('hidden')
elements.profileLink.innerText = session.webId
elements.profileLink.href = session.webId
}
})

solid.auth.trackSession(async session => {
if (!session) {
elements.loggedIn.classList.add('hidden')
}
else {
elements.loggedIn.classList.remove('hidden')
elements.profileLink.innerText = session.webId
elements.profileLink.href = session.webId
}
})
button.addEventListener('click', function () {
loggedIn ? solid.auth.logout() : solid.auth.popupLogin()
})
})();
</script>
</body>
</html>