Merge lp:~maxiberta/canonical-identity-provider/charm-add-openid-session-limit into lp:~ubuntuone-pqm-team/canonical-identity-provider/charm

[Maximiliano Bertacchini]

Add openid_token_limit option (if set, overrides the project's settings.OPENID_TOKEN_LIMIT).

Depends on https://code.launchpad.net/~maxiberta/canonical-identity-provider/openid-session-limit/+merge/373232

[Daniel Manrique (roadmr)]

+1 hohoho

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2019-04-18 20:09:21 +0000
+++ config.yaml	2019-09-26 20:47:01 +0000
@@ -257,6 +257,10 @@
         type: string
         default: "[e-mail]"
         description: "Sender address for SSO-originated emails (password resets, email validation, etc)."
+    openid_token_limit:
+        type: int
+        default: 10
+        description: "Max number of OpenID tokens allowed in a user session."
     openid_token_ttl:
         type: int
         default: 86400

=== modified file 'templates/settings.py.j2'
--- templates/settings.py.j2	2019-04-19 10:59:33 +0000
+++ templates/settings.py.j2	2019-09-26 20:47:01 +0000
@@ -99,6 +99,9 @@
 OOPSES['template']['reporter'] = '{{ oops_reporter }}'
 OPENID_LAUNCHPAD_STAFF_TEAMS = {{ openid_launchpad_staff_teams }}
 OPENID_LAUNCHPAD_TEAMS_MAPPING = {{ openid_launchpad_teams_mapping }}
+{% if openid_token_limit %}
+OPENID_TOKEN_LIMIT = {{ openid_token_limit }}
+{% endif %}
 {% if openid_token_ttl %}
 OPENID_TOKEN_TTL = {{ openid_token_ttl }}
 {% endif %}