Skip to content

Develop #11

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
thusser merged 3 commits into from
Jun 25, 2021
Merged

Develop #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc95e58
removed login/logout code and set csrfmiddlewaretoken on zip download
thusser Jun 25, 2021
1a3a384
use csrf_token
thusser Jun 25, 2021
b614a3b
removed debug output
thusser Jun 25, 2021
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
1 change: 0 additions & 1 deletion pyobs_archive/authentication/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class BearerAuthentication(authentication.BaseAuthentication):
the odin auth server
"""
def authenticate(self, request):
print('bearer')
auth_header = request.META.get('HTTP_AUTHORIZATION', '')
if 'Bearer' not in auth_header:
return None
Expand Down
46 changes: 3 additions & 43 deletions pyobs_archive/frontend/static/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ $(function () {
field: 'basename',
title: 'Name',
sortable: true,
formatter: function(value, row) {
formatter: function (value, row) {
let url = '/frames/' + row.id + '/download/';
return '<a href="' + url + '">' + value + '.fits.fz</a>';
}
Expand Down Expand Up @@ -259,39 +259,6 @@ $(function () {
history.pushState({}, '', '?q=a' + buildQueryParms());
}

function login(username, password, callback) {
$.post('/api-token-auth/', {
'username': username,
'password': password
}).done(function (data) {
localStorage.setItem('token', data.token);
callback(true);
}).fail(function () {
callback(false);
});
}

function logout() {
localStorage.removeItem('token');
}

$('#login').click(function () {
login($('#email').val(), $('#password').val(), function (result) {
if (result) {
$('#login-form').hide();
$('#alert').alert('close');
$('#logout').show();
refreshTable();
} else {
if ($("#alert-error").find("div#alert").length == 0) {
$("#alert-error").append("<div class='alert alert-danger alert-dismissable' id='alert'>" +
"<button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button> " +
"Login failed.</div>");
}
}
});
});

$('.keyup').typeWatch({
callback: function callback() {
refreshTable();
Expand All @@ -301,13 +268,6 @@ $(function () {
captureLength: 1
});

$('#logout').click(function () {
logout();
$('#login-form').show();
$('#logout').hide();
refreshTable();
});

if (localStorage.getItem('token') !== null) {
$('#login-form').hide();
$('#logout').show();
Expand Down Expand Up @@ -379,10 +339,10 @@ $(function () {
});

if (frames.length > 0) {
let token = $("#zip-form").find('input[name=csrfmiddlewaretoken]').val()
$.fileDownload('/frames/zip/', {
httpMethod: 'POST',
data: {'frame_ids': frames, 'auth_token': localStorage.getItem('token')},
headers: {}
data: {'frame_ids': frames, csrfmiddlewaretoken: token}
});
}
}
Expand Down
5 changes: 4 additions & 1 deletion pyobs_archive/frontend/templates/archive/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@
<div class="form-inline">
<div class="form-group form-inline">
<div class="btn-toolbar" role="group">
<button id="downloadBtn" class="btn btn-primary">Download</button>
<form id="zip-form">
{% csrf_token %}
<button type="button" id="downloadBtn" class="btn btn-primary">Download</button>
</form>
</div>
</div>
</div>
Expand Down