Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/missing-glue into lp:canonical-identity-provider/release

  1. missing-glue
  2. Merge into trunk
Proposed by Simon Davy
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 312
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/missing-glue
Merge into: lp:canonical-identity-provider/release
Diff against target: 12 lines (+1/-1)
1 file modified
identityprovider/views/ui.py (+1/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/missing-glue
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+90502@code.launchpad.net

Commit message

Added check to actual account.twofactor_required in user_requires_twofactor_auth

Description of the change

Added check to actual account.twofactor_required in user_requires_twofactor_auth

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/views/ui.py'
2--- identityprovider/views/ui.py 2012-01-27 15:22:17 +0000
3+++ identityprovider/views/ui.py 2012-01-27 18:26:26 +0000
4@@ -101,7 +101,7 @@
5 def user_requires_twofactor_auth(account):
6 if not gargoyle.is_active('TWOFACTOR'):
7 return False
8- return False
9+ return account.twofactor_required
10
11
12 # this exeption and following 2 methods handle the authentication business