Milimetric has submitted this change and it was merged.

Change subject: simplifying login redirect
......................................................................


simplifying login redirect

Change-Id: I95c4e3b3a20fa35bb021fa4dff2de93457416f75
---
M wikimetrics/config/web_config.yaml
M wikimetrics/controllers/authentication.py
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved



diff --git a/wikimetrics/config/web_config.yaml 
b/wikimetrics/config/web_config.yaml
index cffcfce..7c8186d 100644
--- a/wikimetrics/config/web_config.yaml
+++ b/wikimetrics/config/web_config.yaml
@@ -1,3 +1,8 @@
+# Not to worry, these values are not used in production
+# I just include them here so you can get up and running with
+# wikimetrics without too much configuration.  But different
+# SECRET_KEY and GOOGLE_CLIENT_SECRET are in use in production,
+# generated to work with the production URL.
 SECRET_KEY  : 'sw3lo(*A98ijwl3i3n&&JEK MSL IESKU* WSkl#iIREJSslsijsle ssie'
 DEBUG       : True
 
diff --git a/wikimetrics/controllers/authentication.py 
b/wikimetrics/controllers/authentication.py
index e74c8ab..ae9e10c 100644
--- a/wikimetrics/controllers/authentication.py
+++ b/wikimetrics/controllers/authentication.py
@@ -41,8 +41,8 @@
         and not getattr(app.view_functions[request.endpoint], 'is_public', 
False)
     ):
         # TODO: make request.url relative or check X-Forwarded-Proto to match 
the protocol
-        flash('Please Login before visiting {0}'.format(request.url), 'info')
-        return redirect(url_for('login', next=request.url))
+        flash('Please Login before visiting {0}'.format(request.path), 'info')
+        return redirect(url_for('login', next=request.path))
 
 
 @login_manager.user_loader

-- 
To view, visit https://gerrit.wikimedia.org/r/84981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I95c4e3b3a20fa35bb021fa4dff2de93457416f75
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <dandree...@wikimedia.org>
Gerrit-Reviewer: Milimetric <dandree...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to