diff --git a/README.md b/README.md index 205ce94a66898b326926753290258098b7dfc4d5..9dff3372a627185382da3358f5dfb9c702857662 100644 --- a/README.md +++ b/README.md @@ -51,17 +51,20 @@ Here are some examples: #### GET items - List all the rules your user has created (admin users can see all the rules) - curl -X GET https://fod.example.com/api/routes/ -H 'Authorization: Token ' + + curl -X GET https://fod.example.com/api/routes/ -H 'Authorization: Token ' - Retrieve a specific rule: - curl -X GET https:/fod.example.com/api/routes// -H 'Authorization: Token ' + + curl -X GET https:/fod.example.com/api/routes// -H 'Authorization: Token ' - In order to create or modify a rule you have to use POST/PUT methods. -#### POST/PUT items +#### POST/PUT rules +In order to update or create rules you can follow this example: ##### Foreign Keys -In order to create/modify a rule you have to connect the rule with: +In order to create/modify a rule you have to connect the rule with some foreign keys: ###### Ports, Fragmentypes, protocols, thenactions When creating a rule, one can specify: diff --git a/accounts/views.py b/accounts/views.py index a86b74e4f5b438c83206726929fecd0aab01c460..e71d3a86cd1fcd315ba0b997f63d03a60294d041 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -21,17 +21,27 @@ from django.conf import settings from django.core.mail import send_mail from django.contrib.sites.models import Site from django.contrib.auth.models import User -from django.shortcuts import render +from django.shortcuts import render, HttpResponse from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from django.views.decorators.cache import never_cache +from rest_framework.authtoken.models import Token from accounts.models import UserProfile from peers.models import Peer from flowspec.forms import UserProfileForm from registration.models import RegistrationProfile +def generate_token(request): + user = request.user + try: + token = user.auth_token + except Token.DoesNotExist: + token = Token.objects.create(user=request.user) + return HttpResponse(token) + + @never_cache def activate(request, activation_key): account = None diff --git a/static/js/accounts.js b/static/js/accounts.js new file mode 100644 index 0000000000000000000000000000000000000000..f0150586f3e3c95bb76cd6281740f62dc7cfeea0 --- /dev/null +++ b/static/js/accounts.js @@ -0,0 +1,17 @@ +$(document).ready(function() { + $('a#generate_token').one('click', function (ev) { + ev.preventDefault(); + var url = $(this).prop('href'); + var result = $(this).parent() + result.text('loading...'); + $.ajax({ + url: url, + success: function (data) { + result.text(data); + }, + }) + .fail(function() { + result.text('An error has occured...'); + }); + }); +}); diff --git a/templates/profile.html b/templates/profile.html index 4fdd703dc7ec20ff7b577ec6d1f869970596d0fb..458f4de7d0e3caf58547a6c321f4f3ca9740a12b 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -1,80 +1,87 @@ {% extends "base.html" %} {% load i18n %} +{% load staticfiles %} {% block title %}{% trans "My profile" %}{% endblock %} {% block contentplaceholder %} -
-
-

{% trans "My profile" %}

-
- -
-
-
-
-
- {% trans "My Networks" %} -
- -
- - - - - - - {% for peer in peers %} - - - - {% endfor %} -
{% trans "Organization" %}{% trans "Networks" %}
{{peer}} - {% for network in peer.networks.all %} - {{network}}
- {% empty %} - {% blocktrans %}Ooops! Seems you have no networks associated with your peer. Contact Helpdesk to resolve this issue.{% endblocktrans %} - {% endfor %} -
-
-
-
+
+

{% trans "My profile" %}

+
+ +
-
-
-
- Shortcuts -
- -
+
+
+
+
+ {% trans "My Networks" %} +
+ +
+ + + + + + + {% for peer in peers %} + + + + + {% endfor %} +
{% trans "Organization" %}{% trans "Networks" %}
{{peer}} + {% for network in peer.networks.all %} + {{network}}
+ {% empty %} + {% blocktrans %}Ooops! Seems you have no networks associated with your peer. Contact Helpdesk to resolve this issue.{% endblocktrans %} + {% endfor %} +
+
+
+
+
+
+
+ Shortcuts +
+ +
{% trans "Add Rule" %} {% trans "My Rules" %} {% trans "Dashboard" %} -
- -
- -
-
- {% trans "My Profile" %} -
- -
-
-
{% trans "Username" %}:
{{user.username}}
-
{% trans "First name" %}:
{{user.first_name}}
-
{% trans "Last name" %}:
{{user.last_name}}
-
{% trans "Email" %}:
{{user.email}}
-
-
-
-
-
- - - +
+ +
+
+
+ {% trans "My Profile" %} +
+ +
+
+
{% trans "Username" %}:
+
{{user.username}}
+
{% trans "First name" %}:
{{user.first_name}}
+
{% trans "Last name" %}:
{{user.last_name}}
+
{% trans "Email" %}:
{{user.email}}
+
{% trans "Api Token" %}:
+
+ {% if user.auth_token %} + {{ user.auth_token }} + {% else %} + {% trans "Generate One" %} + {% endif %} +
+
+
+
+
+ {% endblock %} - - +{% block pagejs %} + +{% endblock %}