* merge fix

src/xapi/views.py

@@ -50,7 +50,7 @@ def anonymize_statement(x_api_statement):
     x_api_statement.set("actor", {"name": "anonymous", "mbox":  settings.ANON_HASH_PREFIX + ": " + hashed_actor})
 
 
-def shib_connector_resolver(email, provider):
+def shib_connector_resolver_to_pairwaise_id(email, provider):
     if settings.SHIB_ID_CONNECTOR_ENABLED:
       r = None
       if settings.SHIB_ID_CONNECTOR_CACHE:
@@ -87,6 +87,12 @@ def shib_connector_resolver(email, provider):
              r.set(email,shib_id)
              r.expires(email,settings.SHIB_ID_CONNECTOR_CACHE_MAX_AGE*60)
 
+      return shib_id
+    return ""
+
+def shib_connector_resolver(email, provider):
+    if settings.SHIB_ID_CONNECTOR_ENABLED:
+      shib_id = shib_connector_resolver_to_pairwaise_id(email=email, provider=provider)
       # Shib-ID is here the pairwaise id,so we need to resolve to the user email
       try:
          user = CustomUser.objects.get(shibboleth_connector_identifier=shib_id)