Merge pull request #128 from jkakavas/inacademia2.0

Allow CMService to show additional information

Author: johanlundberg

src/satosa/base.py

@@ -103,8 +103,15 @@ def _auth_req_callback_func(self, context, internal_request):
         state = context.state
         state[STATE_KEY] = {"requester": internal_request.requester}
         # TODO consent module should manage any state it needs by itself
-        context.state[consent.STATE_KEY] = {"filter": internal_request.approved_attributes or [],
-                                            "requester_name": internal_request.requester_name}
+        try:
+            state_dict = context.state[consent.STATE_KEY]
+        except KeyError:
+            state_dict = context.state[consent.STATE_KEY] = {}
+        finally:
+            state_dict.update({
+                "filter": internal_request.approved_attributes or [],
+                "requester_name": internal_request.requester_name,
+            })
         satosa_logging(logger, logging.INFO,
                        "Requesting provider: {}".format(internal_request.requester), state)
 

src/satosa/micro_services/consent.py

@@ -89,7 +89,8 @@ def _approve_new_consent(self, context, internal_response, id_hash):
         }
         if self.locked_attr:
             consent_args["locked_attrs"] = [self.locked_attr]
-
+        if 'requester_logo' in context.state[STATE_KEY]:
+             consent_args["requester_logo"] = context.state[STATE_KEY]['requester_logo']
         try:
             ticket = self._consent_registration(consent_args)
         except (ConnectionError, UnexpectedResponseError) as e: