slight api improvement to ease caching of discovery information

* added opend_endpoint_output_iterator to types.h
* changed endpoint_discovery_iterator to the aforementioned iterator typedef
* added discover() virtual to prequeue_RP and made use thereof.

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/prequeue_rp.cc b/lib/prequeue_rp.cc
index 3aa960f..ed1ddfe 100644
--- a/lib/prequeue_rp.cc
+++ b/lib/prequeue_rp.cc
@@ -35,47 +35,52 @@ namespace opkele {
                     if(oep.local_id==id)
                         throw __OP_verifier_good_input(OPKELE_CP_ "Found corresponding endpoint");
                 }
                 return *this;
             }
 
             OP_verifier& operator++() { return *this; }
             OP_verifier& operator++(int) { return *this; }
     };
 
     void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& identity) const {
         try {
-            idiscover(OP_verifier(OP,identity),claimed_id);
+            discover(OP_verifier(OP,identity),claimed_id);
             throw id_res_unauthorized(OPKELE_CP_
                     "OP is not authorized to make an assertion regarding the identity");
         }catch(__OP_verifier_good_input& ovgi) {
         }
     }
 
     class endpoint_queuer : public iterator<output_iterator_tag,openid_endpoint_t,void> {
         public:
             prequeue_RP& rp;
 
             endpoint_queuer(prequeue_RP& r) : rp(r) { }
 
             endpoint_queuer& operator*() { return *this; }
             endpoint_queuer& operator=(const openid_endpoint_t& oep) {
                 rp.queue_endpoint(oep); return *this; }
 
             endpoint_queuer& operator++() { return *this; }
             endpoint_queuer& operator++(int) { return *this; }
     };
 
     void prequeue_RP::initiate(const string& usi) {
         begin_queueing();
-        set_normalized_id( idiscover(endpoint_queuer(*this),usi) );
+        set_normalized_id( discover(endpoint_queuer(*this),usi) );
         end_queueing();
     }
 
     void prequeue_RP::set_normalized_id(const string&) {
     }
 
     const string prequeue_RP::get_normalized_id() const {
         throw not_implemented(OPKELE_CP_ "get_normalized_id() is not implemented");
     }
 
+    const string prequeue_RP::discover(openid_endpoint_output_iterator it,
+            const string& id) const {
+        return idiscover(it,id);
+    }
+
 }