[Checkins] SVN: Products.CMF auto_login_page, unauth_page, logout_page no longer properties.
Charlie Clark
charlie at begeistert.org
Sat Apr 24 13:43:37 EDT 2010
Log message for revision 111381:
auto_login_page, unauth_page, logout_page no longer properties.
Changed:
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CookieCrumbler.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/exportimport/tests/test_cookieauth.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/interfaces/_cookieCrumbler.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_CookieCrumbler.py
U Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/cookieauth.xml
-=-
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CookieCrumbler.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CookieCrumbler.py 2010-04-24 17:41:31 UTC (rev 111380)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CookieCrumbler.py 2010-04-24 17:43:37 UTC (rev 111381)
@@ -83,12 +83,6 @@
'label':'User password form variable'},
{'id':'persist_cookie', 'type': 'string', 'mode':'w',
'label':'User name persistence form variable'},
- {'id':'auto_login_page', 'type': 'string', 'mode':'w',
- 'label':'Login page ID'},
- {'id':'logout_page', 'type': 'string', 'mode':'w',
- 'label':'Logout page ID'},
- {'id':'unauth_page', 'type': 'string', 'mode':'w',
- 'label':'Failed authorization page ID'},
{'id':'local_cookie_path', 'type': 'boolean', 'mode':'w',
'label':'Use cookie paths to limit scope'},
{'id':'cache_header_value', 'type': 'string', 'mode':'w',
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/exportimport/tests/test_cookieauth.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/exportimport/tests/test_cookieauth.py 2010-04-24 17:41:31 UTC (rev 111380)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/exportimport/tests/test_cookieauth.py 2010-04-24 17:43:37 UTC (rev 111381)
@@ -35,9 +35,6 @@
<property name="name_cookie">__ac_name</property>
<property name="pw_cookie">__ac_password</property>
<property name="persist_cookie">__ac_persistent</property>
- <property name="auto_login_page">login_form</property>
- <property name="logout_page">logged_out</property>
- <property name="unauth_page"></property>
<property name="local_cookie_path">False</property>
<property name="cache_header_value">private</property>
<property name="log_username">True</property>
@@ -51,9 +48,6 @@
<property name="name_cookie">__ac_name</property>
<property name="pw_cookie">__ac_password</property>
<property name="persist_cookie">__ac_persistent</property>
- <property name="auto_login_page">login_form</property>
- <property name="logout_page">logged_out</property>
- <property name="unauth_page"></property>
<property name="local_cookie_path">False</property>
<property name="cache_header_value">private</property>
<property name="log_username">True</property>
@@ -67,9 +61,6 @@
<property name="name_cookie">value3</property>
<property name="pw_cookie">value5</property>
<property name="persist_cookie">value4</property>
- <property name="auto_login_page">value6</property>
- <property name="logout_page">value8</property>
- <property name="unauth_page">value7</property>
<property name="local_cookie_path">True</property>
<property name="cache_header_value">value2</property>
<property name="log_username">False</property>
@@ -107,9 +98,6 @@
cc.persist_cookie = 'value4'
cc.pw_cookie = 'value5'
cc.local_cookie_path = 1
- cc.auto_login_page = 'value6'
- cc.unauth_page = 'value7'
- cc.logout_page = 'value8'
return site
@@ -169,9 +157,6 @@
self.assertEqual( cc.persist_cookie, 'value4' )
self.assertEqual( cc.pw_cookie, 'value5' )
self.assertEqual( cc.local_cookie_path, 1 )
- self.assertEqual( cc.auto_login_page, 'value6' )
- self.assertEqual( cc.unauth_page, 'value7' )
- self.assertEqual( cc.logout_page, 'value8' )
def test_suite():
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/interfaces/_cookieCrumbler.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/interfaces/_cookieCrumbler.py 2010-04-24 17:41:31 UTC (rev 111380)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/interfaces/_cookieCrumbler.py 2010-04-24 17:43:37 UTC (rev 111381)
@@ -28,10 +28,6 @@
the parent URL if local_cookie_path is True otherwise /"""
return path
- def getCookieMethod(name, default=None):
- """ Allow overridable cookie set/expiration methods."""
- return getattr(name, default)
-
def defaultSetAuthCookie(resp, cookie_name, cookie_value):
"""Set the authorisation cookie"""
@@ -56,14 +52,11 @@
"""The __before_publishing_traverse__ hook."""
def credentialsChanged(user, name, pw):
- """# XXX: this method violates the rules for tools/utilities:
+ """
+ Deprecated
+ # XXX: this method violates the rules for tools/utilities:
# it depends on self.REQUEST """
- def logout():
- """
- Logs out the user and redirects to the logout page.
- """
-
def propertyLabel(id):
"""Return a label for the given property id
"""
\ No newline at end of file
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_CookieCrumbler.py 2010-04-24 17:41:31 UTC (rev 111380)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_CookieCrumbler.py 2010-04-24 17:43:37 UTC (rev 111381)
@@ -368,6 +368,26 @@
bt_removed = getattr(container, '__before_traverse__')
self.assertEqual(len(bt_removed.items()), 0)
+ # def test_url_from_script(self):
+ # """Check the right URL to redirect to is returned"""
+ # from zope.component import getSiteManager, getUtility
+ # from Products.CMFCore.tests.base.dummy import \
+ # DummySite, DummyTool, DummyObject
+ # root, cc, req, credentials = self._makeSite()
+ # root = DummySite("Dummy Portal")
+ # from Products.CMFCore.URLTool import URLTool
+ # from Products.CMFCore.interfaces import IURLTool
+ # sm = getSiteManager()
+ # utool = URLTool()
+ # sm.registerUtility(utool, IURLTool)
+ # root._setObject('portal_url', utool)
+ # from Products.CMFCore import utils
+ # utool = utils.getToolByName(cc, 'portal_url')
+ # login = root._getOb('login_form')
+ # # print login.absolute_url()
+ # self.assertEqual(login.absolute_url(),
+ # cc.view_or_script('login_form'))
+
def test_suite():
return unittest.TestSuite((
Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/cookieauth.xml
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/cookieauth.xml 2010-04-24 17:41:31 UTC (rev 111380)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/cookieauth.xml 2010-04-24 17:43:37 UTC (rev 111381)
@@ -4,9 +4,6 @@
<property name="name_cookie">__ac_name</property>
<property name="pw_cookie">__ac_password</property>
<property name="persist_cookie">__ac_persistent</property>
- <property name="auto_login_page">login_form</property>
- <property name="logout_page">logged_out</property>
- <property name="unauth_page"></property>
<property name="local_cookie_path">False</property>
<property name="cache_header_value">private</property>
<property name="log_username">True</property>
More information about the checkins
mailing list