1.1 --- a/examples/Common/DemoApp.py Sat May 24 15:21:53 2008 +0000
1.2 +++ b/examples/Common/DemoApp.py Sun Aug 24 20:51:10 2008 +0200
1.3 @@ -7,8 +7,6 @@
1.4 # Import the things which make the resource work.
1.5
1.6 from WebStack.Resources.ResourceMap import MapResource
1.7 -from WebStack.Resources.LoginRedirect import LoginRedirectResource, LoginRedirectAuthenticator
1.8 -from WebStack.Resources.Login import LoginResource, LoginAuthenticator
1.9
1.10 # Here are all the test resources.
1.11
1.12 @@ -16,6 +14,8 @@
1.13 from Form import FormResource
1.14 from Sessions import SessionsResource
1.15 from Simple import SimpleResource
1.16 +from SimpleWithLogin import get_site_map as SimpleWithLoginResource
1.17 +from SimpleWithOpenID import get_site_map as SimpleWithOpenIDResource
1.18 from Unicode import UnicodeResource
1.19 from VerySimple import VerySimpleResource
1.20 from Calendar import CalendarResource
1.21 @@ -41,6 +41,7 @@
1.22 <li><a href="sessions">Session information</a></li>
1.23 <li><a href="simple">Simple test</a></li>
1.24 <li><a href="simplewithlogin">Simple with login test</a></li>
1.25 + <li><a href="simplewithopenid">Simple with OpenID test</a></li>
1.26 <li><a href="unicode">Unicode test</a></li>
1.27 <li><a href="verysimple">Very simple test</a></li>
1.28 <li><a href="webdav://localhost:8080/calendar/">Calendar store example</a> - <strong>requires a WebDAV-capable browser</strong><br />
1.29 @@ -54,7 +55,7 @@
1.30 </html>""")
1.31 trans.set_response_code(200)
1.32
1.33 -def get_site():
1.34 +def get_site(app_url, secret_key):
1.35
1.36 "Define the resource mapping."
1.37
1.38 @@ -63,25 +64,8 @@
1.39 "form" : FormResource(),
1.40 "sessions" : SessionsResource(),
1.41 "simple" : SimpleResource(),
1.42 - "simplewithlogin" :
1.43 - LoginRedirectResource(
1.44 - login_url="http://localhost:8080/login",
1.45 - app_url="http://localhost:8080",
1.46 - resource=SimpleResource(),
1.47 - authenticator=LoginRedirectAuthenticator(secret_key="horses"),
1.48 - anonymous_parameter_name="anonymous",
1.49 - logout_parameter_name="logout"
1.50 - ),
1.51 - "login" :
1.52 - LoginResource(
1.53 - LoginAuthenticator(
1.54 - secret_key="horses",
1.55 - credentials=(
1.56 - ("badger", "abc"),
1.57 - ("vole", "xyz"),
1.58 - )
1.59 - )
1.60 - ),
1.61 + "simplewithlogin" : SimpleWithLoginResource(app_url, app_url + "/simplewithlogin/login", secret_key),
1.62 + "simplewithopenid" : SimpleWithOpenIDResource(app_url, app_url + "/simplewithopenid/login", secret_key),
1.63 "unicode" : UnicodeResource(),
1.64 "verysimple" : VerySimpleResource(),
1.65 "calendar" : CalendarResource(),