phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/GM-176_standard_user

Browse Source
This commit is contained in:
Виктор Гладких 2019-10-15 15:17:15 +03:00
commit e8d0045cec
12 changed files with 88 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/account/migrations/0011_merge_20191014_1258.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-10-14 12:58
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('account', '0009_auto_20191011_1123'),
('account', '0010_user_password_confirmed'),
]
operations = [
migrations.RemoveField(
model_name='user',
name='password_confirmed',
),
]

25
apps/account/models.py
View File

@ -85,7 +85,6 @@ class User(AbstractUser):
unconfirmed_email = models.EmailField(_('unconfirmed email'), blank=True, null=True, default=None)
email_confirmed = models.BooleanField(_('email status'), default=False)
newsletter = models.NullBooleanField(default=True)
password_confirmed = models.BooleanField(_('is new password confirmed'), default=True, null=False)
EMAIL_FIELD = 'email'
USERNAME_FIELD = 'username'
@ -137,15 +136,12 @@ class User(AbstractUser):
def confirm_email(self):
"""Method to confirm user email address"""
self.email = self.unconfirmed_email
self.unconfirmed_email = None
if self.unconfirmed_email is not None:
self.email = self.unconfirmed_email
self.unconfirmed_email = None
self.email_confirmed = True
self.save()
def confirm_password(self):
self.password_confirmed = True
self.save()
def approve(self):
"""Set user is_active status to True"""
self.is_active = True
@ -180,11 +176,6 @@ class User(AbstractUser):
"""Make a token for finish signup."""
return password_token_generator.make_token(self)
@property
def confirm_password_token(self):
"""Make a token for new password confirmation """
return GMTokenGenerator(purpose=GMTokenGenerator.CONFIRM_PASSWORD).make_token(self)
@property
def get_user_uidb64(self):
"""Get base64 value for user by primary key identifier"""
@ -214,16 +205,6 @@ class User(AbstractUser):
template_name=settings.RESETTING_TOKEN_TEMPLATE,
context=context)
def confirm_password_template(self, country_code):
"""Get confirm password template"""
context = {'token': self.confirm_password_token,
'country_code': country_code}
context.update(self.base_template)
return render_to_string(
template_name=settings.CONFIRM_PASSWORD_TEMPLATE,
context=context,
)
def confirm_email_template(self, country_code):
"""Get confirm email template"""
context = {'token': self.confirm_email_token,

13
apps/account/serializers/web.py
View File

@ -1,10 +1,8 @@
"""Serializers for account web"""
from django.contrib.auth import password_validation as password_validators
from django.conf import settings
from rest_framework import serializers
from account import models
from account import tasks
from utils import exceptions as utils_exceptions
from utils.methods import username_validator
@ -69,16 +67,5 @@ class PasswordResetConfirmSerializer(serializers.ModelSerializer):
"""Override update method"""
# Update user password from instance
instance.set_password(validated_data.get('password'))
instance.password_confirmed = False
instance.save()
if settings.USE_CELERY:
tasks.send_reset_password_confirm.delay(
user=instance,
country_code=self.context.get('request').country_code,
)
else:
tasks.send_reset_password_confirm(
user=instance,
country_code=self.context.get('request').country_code,
)
return instance

11
apps/account/tasks.py
View File

@ -22,17 +22,6 @@ def send_reset_password_email(user_id, country_code):
f'DETAIL: Exception occurred for reset password: '
f'{user_id}')
@shared_task
def send_reset_password_confirm(user: models.User, country_code):
""" Send email to user for applying new password. """
try:
user.send_email(subject=_('New password confirmation'),
message=user.confirm_password_template(country_code))
except:
logger.error(f'METHOD_NAME: {send_reset_password_confirm.__name__}\n'
f'DETAIL: Exception occured for new passwordconfirmation',
f'{user.id}')
@shared_task
def confirm_new_email_address(user_id, country_code):

1
apps/account/urls/common.py
View File

@ -8,7 +8,6 @@ app_name = 'account'
urlpatterns = [
path('user/', views.UserRetrieveUpdateView.as_view(), name='user-retrieve-update'),
path('change-password/', views.ChangePasswordView.as_view(), name='change-password'),
path('change-password-confirm/<uuid64>/<token>/', views.ConfirmPasswordView.as_view(), name='change-password'),
path('email/confirm/', views.SendConfirmationEmailView.as_view(), name='send-confirm-email'),
path('email/confirm/<uidb64>/<token>/', views.ConfirmEmailView.as_view(), name='confirm-email'),
]

