Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Users #412

Open
wants to merge 3 commits into
base: users
Choose a base branch
from
Open

Users #412

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
22 changes: 1 addition & 21 deletions backend/users/.env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,4 @@ DJANGO_SUPERUSER_PASSWORD=password

# ===== REDIS =====
REDIS_LOCAL_HOST=redis
REDIS_LOCAL_PORT=6379
REDIS_LOCAL_PASSWORD=Qwe123!@#

REDIS_SHARED_HOST=redis
REDIS_SHARED_PORT=6379
REDIS_SHARED_PASSWORD=Qwe123!@#

REDIS_ACCESS_DB=0
REDIS_REFRESH_DB=1
REDIS_TOTP_DB=2
REDIS_ACCESS_PREFIX=access
REDIS_REFRESH_PREFIX=refresh
REDIS_TOTP_PREFIX=totp

# ===== TOTP =====
EMAIL_EXCHANGE_NAME=email_exchange
EMAIL_ROUTING_KEY=email_queue
NOTIFY_EXCHANGE_NAME=notify_exchange
NOTIFY_ROUTING_KEY=notify_queue
TOTP_EXCHANGE_NAME=totp_exchange
TOTP_ROUTING_KEY=totp_queue
REDIS_LOCAL_PORT=6379
4 changes: 3 additions & 1 deletion backend/users/backend/administrator/tests/test_get_jwt.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import os
import time

from social_core.pipeline import user

from administrator.models import Admin
from base.base_tests.tests import BaseViewTestCase
from common.services.jwt.token import Token
Expand All @@ -21,7 +23,7 @@ def setUpTestData(cls):
)
cls.url = reverse("token_refresh")
cls.token = cls.get_tokens(cls.user)
cls.data = {"refresh_token": cls.token.get("refresh")}
cls.data = {"refresh_token": cls.get_refresh_token(cls.user)}

def client_post(self, data):
return self.client.post(self.url, data=data, format="json")
Expand Down
36 changes: 36 additions & 0 deletions backend/users/backend/base/base_tests/tests.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import pika

from administrator.models import Admin
from base.models import BaseAbstractUser
from common.services.jwt.token import Token
from django.conf import settings
from django.test import TestCase
from faker import Faker
from rest_framework.test import APIClient

from customer.models import CustomerUser
from developer.models import CompanyUser
from utils.broker.rabbitmq import RabbitMQ


Expand All @@ -30,6 +35,37 @@ def tearDown(self) -> None:
def get_access_token(user: BaseAbstractUser) -> str:
return Token().generate_access_token_for_user(user)

@staticmethod
def get_refresh_token(user: BaseAbstractUser) -> str:
return Token().generate_refresh_token_for_user(user)

@staticmethod
def get_tokens(user: BaseAbstractUser) -> dict:
return Token().generate_tokens_for_user(user)

def get_user(self, user: BaseAbstractUser):

data_user = self.__generate_data_for_users(user)

if isinstance(user, CustomerUser):
customer_user = CustomerUser.objects.create_user(**data_user)
return customer_user
elif isinstance(user, Admin):
customer_user = Admin.objects.create_user(**data_user)
return customer_user
elif isinstance(user, CompanyUser):
customer_user = CompanyUser.objects.create_user(**data_user)
return customer_user
else:
raise ValueError(f"Type user {user.__class__.__name__} not found")

def __generate_data_for_users(self, type_user: BaseAbstractUser) -> dict:
data = {
"username": self.faker.word(),
"password": self.faker.word(),
"email": self.faker.email(),
"phone": self.faker.random_number(digits=10, fix_len=True),
}
if isinstance(type_user, CustomerUser):
data["birthday"] = self.faker.date_object()
return data
4 changes: 2 additions & 2 deletions backend/users/backend/common/tests/test_logout.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def create_user(cls, model: type[BaseAbstractUser]) -> BaseAbstractUser:
return model.objects.create_user(**data)

def create_refresh_token(self, user) -> dict:
refresh_token = self.get_tokens(user)
return {"refresh_token": refresh_token.get('refresh')}
refresh_token = self.get_refresh_token(user)
return {"refresh_token": refresh_token}

def test_01_logout_developer(self):
refresh_token = self.create_refresh_token(self.developer)
Expand Down
4 changes: 2 additions & 2 deletions backend/users/backend/customer/tests/test_get_jwt.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ def setUpTestData(cls):
is_active=True,
)
cls.url = reverse("token_refresh")
cls.token = cls.get_tokens(cls.user)
cls.data = {"refresh_token": cls.token.get("refresh")}
cls.token = cls.get_refresh_token(cls.user)
cls.data = {"refresh_token": cls.token}

def client_post(self, data):
return self.client.post(self.url, data=data, format="json")
Expand Down
2 changes: 1 addition & 1 deletion backend/users/backend/developer/tests/test_get_jwt.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def setUpTestData(cls):
)
cls.url = reverse("token_refresh")
cls.token = cls.get_tokens(cls.user)
cls.data = {"refresh_token": cls.token.get("refresh")}
cls.data = {"refresh_token": cls.get_refresh_token(cls.user)}

def client_post(self, data):
return self.client.post(self.url, data=data, format="json")
Expand Down
Loading