Skip to content
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
52 changes: 52 additions & 0 deletions webmachine/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
from django.conf import settings


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Consumer',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=255)),
('key', models.CharField(max_length=32)),
('secret', models.CharField(max_length=32)),
('description', models.TextField()),
('status', models.SmallIntegerField(default=1, choices=[(1, 'Pending'), (2, 'Accepted'), (3, 'Canceled'), (4, 'Rejected')])),
('user', models.ForeignKey(related_name='consumers_user', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
],
),
migrations.CreateModel(
name='Nonce',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('token_key', models.CharField(max_length=32)),
('consumer_key', models.CharField(max_length=32)),
('key', models.CharField(max_length=255)),
],
),
migrations.CreateModel(
name='Token',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('key', models.CharField(max_length=32)),
('secret', models.CharField(max_length=32)),
('token_type', models.SmallIntegerField(choices=[(1, 'Access'), (2, 'Request')])),
('callback', models.CharField(max_length=2048)),
('callback_confirmed', models.BooleanField(default=False)),
('verifier', models.CharField(max_length=16)),
('timestamp', models.IntegerField(default=1454054828.411826)),
('is_approved', models.BooleanField(default=False)),
('consumer', models.ForeignKey(related_name='tokens_consumer', to='webmachine.Consumer')),
('user', models.ForeignKey(related_name='tokens_user', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
],
),
]
20 changes: 20 additions & 0 deletions webmachine/migrations/0002_auto_20160129_0247.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import webmachine.models


class Migration(migrations.Migration):

dependencies = [
('webmachine', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='token',
name='timestamp',
field=models.IntegerField(default=webmachine.models.generate_time),
),
]
Empty file.
8 changes: 7 additions & 1 deletion webmachine/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

from webmachine.managers import ConsumerManager, TokenManager


def generate_time():
return time.time()


def generate_random(length=SECRET_SIZE):
return User.objects.make_random_password(length=length)

Expand All @@ -41,6 +46,7 @@ def __str__(self):

return urllib.urlencode(data)


class Token(models.Model):
key = models.CharField(max_length=KEY_SIZE)
secret = models.CharField(max_length=SECRET_SIZE)
Expand All @@ -50,7 +56,7 @@ class Token(models.Model):
verifier = models.CharField(max_length=VERIFIER_SIZE)
consumer = models.ForeignKey(Consumer,
related_name="tokens_consumer")
timestamp = models.IntegerField(default=time.time())
timestamp = models.IntegerField(default=generate_time)
user = models.ForeignKey(User, null=True, blank=True,
related_name="tokens_user")
is_approved = models.BooleanField(default=False)
Expand Down