26
apps/account/views/common.py
View File

@ -91,32 +91,6 @@ class ConfirmEmailView(JWTGenericViewMixin):
else:
raise utils_exceptions.UserNotFoundError()
class ConfirmPasswordView(JWTGenericViewMixin):
"""View for applying newly set password"""
permission_classes = (permissions.AllowAny,)
def get(self, request, *args, **kwargs):
uidb64 = kwargs.get('uidb64')
token = kwargs.get('token')
uid = force_text(urlsafe_base64_decode(uidb64))
user_qs = models.User.objects.filter(pk=uid)
if user_qs.exists():
user = user_qs.first()
if not GMTokenGenerator(GMTokenGenerator.CONFIRM_PASSWORD).check_token(
user, token):
raise utils_exceptions.NotValidTokenError()
user.confirm_password()
tokens = user.create_jwt_tokens()
return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(
access_token=tokens.get('access_token'),
refresh_token=tokens.get('refresh_token')),
response=Response(status=status.HTTP_200_OK))
else:
raise utils_exceptions.UserNotFoundError()
# Firebase Cloud Messaging
class FCMDeviceViewSet(generics.GenericAPIView):

4
apps/authorization/serializers/common.py
View File

@ -108,8 +108,8 @@ class LoginByUsernameOrEmailSerializer(SourceSerializerMixin,
"""Override validate method"""
username_or_email = attrs.pop('username_or_email')
password = attrs.pop('password')
user_qs = account_models.User.objects.filter(password_confirmed=True)\
.filter(Q(username=username_or_email) | Q(email=username_or_email))
user_qs = account_models.User.objects.filter(Q(username=username_or_email) |
Q(email=username_or_email))
if not user_qs.exists():
raise utils_exceptions.WrongAuthCredentials()
else:

68
apps/location/migrations/migrate_lang.sql
View File

@ -1,20 +1,12 @@
delete from comment_comment as cc;
delete from location_country_languages;
delete from translation_language as tl;
delete from location_country as lc;
SET search_path TO gm, public;
CREATE TABLE public.codelang (
CREATE TABLE codelang (
code varchar(100) NULL,
country varchar(10000) NULL
);
-- Permissions
ALTER TABLE public.codelang OWNER TO postgres;
GRANT ALL ON TABLE public.codelang TO postgres;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('af','Afrikaans')
,('af-ZA','Afrikaans (South Africa)')
,('ar','Arabic')
@ -26,7 +18,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ar-JO','Arabic (Jordan)')
,('ar-KW','Arabic (Kuwait)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('ar-LB','Arabic (Lebanon)')
,('ar-LY','Arabic (Libya)')
,('ar-MA','Arabic (Morocco)')
@ -38,7 +30,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ar-YE','Arabic (Yemen)')
,('az','Azeri (Latin)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('az-AZ','Azeri (Latin) (Azerbaijan)')
,('az-AZ','Azeri (Cyrillic) (Azerbaijan)')
,('be','Belarusian')
@ -50,7 +42,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ca-ES','Catalan (Spain)')
,('cs','Czech')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('cs-CZ','Czech (Czech Republic)')
,('cy','Welsh')
,('cy-GB','Welsh (United Kingdom)')
@ -62,7 +54,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('de-DE','German (Germany)')
,('de-LI','German (Liechtenstein)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('de-LU','German (Luxembourg)')
,('dv','Divehi')
,('dv-MV','Divehi (Maldives)')
@ -74,7 +66,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('en-CA','English (Canada)')
,('en-CB','English (Caribbean)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('en-GB','English (United Kingdom)')
,('en-IE','English (Ireland)')
,('en-JM','English (Jamaica)')
@ -86,7 +78,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('en-ZW','English (Zimbabwe)')
,('eo','Esperanto')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('es','Spanish')
,('es-AR','Spanish (Argentina)')
,('es-BO','Spanish (Bolivia)')
@ -98,7 +90,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('es-ES','Spanish (Castilian)')
,('es-ES','Spanish (Spain)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('es-GT','Spanish (Guatemala)')
,('es-HN','Spanish (Honduras)')
,('es-MX','Spanish (Mexico)')
@ -110,7 +102,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('es-SV','Spanish (El Salvador)')
,('es-UY','Spanish (Uruguay)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('es-VE','Spanish (Venezuela)')
,('et','Estonian')
,('et-EE','Estonian (Estonia)')
@ -122,7 +114,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('fi-FI','Finnish (Finland)')
,('fo','Faroese')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('fo-FO','Faroese (Faroe Islands)')
,('fr','French')
,('fr-BE','French (Belgium)')
@ -134,7 +126,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('gl','Galician')
,('gl-ES','Galician (Spain)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('gu','Gujarati')
,('gu-IN','Gujarati (India)')
,('he','Hebrew')
@ -146,7 +138,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('hr-HR','Croatian (Croatia)')
,('hu','Hungarian')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('hu-HU','Hungarian (Hungary)')
,('hy','Armenian')
,('hy-AM','Armenian (Armenia)')
@ -158,7 +150,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('it-CH','Italian (Switzerland)')
,('it-IT','Italian (Italy)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('ja','Japanese')
,('ja-JP','Japanese (Japan)')
,('ka','Georgian')
@ -170,7 +162,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ko','Korean')
,('ko-KR','Korean (Korea)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('kok','Konkani')
,('kok-IN','Konkani (India)')
,('ky','Kyrgyz')
@ -182,7 +174,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('mi','Maori')
,('mi-NZ','Maori (New Zealand)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('mk','FYRO Macedonian')
,('mk-MK','FYRO Macedonian (Former Yugoslav Republic of Macedonia)')
,('mn','Mongolian')
@ -194,7 +186,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ms-MY','Malay (Malaysia)')
,('mt','Maltese')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('mt-MT','Maltese (Malta)')
,('nb','Norwegian (Bokm?l)')
,('nb-NO','Norwegian (Bokm?l) (Norway)')
@ -206,7 +198,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ns-ZA','Northern Sotho (South Africa)')
,('pa','Punjabi')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('pa-IN','Punjabi (India)')
,('pl','Polish')
,('pl-PL','Polish (Poland)')
@ -218,7 +210,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('qu','Quechua')
,('qu-BO','Quechua (Bolivia)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('qu-EC','Quechua (Ecuador)')
,('qu-PE','Quechua (Peru)')
,('ro','Romanian')
@ -230,7 +222,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('se','Sami (Northern)')
,('se-FI','Sami (Northern) (Finland)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('se-FI','Sami (Skolt) (Finland)')
,('se-FI','Sami (Inari) (Finland)')
,('se-NO','Sami (Northern) (Norway)')
@ -242,7 +234,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('sk','Slovak')
,('sk-SK','Slovak (Slovakia)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('sl','Slovenian')
,('sl-SI','Slovenian (Slovenia)')
,('sq','Albanian')
@ -254,7 +246,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('sv','Swedish')
,('sv-FI','Swedish (Finland)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('sv-SE','Swedish (Sweden)')
,('sw','Swahili')
,('sw-KE','Swahili (Kenya)')
@ -266,7 +258,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('te-IN','Telugu (India)')
,('th','Thai')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('th-TH','Thai (Thailand)')
,('tl','Tagalog')
,('tl-PH','Tagalog (Philippines)')
@ -278,7 +270,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('tt-RU','Tatar (Russia)')
,('ts','Tsonga')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('uk','Ukrainian')
,('uk-UA','Ukrainian (Ukraine)')
,('ur','Urdu')
@ -290,7 +282,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('vi-VN','Vietnamese (Viet Nam)')
,('xh','Xhosa')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('xh-ZA','Xhosa (South Africa)')
,('zh','Chinese')
,('zh-CN','Chinese (S)')
@ -304,7 +296,7 @@ INSERT INTO public.codelang (code,country) VALUES
/***************************/
-- Manual migrate
CREATE TABLE public.country_code (
CREATE TABLE country_code (
code varchar(100) NULL,
country varchar(10000) NULL
);
@ -332,7 +324,7 @@ commit;
--delete from location_country as lc
INSERT INTO public.location_country
INSERT INTO location_country
(code, "name", low_price, high_price, created, modified)
select
lpad((row_number() over (order by t.country asc))::text, 3, '0') as code,
@ -353,7 +345,7 @@ commit;
--delete from translation_language as tl;
INSERT INTO public.translation_language
INSERT INTO translation_language
(title, locale)
select
t.country as title,
@ -371,7 +363,7 @@ commit;
--delete from location_country_languages
INSERT INTO public.location_country_languages
INSERT INTO location_country_languages
(country_id, language_id)
select lc.id as country_id,
l.id as language_id

59
apps/location/migrations/remigrate_lang.sql
View File

@ -1,15 +1,12 @@
CREATE TABLE public.codelang (
SET search_path TO gm, public;
CREATE TABLE codelang (
code varchar(100) NULL,
country varchar(10000) NULL
);
-- Permissions
ALTER TABLE public.codelang OWNER TO postgres;
GRANT ALL ON TABLE public.codelang TO postgres;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('af','Afrikaans')
,('af-ZA','Afrikaans (South Africa)')
,('ar','Arabic')
@ -21,7 +18,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ar-JO','Arabic (Jordan)')
,('ar-KW','Arabic (Kuwait)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('ar-LB','Arabic (Lebanon)')
,('ar-LY','Arabic (Libya)')
,('ar-MA','Arabic (Morocco)')
@ -33,7 +30,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ar-YE','Arabic (Yemen)')
,('az','Azeri (Latin)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('az-AZ','Azeri (Latin) (Azerbaijan)')
,('az-AZ','Azeri (Cyrillic) (Azerbaijan)')
,('be','Belarusian')
@ -45,7 +42,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ca-ES','Catalan (Spain)')
,('cs','Czech')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('cs-CZ','Czech (Czech Republic)')
,('cy','Welsh')
,('cy-GB','Welsh (United Kingdom)')
@ -57,7 +54,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('de-DE','German (Germany)')
,('de-LI','German (Liechtenstein)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('de-LU','German (Luxembourg)')
,('dv','Divehi')
,('dv-MV','Divehi (Maldives)')
@ -69,7 +66,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('en-CA','English (Canada)')
,('en-CB','English (Caribbean)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('en-GB','English (United Kingdom)')
,('en-IE','English (Ireland)')
,('en-JM','English (Jamaica)')
@ -81,7 +78,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('en-ZW','English (Zimbabwe)')
,('eo','Esperanto')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('es','Spanish')
,('es-AR','Spanish (Argentina)')
,('es-BO','Spanish (Bolivia)')
@ -93,7 +90,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('es-ES','Spanish (Castilian)')
,('es-ES','Spanish (Spain)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('es-GT','Spanish (Guatemala)')
,('es-HN','Spanish (Honduras)')
,('es-MX','Spanish (Mexico)')
@ -105,7 +102,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('es-SV','Spanish (El Salvador)')
,('es-UY','Spanish (Uruguay)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('es-VE','Spanish (Venezuela)')
,('et','Estonian')
,('et-EE','Estonian (Estonia)')
@ -117,7 +114,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('fi-FI','Finnish (Finland)')
,('fo','Faroese')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('fo-FO','Faroese (Faroe Islands)')
,('fr','French')
,('fr-BE','French (Belgium)')
@ -129,7 +126,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('gl','Galician')
,('gl-ES','Galician (Spain)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('gu','Gujarati')
,('gu-IN','Gujarati (India)')
,('he','Hebrew')
@ -141,7 +138,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('hr-HR','Croatian (Croatia)')
,('hu','Hungarian')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('hu-HU','Hungarian (Hungary)')
,('hy','Armenian')
,('hy-AM','Armenian (Armenia)')
@ -153,7 +150,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('it-CH','Italian (Switzerland)')
,('it-IT','Italian (Italy)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('ja','Japanese')
,('ja-JP','Japanese (Japan)')
,('ka','Georgian')
@ -165,7 +162,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ko','Korean')
,('ko-KR','Korean (Korea)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('kok','Konkani')
,('kok-IN','Konkani (India)')
,('ky','Kyrgyz')
@ -177,7 +174,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('mi','Maori')
,('mi-NZ','Maori (New Zealand)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('mk','FYRO Macedonian')
,('mk-MK','FYRO Macedonian (Former Yugoslav Republic of Macedonia)')
,('mn','Mongolian')
@ -189,7 +186,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ms-MY','Malay (Malaysia)')
,('mt','Maltese')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('mt-MT','Maltese (Malta)')
,('nb','Norwegian (Bokm?l)')
,('nb-NO','Norwegian (Bokm?l) (Norway)')
@ -201,7 +198,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('ns-ZA','Northern Sotho (South Africa)')
,('pa','Punjabi')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('pa-IN','Punjabi (India)')
,('pl','Polish')
,('pl-PL','Polish (Poland)')
@ -213,7 +210,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('qu','Quechua')
,('qu-BO','Quechua (Bolivia)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('qu-EC','Quechua (Ecuador)')
,('qu-PE','Quechua (Peru)')
,('ro','Romanian')
@ -225,7 +222,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('se','Sami (Northern)')
,('se-FI','Sami (Northern) (Finland)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('se-FI','Sami (Skolt) (Finland)')
,('se-FI','Sami (Inari) (Finland)')
,('se-NO','Sami (Northern) (Norway)')
@ -237,7 +234,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('sk','Slovak')
,('sk-SK','Slovak (Slovakia)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('sl','Slovenian')
,('sl-SI','Slovenian (Slovenia)')
,('sq','Albanian')
@ -249,7 +246,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('sv','Swedish')
,('sv-FI','Swedish (Finland)')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('sv-SE','Swedish (Sweden)')
,('sw','Swahili')
,('sw-KE','Swahili (Kenya)')
@ -261,7 +258,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('te-IN','Telugu (India)')
,('th','Thai')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('th-TH','Thai (Thailand)')
,('tl','Tagalog')
,('tl-PH','Tagalog (Philippines)')
@ -273,7 +270,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('tt-RU','Tatar (Russia)')
,('ts','Tsonga')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('uk','Ukrainian')
,('uk-UA','Ukrainian (Ukraine)')
,('ur','Urdu')
@ -285,7 +282,7 @@ INSERT INTO public.codelang (code,country) VALUES
,('vi-VN','Vietnamese (Viet Nam)')
,('xh','Xhosa')
;
INSERT INTO public.codelang (code,country) VALUES
INSERT INTO codelang (code,country) VALUES
('xh-ZA','Xhosa (South Africa)')
,('zh','Chinese')
,('zh-CN','Chinese (S)')
@ -299,7 +296,7 @@ INSERT INTO public.codelang (code,country) VALUES
/***************************/
-- Manual migrate
CREATE TABLE public.country_code (
CREATE TABLE country_code (
code varchar(100) NULL,
country varchar(10000) NULL
);

7
apps/utils/models.py
View File

@ -258,14 +258,12 @@ class GMTokenGenerator(PasswordResetTokenGenerator):
RESET_PASSWORD = 1
CHANGE_PASSWORD = 2
CONFIRM_EMAIL = 3
CONFIRM_PASSWORD = 4
TOKEN_CHOICES = (
CHANGE_EMAIL,
RESET_PASSWORD,
CHANGE_PASSWORD,
CONFIRM_EMAIL,
CONFIRM_PASSWORD,
CONFIRM_EMAIL
)
def __init__(self, purpose: int):
@ -281,8 +279,7 @@ class GMTokenGenerator(PasswordResetTokenGenerator):
self.purpose == self.CONFIRM_EMAIL:
fields.extend([str(user.email_confirmed), str(user.email)])
elif self.purpose == self.RESET_PASSWORD or \
self.purpose == self.CHANGE_PASSWORD or \
self.purpose == self.CONFIRM_PASSWORD:
self.purpose == self.CHANGE_PASSWORD:
fields.append(str(user.password))
return fields

11
project/settings/base.py
View File

@ -283,15 +283,15 @@ SMS_CODE_SHOW = False
# SMSC Settings
SMS_SERVICE = 'http://smsc.ru/sys/send.php'
SMS_LOGIN = 'GM2019'
SMS_PASSWORD = '}#6%Qe7CYG7n'
SMS_LOGIN = os.environ.get('SMS_LOGIN')
SMS_PASSWORD = os.environ.get('SMS_PASSWORD')
SMS_SENDER = 'GM'
# EMAIL
EMAIL_USE_TLS = True
EMAIL_HOST = 'smtp.yandex.ru'
EMAIL_HOST_USER = 't3st.t3stov.t3stovich@yandex.ru'
EMAIL_HOST_PASSWORD = 'ylhernyutkfbylgk'
EMAIL_HOST = 'smtp.mandrillapp.com'
EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
EMAIL_PORT = 587
# Django Rest Swagger
@ -405,7 +405,6 @@ PASSWORD_RESET_TIMEOUT_DAYS = 1
# TEMPLATES
RESETTING_TOKEN_TEMPLATE = 'account/password_reset_email.html'
CHANGE_EMAIL_TEMPLATE = 'account/change_email.html'
CONFIRM_PASSWORD_TEMPLATE = 'account/password_confirm_email.html'
CONFIRM_EMAIL_TEMPLATE = 'authorization/confirm_email.html'
NEWS_EMAIL_TEMPLATE = "news/news_email.html"

11
project/templates/account/password_confirm_email.html
View File

@ -1,11 +0,0 @@
{% load i18n %}{% autoescape off %}
{% blocktrans %}Confirm a password reset for your user account at {{ site_name }}.{% endblocktrans %}
{% trans "Please go to the following page:" %}
https://{{ country_code }}.{{ domain_uri }}/confirm-new-password/{{ uidb64 }}/{{ token }}/
{% trans "Thanks for using our site!" %}
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
{% endautoescape %}