| -rw-r--r-- | include/opkele/types.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h index bf50e2b..f63bf5d 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h @@ -109,68 +109,64 @@ namespace opkele { /** * check whether the association is expired. * @return true if expired */ virtual bool is_expired() const = 0; }; /** * the shared_ptr<> for association_t object type */ typedef tr1mem::shared_ptr<association_t> assoc_t; - class basic_message { + class basic_fields { public: typedef util::forward_iterator_proxy< string,const string&,const string* > fields_iterator; - basic_message() { } - virtual ~basic_message() { } - basic_message(const basic_message& x); - void copy_to(basic_message& x) const; - void append_to(basic_message& x) const; + basic_fields() { } + virtual ~basic_fields() { } + basic_fields(const basic_fields& x); + void copy_to(basic_fields& x) const; + void append_to(basic_fields& x) const; virtual bool has_field(const string& n) const = 0; virtual const string& get_field(const string& n) const = 0; virtual fields_iterator fields_begin() const = 0; virtual fields_iterator fields_end() const = 0; virtual string append_query(const string& url,const char *pfx=0) const; virtual string query_string(const char *pfx=0) const; virtual void reset_fields(); virtual void set_field(const string& n,const string& v); virtual void reset_field(const string& n); }; - class basic_openid_message : public basic_message { + class basic_openid_message : public basic_fields { public: - typedef list<string> fields_t; - typedef util::forward_iterator_proxy< - string,const string&,const string* - > fields_iterator; basic_openid_message() { } basic_openid_message(const basic_openid_message& x); virtual bool has_ns(const string& uri) const; virtual string get_ns(const string& uri) const; virtual string append_query(const string& url,const char *pfx="openid.") const { - return basic_message::append_query(url,pfx); } + return basic_fields::append_query(url,pfx); } virtual string query_string(const char *pfx="openid.") const { - return basic_message::query_string(pfx); } + return basic_fields::query_string(pfx); } virtual void from_keyvalues(const string& kv); virtual void to_keyvalues(ostream& o) const; virtual void to_htmlhiddens(ostream& o,const char* pfx=0) const; void add_to_signed(const string& fields); string find_ns(const string& uri,const char *pfx) const; string allocate_ns(const string& uri,const char *pfx); }; class openid_message_t : public basic_openid_message, public map<string,string> { |