Skip to content

Commit 78697e9

Browse files
authored
Merge pull request #39 from mekanix/feature/registration
Feature/registration
2 parents 4c50275 + 738000e commit 78697e9

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

freenit/api/auth.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ def post(self, args):
140140
}
141141
host = request.headers.get('Origin', request.url_root)
142142
requestToken = create_access_token(identity, expires_delta=expires)
143-
url = f'{host}/confirm/{requestToken}'
143+
confirm = 'confirm'
144+
if host[:-1] != '/':
145+
confirm = f'/{confirm}'
146+
url = f'{host}{confirm}/{requestToken}'
144147
msg = MIMEText(url, 'plain', 'utf-8')
145148
config = current_app.config
146149
subject = config['SUBJECTS']['prefix'] + config['SUBJECTS']['register']
@@ -155,7 +158,7 @@ def post(self, args):
155158
class AuthRegisterConfirmAPI(MethodView):
156159
@blueprint.response(UserSchema)
157160
def get(self, token):
158-
"""Register new user"""
161+
"""Confirm new user"""
159162
decoded_token = decode_token(token)
160163
identity = decoded_token['identity']
161164
User = current_app.user_datastore.user_model
@@ -200,9 +203,11 @@ def post(self, args):
200203
url = f'{host}/reset/{resetToken}'
201204
msg = MIMEText(url, 'plain', 'utf-8')
202205
msg['From'] = 'office@example.com'
203-
msg['Subject'] = 'Freenit message'
204-
to = ['meka@tilda.center']
205-
current_app.sendmail(to, msg)
206+
subjects = current_app.config['SUBJECTS']
207+
subject = subjects['prefix'] + subjects['register']
208+
msg['Subject'] = subject
209+
msg['To'] = user.email
210+
current_app.sendmail(msg)
206211
except User.DoesNotExist:
207212
pass
208213
return {}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
setup(
1111
name='freenit',
12-
version='0.0.27',
12+
version='0.0.28',
1313
description='REST API framework based on Flask-Smorest',
1414
long_description=README,
1515
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)