Copied over mapping and filtering schemas.

[shibboleth/sp.git] / shibsp / attribute / resolver / ResolutionContext.h

diff --git a/shibsp/attribute/resolver/ResolutionContext.h b/shibsp/attribute/resolver/ResolutionContext.h
index 980824a..f791b4f 100644 (file)
--- a/shibsp/attribute/resolver/ResolutionContext.h
+++ b/shibsp/attribute/resolver/ResolutionContext.h
@@ -26,7 +26,6 @@
 #include <shibsp/base.h>
 
 #include <saml/Assertion.h>
-#include <saml/saml2/metadata/Metadata.h>
 
 namespace shibsp {
 
@@ -44,50 +43,6 @@ namespace shibsp {
         ResolutionContext() {}
     public:
         virtual ~ResolutionContext() {}
-
-        /**
-         * Returns the application resolving the attributes.
-         * 
-         * @return  the resolving application
-         */
-        virtual const Application& getApplication() const=0;
-        
-        /**
-         * Returns the address of the client associated with the subject.
-         * 
-         * @return  the client's network address
-         */
-        virtual const char* getClientAddress() const=0;
-
-        /**
-         * Returns the metadata for the IdP associated with the subject, if any.
-         * 
-         * @return the IdP's metadata, or NULL
-         */
-        virtual const opensaml::saml2md::EntityDescriptor* getEntityDescriptor() const=0;
-
-        /**
-         * Returns the NameID associated with the subject
-         * 
-         * <p>SAML 1.x identifiers will be promoted to the 2.0 type.
-         * 
-         * @return a SAML 2.0 NameID associated with the subject, if any
-         */
-        virtual const opensaml::saml2::NameID* getNameID() const=0;
-
-        /**
-         * Returns unresolved tokens associated with the subject, if any.
-         * 
-         * @return pointer to an array of tokens, or NULL
-         */
-        virtual const std::vector<const opensaml::Assertion*>* getTokens() const=0;
-        
-        /**
-         * Returns the active session associated with the subject, if any.
-         * 
-         * @return the active, locked session, or NULL
-         */
-        virtual const Session* getSession() const=0;
         
         /**
          * Returns the set of Attributes resolved and added to the context.
@@ -98,7 +53,7 @@ namespace shibsp {
          * 
          * @return  a mutable array of Attributes.
          */
-        virtual std::vector<Attribute*>& getResolvedAttributes()=0;
+        virtual std::multimap<std::string,Attribute*>& getResolvedAttributes()=0;
 
         /**
          * Returns the set of assertions resolved and added to the context.