Skip to content

erp5
erp5
Commit e3a22589 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
2 Browse files
Options

erp5_base: migrate Person to ERP5 Login by TemplateTool's constraint, instead of Person constraint. 

so that it is simply detected by existence of active erp5_users plugin.
parent 84651315
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 168 deletions
bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.PersonLoginMigration.py
View file @ e3a22589
def checkPersonLoginExistenceConsistency(self, fixit=False):
def migrateToERP5Login(self):
assert self.getPortalType() == 'Person'
reference = self.getReference()
if not reference:
# no login is required
return []
return
if not self.hasPassword():
# no login is required, but possibly another Login type object is required if implemented
return []
return
if len(self.objectValues(portal_type=self.getPortalObject().getPortalLoginTypeList())):
# already migrated
return []
if fixit:
login = self.newContent(
portal_type='ERP5 Login',
reference=reference,
)
login._setEncodedPassword(self.getPassword())
login.validate()
self._setEncodedPassword(None)
return ['%s has no Login type sub document.' % self.getRelativeUrl()]
return
login = self.newContent(
portal_type='ERP5 Login',
reference=reference,
)
login._setEncodedPassword(self.getPassword())
login.validate()
self._setEncodedPassword(None)
bt5/erp5_base/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ e3a22589
......@@ -8,7 +8,6 @@
</portal_type>
<portal_type id="Person">
<item>DefaultImage</item>
<item>PersonUpgradeConstraint</item>
</portal_type>
<portal_type id="Preference">
<item>TelephonePreference</item>
......
bt5/erp5_base/PropertySheetTemplateItem/portal_property_sheets/PersonUpgradeConstraint.xml deleted 100644 → 0
View file @ 84651315
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Property Sheet" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PersonUpgradeConstraint</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/PropertySheetTemplateItem/portal_property_sheets/PersonUpgradeConstraint/Login%20Existence_constraint.xml deleted 100644 → 0
View file @ 84651315
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Script Constraint" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>constraint_type/post_upgrade</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Login Existence_constraint</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Script Constraint</string> </value>
</item>
<item>
<key> <string>script_id</string> </key>
<value> <string>Person_checkPersonLoginExistenceConsistency</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_checkPersonLoginExistenceConsistency.xml → bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_migrateToERP5Login.xml
View file @ e3a22589
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>_function</string> </key>
<value> <string>checkPersonLoginExistenceConsistency</string> </value>
<value> <string>migrateToERP5Login</string> </value>
</item>
<item>
<key> <string>_module</string> </key>
......@@ -16,7 +16,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Person_checkPersonLoginExistenceConsistency</string> </value>
<value> <string>Person_migrateToERP5Login</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/TemplateTool_checkERP5LoginUserManagerExistenceConsistency.xml
View file @ e3a22589
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>TemplateTool_checkERP5LoginUserManagerExistenceConsistency</string> </value>
<value> <string>TemplateTool_checkERP5UserManagerNonExistenceConsistency</string> </value>
Please register or sign in to reply
</item>
</dictionary>
</pickle>
......
product/ERP5Security/tests/testERP5Security.py
View file @ e3a22589
......@@ -369,6 +369,11 @@ class TestUserManagement(ERP5TypeTestCase):
self._assertUserExists('the_user', 'secret')
def test_PersonLoginMigration(self):
self.portal.acl_users.manage_addProduct['ERP5Security'].addERP5UserManager('erp5_users')
self.portal.acl_users.erp5_users.manage_activateInterfaces([
'IAuthenticationPlugin',
'IUserEnumerationPlugin',
])
pers = self.portal.person_module.newContent(
portal_type='Person',
reference='the_user',
......@@ -379,14 +384,12 @@ class TestUserManagement(ERP5TypeTestCase):
pers.setPassword('secret')
self.assertEqual(len(pers.objectValues(portal_type='ERP5 Login')), 0)
self.tic()
if getattr(self.portal.acl_users,'erp5_users', None) is not None:
self._assertUserExists('the_user', 'secret')
else:
self._assertUserDoesNotExists('the_user', 'secret')
pers.fixConsistency(filter={'constraint_type': 'post_upgrade'})
self._assertUserExists('the_user', 'secret')
self.portal.portal_templates.fixConsistency(filter={'constraint_type': 'post_upgrade'})
self.portal.portal_caches.clearAllCache()
self.tic()
self._assertUserExists('the_user', 'secret')
self.assertEqual(pers.getPassword(), None)
login = pers.objectValues(portal_type='ERP5 Login')[0]
login.setPassword('secret2')
self.portal.portal_caches.clearAllCache()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7