1 files changed, 8 insertions, 2 deletions

diff --git a/test/OP.cc b/test/OP.cc
index 1196c0c..c919d7f 100644
--- a/test/OP.cc
+++ b/test/OP.cc
@@ -1,64 +1,65 @@
 #include <uuid/uuid.h>
 #include <iostream>
 #include <cassert>
 #include <string>
 #include <ext/algorithm>
 using namespace std;
 #include <kingate/exception.h>
 #include <kingate/plaincgi.h>
 #include <kingate/cgi_gateway.h>
 #include <opkele/exception.h>
 #include <opkele/util.h>
 #include <opkele/uris.h>
 #include <opkele/extension.h>
 #include <opkele/association.h>
 #include <opkele/debug.h>
 #include <opkele/verify_op.h>
+#include <opkele/sreg.h>
 
 #include "sqlite.h"
 #include "kingate_openid_message.h"
 
 static const string get_self_url(const kingate::cgi_gateway& gw) {
     bool s = gw.has_meta("SSL_PROTOCOL_VERSION");
     string rv = s?"https://":"http://";
     rv += gw.http_request_header("Host");
     const string& port = gw.get_meta("SERVER_PORT");
     if( port!=(s?"443":"80") ) {
         rv += ':'; rv += port;
     }
     rv += gw.get_meta("REQUEST_URI");
     string::size_type q = rv.find('?');
     if(q!=string::npos)
         rv.erase(q);
     return rv;
 }
 
 class opdb_t : public sqlite3_t {
     public:
         opdb_t()
             : sqlite3_t("/tmp/OP.db") {
                 assert(_D);
                 char **resp; int nr,nc; char *errm;
                 if(sqlite3_get_table(
                             _D, "SELECT a_op FROM assoc LIMIT 0",
                             &resp,&nr,&nc,&errm)!=SQLITE_OK) {
                     extern const char *__OP_db_bootstrap;
                     DOUT_("Bootstrapping DB");
                     if(sqlite3_exec(_D,__OP_db_bootstrap,NULL,NULL,&errm)!=SQLITE_OK)
                         throw opkele::exception(OPKELE_CP_ string("Failed to boostrap SQLite database: ")+errm);
                 }else
                     sqlite3_free_table(resp);
             }
 };
 
 class example_op_t : public opkele::verify_op {
     public:
         kingate::cgi_gateway& gw;
         opdb_t db;
         kingate::cookie htc;
 
 
         example_op_t(kingate::cgi_gateway& gw)
         : gw(gw) {
             try {
                 htc = gw.cookies.get_cookie("htop_session");
@@ -224,108 +225,113 @@ int main(int argc,char *argv[]) {
             message = "password set";
         }else if(op=="login") {
             example_op_t OP(gw);
             string password = gw.get_param("password");
             sqlite3_mem_t<char*>
                 Sget = sqlite3_mprintf("SELECT s_password FROM setup LIMIT 1");
             sqlite3_table_t T; int nr,nc;
             OP.db.get_table(Sget,T,&nr,&nc);
             if(nr<1)
                 throw opkele::exception(OPKELE_CP_ "no password set");
             if(password!=T.get(1,0,nc))
                 throw opkele::exception(OPKELE_CP_ "wrong password");
             OP.set_authorized(true);
             op.clear();
             message = "logged in";
             OP.cookie_header(cout);
         }else if(op=="logout") {
             example_op_t OP(gw);
             OP.set_authorized(false);
             op.clear();
             message = "logged out";
         }
         string om;
         try { om = gw.get_param("openid.mode"); }catch(kingate::exception_notfound&) { }
         if(op=="xrds") {
             cout <<
                 "Content-type: application/xrds+xml\n\n"
                 "<?xml version='1.0' encoding='utf-8'?>"
                 "<xrds:XRDS xmlns:xrds='xri://$xrds' xmlns='xri://$xrd*($v*2.0)'>"
                  "<XRD>"
                   "<Service>"
                    "<Type>" STURI_OPENID20 "</Type>"
                    "<URI>" << get_self_url(gw) << "</URI>"
                   "</Service>";
             if(gw.has_param("idsel")){
                 cout <<
                     "<Service>"
                      "<Type>" STURI_OPENID20_OP "</Type>"
                      "<URI>" << get_self_url(gw) << "</URI>";
             }
             cout <<
                  "</XRD>"
                 "</xrds:XRDS>";
         }else if(op=="id_res" || op=="cancel") {
             kingate_openid_message_t inm(gw);
             example_op_t OP(gw);
             if(gw.get_param("hts_id")!=OP.htc.get_value())
                 throw opkele::exception(OPKELE_CP_ "toying around, huh?");
-            OP.checkid_(inm,0);
+            opkele::sreg_t sreg;
+            OP.checkid_(inm,sreg);
             OP.cookie_header(cout);
             opkele::openid_message_t om;
             if(op=="id_res") {
                 if(!OP.get_authorized())
                     throw opkele::exception(OPKELE_CP_ "not logged in");
                 if(OP.is_id_select()) {
                     OP.select_identity( get_self_url(gw), get_self_url(gw) );
                 }
+                sreg.set_field(opkele::sreg_t::field_nickname,"anonymous");
+                sreg.set_field(opkele::sreg_t::field_fullname,"Ann O'Nymus");
+                sreg.set_field(opkele::sreg_t::field_gender,"F");
+                sreg.setup_response();
                 cout <<
                     "Status: 302 Going back to RP with id_res\n"
-                    "Location: " << OP.id_res(om).append_query(OP.get_return_to())
+                    "Location: " << OP.id_res(om,sreg).append_query(OP.get_return_to())
                     << "\n\n";
             }else{
                 cout <<
                     "Status: 302 Going back to RP with cancel\n"
                     "Location: " << OP.cancel(om).append_query(OP.get_return_to())
                     << "\n\n";
             }
             om.to_keyvalues(clog);
         }else if(om=="associate") {
             kingate_openid_message_t inm(gw);
             opkele::openid_message_t oum;
             example_op_t OP(gw);
             OP.associate(oum,inm);
             cout << "Content-type: text/plain\n\n";
             oum.to_keyvalues(cout);
         }else if(om=="checkid_setup") {
             kingate_openid_message_t inm(gw);
             example_op_t OP(gw);
             OP.checkid_(inm,0);
             OP.cookie_header(cout) <<
                 "Content-type: text/html\n"
                 "\n"
 
                 "<html>"
                  "<head>"
                   "<title>test OP: confirm authentication</title>"
                  "</head>"
                  "<body>"
                   "realm: " << OP.get_realm() << "<br/>"
                   "return_to: " << OP.get_return_to() << "<br/>"
                   "claimed_id: " << OP.get_claimed_id() << "<br/>"
                   "identity: " << OP.get_identity() << "<br/>";
             if(OP.is_id_select()) {
                 OP.select_identity( get_self_url(gw), get_self_url(gw) );
                 cout <<
                     "selected claimed_id: " << OP.get_claimed_id() << "<br/>"
                     "selected identity: " << OP.get_identity() << "<br/>";
             }
             cout <<
                   "<form method='post'>";
             inm.to_htmlhiddens(cout);
             cout <<
                   "<input type='hidden' name='hts_id'"
                    " value='" << opkele::util::attr_escape(OP.htc.get_value()) << "'/>"
                   "<input type='submit' name='op' value='id_res'/>"
                   "<input type='submit' name='op' value='cancel'/>"
                   "</form>"
                  "</body>"