Skip to content

Commit 3fe13f4

Browse files
duanhongyiduanhongyi
committed
chore(controller): use passport user id
1 parent 86c6741 commit 3fe13f4

19 files changed

+423
-377
lines changed

‎rootfs/api/apps.py

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from django import apps
2+
3+
4+
class AppConfig(apps.AppConfig):
5+
default_auto_field = 'django.db.models.BigAutoField'
6+
name = 'api'
7+
8+
def ready(self):
9+
super(AppConfig, self).ready()
10+
__import__("api.signals")

‎rootfs/api/fixtures/dev.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"pk": -1,
4-
"model": "auth.user",
4+
"model": "api.user",
55
"fields": {
66
"username": "AnonymousUser",
77
"first_name": "",
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"pk": 1,
22-
"model": "auth.user",
22+
"model": "api.user",
2323
"fields": {
2424
"username": "devuser",
2525
"first_name": "",

‎rootfs/api/fixtures/test_auth.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"pk": 7,
4-
"model": "auth.user",
4+
"model": "api.user",
55
"fields": {
66
"username": "autotest",
77
"first_name": "Otto",
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"pk": 8,
22-
"model": "auth.user",
22+
"model": "api.user",
2323
"fields": {
2424
"username": "autotest2",
2525
"first_name": "Otto",
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"pk": 9,
40-
"model": "auth.user",
40+
"model": "api.user",
4141
"fields": {
4242
"username": "autotest3",
4343
"first_name": "Otto",

‎rootfs/api/fixtures/test_sharing.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"pk": 2,
4-
"model": "auth.user",
4+
"model": "api.user",
55
"fields": {
66
"username": "autotest-1",
77
"first_name": "",
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"pk": 3,
22-
"model": "auth.user",
22+
"model": "api.user",
2323
"fields": {
2424
"username": "autotest-2",
2525
"first_name": "",
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"pk": 4,
40-
"model": "auth.user",
40+
"model": "api.user",
4141
"fields": {
4242
"username": "autotest-3",
4343
"first_name": "",

‎rootfs/api/fixtures/tests.json

+22-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
[
2+
{
3+
"pk": -1,
4+
"model": "api.user",
5+
"fields": {
6+
"username": "AnonymousUser",
7+
"first_name": "",
8+
"last_name": "",
9+
"is_active": true,
10+
"is_superuser": false,
11+
"is_staff": false,
12+
"last_login": "2014-02-16T13:13:47.539Z",
13+
"groups": [],
14+
"user_permissions": [],
15+
"password": "",
16+
"email": "",
17+
"date_joined": "2014-02-16T13:13:47.539Z"
18+
}
19+
},
220
{
321
"pk": 7,
4-
"model": "auth.user",
22+
"model": "api.user",
523
"fields": {
624
"username": "autotest",
725
"first_name": "Otto",
@@ -19,7 +37,7 @@
1937
},
2038
{
2139
"pk": 8,
22-
"model": "auth.user",
40+
"model": "api.user",
2341
"fields": {
2442
"username": "autotest2",
2543
"first_name": "Otto",
@@ -37,7 +55,7 @@
3755
},
3856
{
3957
"pk": 9,
40-
"model": "auth.user",
58+
"model": "api.user",
4159
"fields": {
4260
"username": "autotest3",
4361
"first_name": "Otto",
@@ -55,7 +73,7 @@
5573
},
5674
{
5775
"pk": 10,
58-
"model": "auth.user",
76+
"model": "api.user",
5977
"fields": {
6078
"username": "autotest4",
6179
"first_name": "Otto",

‎rootfs/api/migrations/0001_initial.py

+50-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
# Generated by Django 3.2.5 on 2021-08-09 06:50
1+
# Generated by Django 3.2.12 on 2022-03-11 06:36
22

3-
import api.utils
4-
import api.models
53
import api.models.app
64
import api.models.certificate
75
import api.models.key
6+
import api.utils
87
from django.conf import settings
9-
import django.contrib.postgres.fields
8+
import django.contrib.auth.models
9+
import django.contrib.auth.validators
1010
from django.db import migrations, models
1111
import django.db.models.deletion
12+
import django.utils.timezone
1213
import uuid
1314

1415

@@ -17,10 +18,36 @@ class Migration(migrations.Migration):
1718
initial = True
1819

1920
dependencies = [
20-
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
21+
('auth', '0012_alter_user_first_name_max_length'),
2122
]
2223

2324
operations = [
25+
migrations.CreateModel(
26+
name='User',
27+
fields=[
28+
('password', models.CharField(max_length=128, verbose_name='password')),
29+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
30+
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
31+
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
32+
('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
33+
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
34+
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
35+
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
36+
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
37+
('id', models.BigIntegerField(primary_key=True, serialize=False, verbose_name='id')),
38+
('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')),
39+
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
40+
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
41+
],
42+
options={
43+
'verbose_name': 'user',
44+
'verbose_name_plural': 'users',
45+
'abstract': False,
46+
},
47+
managers=[
48+
('objects', django.contrib.auth.models.UserManager()),
49+
],
50+
),
2451
migrations.CreateModel(
2552
name='App',
2653
fields=[
@@ -61,7 +88,7 @@ class Migration(migrations.Migration):
6188
migrations.CreateModel(
6289
name='Certificate',
6390
fields=[
64-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
91+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
6592
('created', models.DateTimeField(auto_now_add=True)),
6693
('updated', models.DateTimeField(auto_now=True)),
6794
('name', models.CharField(max_length=253, unique=True, validators=[api.utils.validate_label])),
@@ -107,7 +134,7 @@ class Migration(migrations.Migration):
107134
migrations.CreateModel(
108135
name='Domain',
109136
fields=[
110-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
137+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
111138
('created', models.DateTimeField(auto_now_add=True)),
112139
('updated', models.DateTimeField(auto_now=True)),
113140
('domain', models.TextField(error_messages={'unique': 'Domain is already in use by another application'}, unique=True)),
@@ -119,6 +146,21 @@ class Migration(migrations.Migration):
119146
'ordering': ['domain', 'certificate'],
120147
},
121148
),
149+
migrations.CreateModel(
150+
name='Blocklist',
151+
fields=[
152+
('uuid', models.UUIDField(auto_created=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True, verbose_name='UUID')),
153+
('created', models.DateTimeField(auto_now_add=True)),
154+
('updated', models.DateTimeField(auto_now=True)),
155+
('id', models.CharField(db_index=True, max_length=128)),
156+
('type', models.PositiveIntegerField(choices=[(1, 'app'), (2, 'user')])),
157+
('remark', models.TextField(blank=True, default='Blocked for unknown reason', null=True)),
158+
],
159+
options={
160+
'ordering': ['-created'],
161+
'unique_together': {('id', 'type')},
162+
},
163+
),
122164
migrations.CreateModel(
123165
name='Volume',
124166
fields=[
@@ -157,7 +199,7 @@ class Migration(migrations.Migration):
157199
migrations.CreateModel(
158200
name='Service',
159201
fields=[
160-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
202+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
161203
('created', models.DateTimeField(auto_now_add=True)),
162204
('updated', models.DateTimeField(auto_now=True)),
163205
('procfile_type', models.TextField()),

‎rootfs/api/migrations/0002_blocklist.py

-29
This file was deleted.

0 commit comments

Comments
 (0)