Skip to content
This repository was archived by the owner on Dec 21, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions static/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,13 @@ function becomeButton (user) {
function () {
SnapCloud.login(
user.username,
0, // password is irrelevant
'', // password is irrelevant, but can't be null
false, // persist
function (username, role, response) {
function (username, role, previous_username_admin, response) {
alert(
response.message,
function () {
sessionStorage.previous_username_admin = previous_username_admin;
sessionStorage.username = username;
sessionStorage.role = role;
location.href = 'profile';
Expand Down
10 changes: 10 additions & 0 deletions static/js/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ function fillVisitorFields () {
}
};

function fillAliasAlert () {
if (sessionStorage.username && sessionStorage.previous_username_admin) {
document.querySelectorAll('.aliasAlert.warning.message').forEach(function (each) {
each.innerHTML = escapeHtml(
'Admin account ' + sessionStorage.previous_username_admin + ' is logged in as ' + sessionStorage.username
);
});
}
};

function fillUsernameFields () {
var username = pageUser();
if (username) {
Expand Down
42 changes: 42 additions & 0 deletions templates/alias_alert_banner.tmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<style>
.aliasAlert {
padding: 20px;
background-color: #f44336;
color: white;
opacity: 1;
transition: opacity 0.6s;
margin-bottom: 15px;
}

.aliasAlert.warning {background-color: #ff9800;}

.closebtn {
margin-left: 15px;
color: white;
font-weight: bold;
float: right;
font-size: 22px;
line-height: 20px;
cursor: pointer;
transition: 0.3s;
}

.closebtn:hover {
color: black;
}
</style>
<script src="js/admin.js"></script>
<div hidden="true" class="aliasAlert warning">
<span class="closebtn"
onclick="javascript:SnapCloud.logoutAlias(function () {
sessionStorage.clear();
location.href = 'index';
}, genericError);"
>
Log Out of Alias
</span>
<strong>Logged in as Alias</strong>
<span></span>
<span class="aliasAlert warning message"></span>
<!-- Set in the base.js -->
</div>
15 changes: 10 additions & 5 deletions templates/base.tmp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<i class="fas fa-spinner fa-spin fa-3x" aria-hidden="true"></i>
</div>
@include=navigation_bar
@include=alias_alert_banner
<div id="wrapper">
@content
</div>
Expand All @@ -48,16 +49,17 @@
if (!sessionStorage.username) {
SnapCloud.initSession(
function (username, role) {
sessionStorage.previous_username_admin = null;
sessionStorage.username = username;
sessionStorage.role = role;
initForUsername(username);
initForUsername(username, sessionStorage.previous_username_admin);
}
);
} else {
initForUsername(sessionStorage.username);
initForUsername(sessionStorage.username, sessionStorage.previous_username_admin);
}

function initForUsername (username) {
function initForUsername (username, previous_username_admin) {
if (username) {
SnapCloud.username = username;
document.querySelector('li.join').hidden = true;
Expand All @@ -69,9 +71,12 @@
document.querySelector('.admin').hidden = false;
}
fillVisitorFields();
if (typeof Sentry !== 'undefined') {
Sentry.setUser({ username: sessionStorage.username });

if (previous_username_admin) {
document.querySelector('div.aliasAlert.warning').hidden = false;
fillAliasAlert();
}

} else {
document.querySelector('li.join').hidden = false;
document.querySelector('li.sign-in').hidden = false;
Expand Down
3 changes: 2 additions & 1 deletion templates/login.tmp
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@
username,
password,
persist,
function (username, role) {
function (username, role, previous_username_admin, response) {
// TODO: this should handle verification.
sessionStorage.previous_username_admin = previous_username_admin;
sessionStorage.username = username;
sessionStorage.role = role;
window.location.href = redirectPath();
Expand Down