summaryrefslogtreecommitdiff
path: root/errors
diff options
context:
space:
mode:
authorAleš Smodiš <aless@guru.si>2015-11-02 21:48:49 +0100
committerAleš Smodiš <aless@guru.si>2015-11-02 21:48:49 +0100
commit30a0c5bfe9af806f2153dac6f294241720b7731c (patch)
tree1acef84f7850c870ee073785021f9e8a6733cc0a /errors
parent6eb1d0b4f3c15497532eb0bb24d4147e5910f56e (diff)
Modified the python server to support SAML account merge/upgrade upon first SAML-type login of an existing user.
Diffstat (limited to 'errors')
-rw-r--r--errors/session.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/errors/session.py b/errors/session.py
index a09c4ec..ce35dca 100644
--- a/errors/session.py
+++ b/errors/session.py
@@ -20,3 +20,9 @@ class RequestProcessingError(Exception):
class NotLoggedIn(Exception):
pass
+
+class AccountMergeRequired(Exception):
+
+ def __init__(self, username):
+ Exception.__init__(self)
+ self.username = username # the username which is required to be logged in, in order to merge the accounts