Fixed #19. Used configuration option for public url instead of using url_for function.

Author: akbargumbira

users/__init__.py

@@ -12,6 +12,7 @@
 
 from users.config import (
     PROJECT_NAME,
+    PUBLIC_URL,
     PROJECT_FAVICON_FILE,
     MAIL_CONFIG,
     SQLITE_DB_PATH,
@@ -94,6 +95,7 @@ def setup_logger():
 
 # Load configuration
 APP.config['PROJECT_NAME'] = PROJECT_NAME
+APP.config['PUBLIC_URL'] = PUBLIC_URL
 APP.config['PROJECT_FAVICON_FILE'] = PROJECT_FAVICON_FILE
 APP.config.update(MAIL_CONFIG)
 mail = Mail(APP)

users/config.py.prod

@@ -6,6 +6,11 @@ import os
 # It would override page title, email confirmation to user, so on.
 PROJECT_NAME = 'InaSAFE'
 
+# PUBLIC_URL: Public URL that is used for publishing this apps.
+# It will be used for detail of the email confirmation, and other things if
+# it's needed
+PUBLIC_URL = 'http://users.inasafe.org'
+
 # PROJECT_FAVICON_FILE: Path to project favicon file
 PROJECT_FAVICON_FILE = '/users/static/img/user-icon.png'
 

users/config.py.test

@@ -6,6 +6,12 @@ import os
 # It would override page title, email confirmation to user, so on.
 PROJECT_NAME = 'InaSAFE'
 
+# PUBLIC_URL: Public URL that is used for publishing this apps.
+# It will be used for detail of the email confirmation, and other things if
+# it's needed
+PUBLIC_URL = 'http://users.inasafe.org'
+
+
 # PROJECT_FAVICON_FILE: Path to project favicon file
 PROJECT_FAVICON_FILE = '/users/static/img/user-icon.png'
 

users/templates/text/registration_confirmation_email.txt

@@ -18,7 +18,7 @@ to the centre of your nearest town / state or province or country).
 
 Deleting or editing your user record does not require a user name or password, only that
 you click on this unique (for your user record) link below:
-    - Link: {{ url }}edit/{{ user.guid }}
+    - Link: {{ url }}/edit/{{ user.guid }}
 
 If you have ever forget your special link above, you can request this message to be
 resent to you by using the 'I forgot my edit link' menu on {{ url }}.

users/views.py

@@ -5,7 +5,7 @@
 """
 import json
 
-from flask import render_template, Response, request, url_for
+from flask import render_template, Response, request
 from werkzeug.exceptions import default_exceptions
 
 # App declared directly in __init__ as per
@@ -167,7 +167,7 @@ def add_user_view():
     body = render_template(
         'text/registration_confirmation_email.txt',
         project_name=APP.config['PROJECT_NAME'],
-        url=url_for('map_view', _external=True),
+        url=APP.config['PUBLIC_URL'],
         user=added_user)
     recipient = added_user['email']
     send_async_mail(
@@ -330,7 +330,7 @@ def delete_user_view(guid):
     """
     # Delete User
     delete_user(guid)
-    return url_for('map_view')
+    return APP.config['PUBLIC_URL']
 
 
 @APP.route('/download')
@@ -388,7 +388,7 @@ def reminder_view():
     body = render_template(
         'text/registration_confirmation_email.txt',
         project_name=APP.config['PROJECT_NAME'],
-        url=url_for('map_view', _external=True),
+        url=APP.config['PUBLIC_URL'],
         user=user)
     send_async_mail(
         sender=MAIL_ADMIN,