Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2020-1-CloudComputing
/
C_Team_KhuDrive
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
하재연
2020-06-11 00:45:33 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b46398d9c09cc34da273886fdf506752d460a862
b46398d9
1 parent
95a14852
Update views.py
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
backend/api/views.py
backend/api/views.py
View file @
b46398d
...
...
@@ -20,7 +20,7 @@ class UserViewSet(viewsets.ModelViewSet):
"""
API endpoint that allows users to be viewed or edited.
"""
queryset
=
User
.
objects
.
all
()
.
order_by
(
'-id'
)
queryset
=
User
.
objects
.
all
()
.
order_by
(
'-i
nt_i
d'
)
serializer_class
=
UserSerializer
permission_classes
=
[
permissions
.
IsAuthenticated
]
...
...
@@ -32,7 +32,7 @@ class UserViewSet(viewsets.ModelViewSet):
user
=
serializer
.
create
(
data
=
request
.
data
)
return
Response
({
'message'
:
'user created'
,
'i
d'
:
user
.
id
,
'i
nt_id'
:
user
.
int_
id
,
'user_id'
:
user
.
user_id
,
'name'
:
user
.
name
,
'total_size'
:
user
.
total_size
,
...
...
@@ -59,12 +59,12 @@ class UserViewSet(viewsets.ModelViewSet):
return
Response
({
'Error'
:
"Invalid user_id/password"
},
status
=
status
.
HTTP_400_BAD_REQUEST
)
if
user
:
payload1
=
{
'i
d'
:
user
.
id
,
'i
nt_id'
:
user
.
int_
id
,
'user_id'
:
user
.
user_id
,
'exp'
:
datetime
.
utcnow
()
+
timedelta
(
seconds
=
300
)
}
payload2
=
{
'i
d'
:
user
.
id
,
'i
nt_id'
:
user
.
int_
id
,
'user_id'
:
user
.
user_id
,
'exp'
:
datetime
.
utcnow
()
+
timedelta
(
days
=
5
)
}
...
...
@@ -92,12 +92,12 @@ class UserViewSet(viewsets.ModelViewSet):
def
renew
(
self
,
request
):
user
=
request
.
user
payload1
=
{
'i
d'
:
user
.
id
,
'i
nt_id'
:
user
.
int_
id
,
'user_id'
:
user
.
user_id
,
'exp'
:
datetime
.
utcnow
()
+
timedelta
(
seconds
=
300
)
}
payload2
=
{
'i
d'
:
user
.
id
,
'i
nt_id'
:
user
.
int_
id
,
'user_id'
:
user
.
user_id
,
'exp'
:
datetime
.
utcnow
()
+
timedelta
(
days
=
5
)
}
...
...
@@ -119,7 +119,7 @@ class UserViewSet(viewsets.ModelViewSet):
if
request
.
method
==
'GET'
:
user
=
User
.
objects
.
get
(
id
=
pk
)
data
=
{
'i
d'
:
user
.
id
,
'i
nt_id'
:
user
.
int_
id
,
'user_id'
:
user
.
user_id
,
'name'
:
user
.
name
,
'total_size'
:
user
.
total_size
,
...
...
Please
register
or
login
to post a comment