From 30a0c5bfe9af806f2153dac6f294241720b7731c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Smodi=C5=A1?= <aless@guru.si>
Date: Mon, 2 Nov 2015 21:48:49 +0100
Subject: Modified the python server to support SAML account merge/upgrade upon
 first SAML-type login of an existing user.

---
 errors/session.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'errors')

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
-- 
cgit v1.2.1