heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added rudimentary route "mounting" w/ werkzeug routes; fixed auth routes

Browse Source 
auth routes fixes:
 - mounted the auth routes at /auth/
 - removed crufty old verification email route
This commit is contained in:
Christopher Allan Webber 2012-10-14 16:26:23 -05:00
parent 1ec7ff2adb
commit 0d857844b1
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
mediagoblin/auth/routing.py
View File

@ -14,36 +14,22 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin.routing import add_route
add_route('mediagoblin.auth.logout', auth_routes = [
'/auth/logout/', 'mediagoblin.auth.views:logout') ('mediagoblin.auth.logout',
'/logout/', 'mediagoblin.auth.views:logout'),
('mediagoblin.auth.register', '/register/',
add_route('mediagoblin.auth.register', '/register/', 'mediagoblin.auth.views:register'),
'mediagoblin.auth.views:register') ('mediagoblin.auth.login', '/login/',
'mediagoblin.auth.views:login'),
add_route('mediagoblin.auth.login', '/login/', ('mediagoblin.auth.logout', '/logout/',
'mediagoblin.auth.views:login') 'mediagoblin.auth.views:logout'),
('mediagoblin.auth.verify_email', '/verify_email/',
add_route('mediagoblin.auth.logout', '/logout/', 'mediagoblin.auth.views:verify_email'),
'mediagoblin.auth.views:logout') ('mediagoblin.auth.resend_verification', '/resend_verification/',
'mediagoblin.auth.views:resend_activation'),
add_route('mediagoblin.auth.verify_email', '/verify_email/', ('mediagoblin.auth.forgot_password', '/forgot_password/',
'mediagoblin.auth.views:verify_email') 'mediagoblin.auth.views:forgot_password'),
('mediagoblin.auth.verify_forgot_password',
add_route('mediagoblin.auth.resend_verification', '/resend_verification/', '/forgot_password/verify/',
'mediagoblin.auth.views:resend_activation') 'mediagoblin.auth.views:verify_forgot_password')]
# XXX: Does this work?
add_route('mediagoblin.auth.resend_verification_success',
'/resend_verification_success/',
# template='mediagoblin/auth/resent_verification_email.html',
'mediagoblin.views:simple_template_render')
add_route('mediagoblin.auth.forgot_password', '/forgot_password/',
'mediagoblin.auth.views:forgot_password')
add_route('mediagoblin.auth.verify_forgot_password',
'/forgot_password/verify/',
'mediagoblin.auth.views:verify_forgot_password')

15
mediagoblin/routing.py
View File

@ -21,15 +21,28 @@ url_map = Map()
view_functions = {'index': 'mediagoblin.views:index'} view_functions = {'index': 'mediagoblin.views:index'}
def add_route(endpoint, url, controller): def add_route(endpoint, url, controller):
"""
Add a route to the url mapping
"""
view_functions.update({endpoint: controller}) view_functions.update({endpoint: controller})
url_map.add(Rule(url, endpoint=endpoint)) url_map.add(Rule(url, endpoint=endpoint))
def mount(mountpoint, routes):
"""
Mount a bunch of routes to this mountpoint
"""
for endpoint, url, controller in routes:
url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
add_route(endpoint, url, controller)
add_route('index', '/', 'mediagoblin.views:root_view') add_route('index', '/', 'mediagoblin.views:root_view')
import mediagoblin.submit.routing import mediagoblin.submit.routing
import mediagoblin.user_pages.routing import mediagoblin.user_pages.routing
import mediagoblin.auth.routing
import mediagoblin.edit.routing import mediagoblin.edit.routing
import mediagoblin.webfinger.routing import mediagoblin.webfinger.routing
import mediagoblin.listings.routing import mediagoblin.listings.routing
from mediagoblin.auth.routing import auth_routes
mount('/auth', auth_routes)

2
mediagoblin/submit/routing.py
View File

@ -18,4 +18,4 @@ from mediagoblin.routing import add_route
add_route('mediagoblin.submit.start', add_route('mediagoblin.submit.start',
'/submit/', 'mediagoblin.submit.views:submit_start') '/submit/', 'mediagoblin.submit.views:submit_start')
add_route('collection_home', '/submit/collection', 'mediagoblin.submit.views:add_collection') add_route('mediagoblin.submit.collection', '/submit/collection', 'mediagoblin.submit.views:add_collection')