need to send the users email to persona if the user logged in with persona.
Thanks callahad for pointing this out.
This commit is contained in:
parent
d87d099dd8
commit
857512e81e
@ -39,11 +39,13 @@ $(document).ready(function () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var logout_url = document.getElementById('_logout_url').value;
|
var logout_url = document.getElementById('_logout_url').value;
|
||||||
|
var persona_user = document.getElementById('_persona_user').value;
|
||||||
|
|
||||||
navigator.id.watch({
|
navigator.id.watch({
|
||||||
|
loggedInUser: persona_user || null,
|
||||||
onlogin: function(assertion) {
|
onlogin: function(assertion) {
|
||||||
document.getElementById('_assertion').value = assertion;
|
document.getElementById('_assertion').value = assertion;
|
||||||
document.getElementById('_persona_login').submit()
|
document.getElementById('_persona_login').submit();
|
||||||
},
|
},
|
||||||
onlogout: function() {
|
onlogout: function() {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
@ -28,5 +28,11 @@
|
|||||||
<input type="hidden" name="assertion" type="text" id="_assertion"/>
|
<input type="hidden" name="assertion" type="text" id="_assertion"/>
|
||||||
<input type="hidden" name="_logout_url" type="text" id="_logout_url"
|
<input type="hidden" name="_logout_url" type="text" id="_logout_url"
|
||||||
value="{{ request.urlgen('mediagoblin.auth.logout') }}"/>
|
value="{{ request.urlgen('mediagoblin.auth.logout') }}"/>
|
||||||
|
<input type="hidden" type="text" id="_persona_user"
|
||||||
|
{% if request.session.get('persona_login_email', False) %}
|
||||||
|
value="{{ request.session['persona_login_email'] }}"/>
|
||||||
|
{% else %}
|
||||||
|
value=""/>
|
||||||
|
{% endif %}
|
||||||
</form>
|
</form>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -64,6 +64,7 @@ def login(request):
|
|||||||
|
|
||||||
if user:
|
if user:
|
||||||
request.session['user_id'] = unicode(user.id)
|
request.session['user_id'] = unicode(user.id)
|
||||||
|
request.session['persona_login_email'] = email
|
||||||
request.session.save()
|
request.session.save()
|
||||||
|
|
||||||
return redirect(request, "index")
|
return redirect(request, "index")
|
||||||
@ -183,6 +184,8 @@ def add(request):
|
|||||||
new_entry.user_id = request.user.id
|
new_entry.user_id = request.user.id
|
||||||
new_entry.save()
|
new_entry.save()
|
||||||
|
|
||||||
|
request.session['persona_login_email'] = email
|
||||||
|
|
||||||
messages.add_message(
|
messages.add_message(
|
||||||
request,
|
request,
|
||||||
messages.SUCCESS,
|
messages.SUCCESS,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user