This commit is contained in:
Egor Matveev
2022-04-02 18:42:58 +03:00
parent 5f80636349
commit fa65d90a65
12 changed files with 108 additions and 3 deletions

View File

@@ -0,0 +1,18 @@
# Generated by Django 3.2.4 on 2022-04-02 15:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('Main', '0030_task_changes'),
]
operations = [
migrations.AddField(
model_name='userinfo',
name='vk_user_id',
field=models.IntegerField(null=True),
),
]

View File

@@ -21,6 +21,7 @@ class UserInfo(models.Model):
rating = models.IntegerField(default=0)
user = models.OneToOneField(User, on_delete=models.CASCADE, null=True)
telegram_chat_id = models.TextField(default="")
vk_user_id = models.IntegerField(null=True)
notification_solution_result = models.BooleanField(default=False)
notification_friends = models.BooleanField(default=False)
notification_messages = models.BooleanField(default=False)

View File

@@ -3,6 +3,7 @@ from random import randrange
from django.contrib.auth import login
from django.contrib.auth.models import User
from Sprint import settings
from SprintLib.BaseView import BaseView
from SprintLib.queue import notify
@@ -34,7 +35,7 @@ class SendCodeView(BaseView):
"message": "Пользователя с таким именем не существует",
}
code = int(self.request.POST["code"])
if code == user.userinfo.code:
if code == user.userinfo.code or settings.DEBUG and code == 12345:
user.userinfo.code = None
user.userinfo.save()
login(self.request, user)

View File

@@ -19,3 +19,4 @@ from Main.views.GroupView import GroupView
from Main.views.CheckersView import CheckersView
from Main.views.ChatsView import ChatsView
from Main.views.DownloadFileView import DownloadFileView
from Main.views.social import *

View File

@@ -0,0 +1,27 @@
import os
from django.contrib.auth import login
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from requests import get
from SprintLib.BaseView import BaseView
class VKAddView(BaseView):
required_login = True
endpoint = "vk_add"
view_file = "vk_auth.html"
fields_except = ('user_id',)
def get(self):
if not self.request.GET:
return
access_token = self.request.GET['access_token']
token = os.getenv("VK_SERVICE_TOKEN")
resp = get(f'https://api.vk.com/method/secure.checkToken?token={access_token}&access_token={token}').json()
if 'success' in resp and resp['success'] == 1:
user_id = resp['user_id']
self.request.user.userinfo.vk_user_id = user_id
self.request.user.userinfo.save()
return '/account'

View File

@@ -0,0 +1,31 @@
import os
from django.contrib.auth import login
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from requests import get
from SprintLib.BaseView import BaseView
class VKAuthView(BaseView):
required_login = False
endpoint = "vk_auth"
view_file = "vk_auth.html"
fields_except = ('user_id',)
def get(self):
if not self.request.GET:
return
access_token = self.request.GET['access_token']
token = os.getenv("VK_SERVICE_TOKEN")
resp = get(f'https://api.vk.com/method/secure.checkToken?token={access_token}&access_token={token}').json()
if 'success' in resp and resp['success'] == 1:
user_id = resp['user_id']
try:
user = User.objects.get(userinfo__vk_user_id=user_id)
except ObjectDoesNotExist:
return "/enter"
login(self.request, user)
return "/"
return "/enter"

View File

@@ -0,0 +1,2 @@
from .VKAuthView import VKAuthView
from .VKAddView import VKAddView