diff options
Diffstat (limited to 'sca-cpp/trunk/modules/openid')
-rw-r--r-- | sca-cpp/trunk/modules/openid/Makefile.am | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/openid/htdocs/index.html | 11 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/openid/htdocs/public/index.html (renamed from sca-cpp/trunk/modules/openid/htdocs/unprotected/index.html) | 0 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-conf | 7 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/openid/openid.composite | 1 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/openid/user-info.scm | 10 |
6 files changed, 20 insertions, 11 deletions
diff --git a/sca-cpp/trunk/modules/openid/Makefile.am b/sca-cpp/trunk/modules/openid/Makefile.am index ba6e523ad2..a46dd56743 100644 --- a/sca-cpp/trunk/modules/openid/Makefile.am +++ b/sca-cpp/trunk/modules/openid/Makefile.am @@ -25,7 +25,7 @@ mod_DATA = openid.prefix openid.prefix: $(top_builddir)/config.status echo ${MODAUTHOPENID_PREFIX} >openid.prefix -EXTRA_DIST = openid.composite user-info.scm htdocs/index.html htdocs/login/index.html htdocs/logout/index.html htdocs/unprotected/index.html +EXTRA_DIST = openid.composite user-info.scm htdocs/index.html htdocs/login/index.html htdocs/logout/index.html htdocs/public/index.html dist_noinst_SCRIPTS = start-test stop-test diff --git a/sca-cpp/trunk/modules/openid/htdocs/index.html b/sca-cpp/trunk/modules/openid/htdocs/index.html index c2dfc791e6..cdc65a4e37 100644 --- a/sca-cpp/trunk/modules/openid/htdocs/index.html +++ b/sca-cpp/trunk/modules/openid/htdocs/index.html @@ -22,9 +22,10 @@ <script type="text/javascript" src="/js/ref.js"></script> <script type="text/javascript"> var protected = component("Protected"); -var userInfo = reference(protected, "userInfo"); -var user = userInfo.apply("getuser"); -var email = userInfo.apply("getemail"); +var userInfo = defun(reference(protected, "userInfo"), "getuser", "getemail", "getrealm"); +var user = userInfo.getuser(); +var email = userInfo.getemail(); +var realm = userInfo.getrealm(); </script> </head> <body> @@ -32,12 +33,14 @@ var email = userInfo.apply("getemail"); <p>The following info is returned by a JSONRPC service:</p> <div id="user"></div> <div id="email"></div> +<div id="realm"></div> <script type="text/javascript"> document.getElementById('user').innerHTML="User: " + user; document.getElementById('email').innerHTML="Email: " + email; +document.getElementById('realm').innerHTML="Realm: " + realm; </script> <p><a href="info">User info</a></p> <p><a href="login">Sign in</a></p> <p><a href="logout">Sign out</a></p> -<p><a href="unprotected">Unprotected area</a></p> +<p><a href="public">Public area</a></p> </body></html> diff --git a/sca-cpp/trunk/modules/openid/htdocs/unprotected/index.html b/sca-cpp/trunk/modules/openid/htdocs/public/index.html index af2cd7ca19..af2cd7ca19 100644 --- a/sca-cpp/trunk/modules/openid/htdocs/unprotected/index.html +++ b/sca-cpp/trunk/modules/openid/htdocs/public/index.html diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf index 95cdb1945c..839b58b554 100755 --- a/sca-cpp/trunk/modules/openid/openid-conf +++ b/sca-cpp/trunk/modules/openid/openid-conf @@ -47,14 +47,17 @@ AuthOpenIDAXAdd FIRSTNAME http://axschema.org/namePerson/first AuthOpenIDAXAdd LASTNAME http://axschema.org/namePerson/last </Location> -# Enable unauthenticated access to unprotected areas +# Enable unauthenticated access to public areas <Location /login> AuthOpenIDEnabled Off </Location> <Location /logout> AuthOpenIDEnabled Off </Location> -<Location /unprotected> +<Location /public> +AuthOpenIDEnabled Off +</Location> +<Location /ui> AuthOpenIDEnabled Off </Location> diff --git a/sca-cpp/trunk/modules/openid/openid.composite b/sca-cpp/trunk/modules/openid/openid.composite index 016139a9a7..08bb74b7c7 100644 --- a/sca-cpp/trunk/modules/openid/openid.composite +++ b/sca-cpp/trunk/modules/openid/openid.composite @@ -34,6 +34,7 @@ </service> <property name="user">anonymous</property> <property name="email">anonymous@example.com</property> + <property name="realm">example.com</property> </component> </composite> diff --git a/sca-cpp/trunk/modules/openid/user-info.scm b/sca-cpp/trunk/modules/openid/user-info.scm index 69eb207be9..b1ef74c6bd 100644 --- a/sca-cpp/trunk/modules/openid/user-info.scm +++ b/sca-cpp/trunk/modules/openid/user-info.scm @@ -17,10 +17,12 @@ ; OpenID support test case -(define (get id user email) (list "text/html" (list - "<html><body><p>The following info is generated on the server:</p><div>User: " (user) "</div><div>Email: " (email) "</div></body></html>"))) +(define (get id user email realm) (list "text/html" (list + "<html><body><p>The following info is generated on the server:</p><div>User: " (user) "</div><div>Email: " (email) "</div><div>Realm: " (realm) "</div></body></html>"))) -(define (getuser user email) (user)) +(define (getuser user email realm) (user)) -(define (getemail user email) (email)) +(define (getemail user email realm) (email)) + +(define (getrealm user email realm) (realm)) |