1
=== modified file 'tickets/login.py'
2
--- tickets/login.py	2015-08-05 21:21:09 +0000
3
+++ tickets/login.py	2015-08-06 15:25:15 +0000
4
@@ -1,3 +1,6 @@
5
1
import logging
6
2
7
3
from pprint import pformat
8
1
from flask import request, session, redirect
4
from flask import request, session, redirect
9
2
5
10
3
from tickets.app import app, oid
6
from tickets.app import app, oid
11
@@ -7,6 +10,8 @@
12
7
@app.route('/login', methods=['GET', 'POST'])
10
@app.route('/login', methods=['GET', 'POST'])
13
8
@oid.loginhandler
11
@oid.loginhandler
14
9
def login():
12
def login():
15
13
    logging.info('/login got: {}'.format(request.method))
16
14
    logging.info(pformat(request.args))
17
10
    if session.get('nickname'):
15
    if session.get('nickname'):
18
11
        return redirect(oid.get_next_url())
16
        return redirect(oid.get_next_url())
19
12
    openid = request.form.get('openid')
17
    openid = request.form.get('openid')
20
@@ -20,12 +25,16 @@
21
20
25
22
21
@oid.after_login
26
@oid.after_login
23
22
def identify(resp):
27
def identify(resp):
24
28
    logging.info('hi from after_login!')
25
29
    logging.info(pformat(dir(resp)))
26
23
    session.update(
30
    session.update(
27
24
        identity_url=resp.identity_url,
31
        identity_url=resp.identity_url,
28
25
        fullname=resp.fullname,
32
        fullname=resp.fullname,
29
26
        nickname=resp.nickname,
33
        nickname=resp.nickname,
30
27
        email=resp.email,
34
        email=resp.email,
31
28
    )
35
    )
32
36
    logging.info(pformat(session))
33
37
    logging.info(pformat(session.data))
34
29
    return redirect(oid.get_next_url())
38
    return redirect(oid.get_next_url())
35
30
39
36
31
40
37
32
41
38
=== modified file 'tickets/settings.py'
39
--- tickets/settings.py	2015-08-03 07:51:14 +0000
40
+++ tickets/settings.py	2015-08-06 15:25:15 +0000
41
@@ -6,7 +6,7 @@
42
6
6
43
7
logging.basicConfig(
7
logging.basicConfig(
44
8
    level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s')
8
    level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s')
46
9
logging.exception = lambda *ignore: None  # OpenID abuses this, sadly.
9
#logging.exception = lambda *ignore: None  # OpenID abuses this, sadly.
47
10
10
48
11
11
49
12
SESSION_PATH = '/run/shm/bileto/session'
12
SESSION_PATH = '/run/shm/bileto/session'
50
13
13
51
=== modified file 'tickets/static/index.html'
52
--- tickets/static/index.html	2015-08-05 17:34:59 +0000
53
+++ tickets/static/index.html	2015-08-06 15:25:15 +0000
54
@@ -23,7 +23,7 @@
55
23
<div id="login">
23
<div id="login">
56
24
<a href="/logout" ng-show="authenticated">log out {{authenticated}}</a>
24
<a href="/logout" ng-show="authenticated">log out {{authenticated}}</a>
57
25
<form action="/login" method=post ng-hide="authenticated">
25
<form action="/login" method=post ng-hide="authenticated">
59
26
<input type=hidden name=openid value="https://login.ubuntu.com/">
26
<input type=hidden name=openid value="https://login.staging.ubuntu.com/">
60
27
<input type=submit value="Log in with Ubuntu SSO">
27
<input type=submit value="Log in with Ubuntu SSO">
61
28
<input type=hidden name=next value="/">
28
<input type=hidden name=next value="/">
62
29
</form>
29
</form>
Status:	Work in progress
Proposed branch:	lp:~robru/bileto/sso-staging
Merge into:	lp:bileto
Diff against target:	62 lines (+11/-2) 3 files modified tickets/login.py (+9/-0) tickets/settings.py (+1/-1) tickets/static/index.html (+1/-1)
To merge this branch:	bzr merge lp:~robru/bileto/sso-staging
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
CU2D maintainers		2015-08-06	Pending
Review via email: mp+267209@code.launchpad.net