author | Michael Krelin <hacker@klever.net> | 2009-12-22 21:40:18 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-12-22 21:40:18 (UTC) |
commit | 282e937cefbca9ebb564e83e79f5e5b136ec960d (patch) (unidiff) | |
tree | 31c2ae20899825157b90216f1e1c71ee1c7e1122 /include | |
parent | 142ca30cad85769067419a9ed5b60501af67e17c (diff) | |
download | libopkele-282e937cefbca9ebb564e83e79f5e5b136ec960d.zip libopkele-282e937cefbca9ebb564e83e79f5e5b136ec960d.tar.gz libopkele-282e937cefbca9ebb564e83e79f5e5b136ec960d.tar.bz2 |
minor cleanup of ax/oauth code
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/ax.h | 6 | ||||
-rw-r--r-- | include/opkele/oauth_ext.h | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/opkele/ax.h b/include/opkele/ax.h index 996d756..ba629c1 100644 --- a/include/opkele/ax.h +++ b/include/opkele/ax.h | |||
@@ -6,18 +6,18 @@ | |||
6 | * @brief Attribute Exchange extension | 6 | * @brief Attribute Exchange extension |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <opkele/extension.h> | 9 | #include <opkele/extension.h> |
10 | 10 | ||
11 | namespace opkele { | 11 | namespace opkele { |
12 | 12 | ||
13 | /** | 13 | /** |
14 | * OpenID simple registration extension implementation | 14 | * OpenID attribute exchange extension implementation |
15 | * http://openid.net/specs/openid-simple-registration-extension-1_0.html | 15 | * http://openid.net/specs/openid-attribute-exchange-1_0.html |
16 | */ | 16 | */ |
17 | class ax_t : public extension_t { | 17 | class ax_t : public extension_t { |
18 | public: | 18 | public: |
19 | /** special "count" value for add_attribute to request fetching "as many values as possible". */ | 19 | /** special "count" value for add_attribute to request fetching "as many values as possible". */ |
20 | static const int UNLIMITED_COUNT = -1; | 20 | static const int UNLIMITED_COUNT = -1; |
21 | 21 | ||
22 | /** | 22 | /** |
23 | * Optional URL for receiving future attribute updates. | 23 | * Optional URL for receiving future attribute updates. |
@@ -75,10 +75,10 @@ namespace opkele { | |||
75 | std::vector<ax_attr_t> attrs; | 75 | std::vector<ax_attr_t> attrs; |
76 | unsigned int alias_count; // auto-incr counter for auto-named aliases | 76 | unsigned int alias_count; // auto-incr counter for auto-named aliases |
77 | 77 | ||
78 | /** Stores results from fetch response during id_res. */ | 78 | /** Stores results from fetch response during id_res. */ |
79 | std::map<std::string, std::vector<std::string> > response_attrs; | 79 | std::map<std::string, std::vector<std::string> > response_attrs; |
80 | }; | 80 | }; |
81 | } | 81 | } |
82 | 82 | ||
83 | #endif /* __OPKELE_SREG_H */ | 83 | #endif /* __OPKELE_AX_H */ |
84 | 84 | ||
diff --git a/include/opkele/oauth_ext.h b/include/opkele/oauth_ext.h index 37a826b..657defa 100644 --- a/include/opkele/oauth_ext.h +++ b/include/opkele/oauth_ext.h | |||
@@ -13,25 +13,16 @@ namespace opkele { | |||
13 | /** | 13 | /** |
14 | * OpenID OAuth extension | 14 | * OpenID OAuth extension |
15 | * http://step2.googlecode.com/svn/spec/openid_oauth_extension/latest/openid_oauth_extension.html | 15 | * http://step2.googlecode.com/svn/spec/openid_oauth_extension/latest/openid_oauth_extension.html |
16 | */ | 16 | */ |
17 | class oauth_ext_t : public extension_t { | 17 | class oauth_ext_t : public extension_t { |
18 | public: | 18 | public: |
19 | std::string m_consumer, m_scope, m_request_token; | 19 | std::string m_consumer, m_scope, m_request_token; |
20 | 20 | ||
21 | /** | ||
22 | * Consumer constructor. | ||
23 | * @param fr required fields | ||
24 | * @see fields_required | ||
25 | * @param fo optional fields | ||
26 | * @see fields_optional | ||
27 | * @param pu policy url | ||
28 | * @see policy_url | ||
29 | */ | ||
30 | oauth_ext_t(const char *consumer = "", const char *scope = "") : m_consumer(consumer), m_scope(scope) { } | 21 | oauth_ext_t(const char *consumer = "", const char *scope = "") : m_consumer(consumer), m_scope(scope) { } |
31 | 22 | ||
32 | virtual void rp_checkid_hook(basic_openid_message& om); | 23 | virtual void rp_checkid_hook(basic_openid_message& om); |
33 | virtual void rp_id_res_hook(const basic_openid_message& om, | 24 | virtual void rp_id_res_hook(const basic_openid_message& om, |
34 | const basic_openid_message& sp); | 25 | const basic_openid_message& sp); |
35 | virtual void op_checkid_hook(const basic_openid_message& inm); | 26 | virtual void op_checkid_hook(const basic_openid_message& inm); |
36 | virtual void op_id_res_hook(basic_openid_message& oum); | 27 | virtual void op_id_res_hook(basic_openid_message& oum); |
37 | 28 | ||