Merge lp:~salgado/launchpad/remove-lp-services-openid into lp:launchpad

[Guilherme Salgado]

Remove the unused bits from lp/services/openid. These were once used by canonical-identity-provider, which will be removed shortly.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2010-03-04 20:19:39 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2010-04-05 15:45:44 +0000
@@ -100,7 +100,6 @@
 from lp.registry.interfaces.mentoringoffer import IMentoringOfferSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pillar import IPillarNameSet
-from lp.services.openid.interfaces.openidrpconfig import IOpenIDRPConfigSet
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.soyuz.interfaces.packageset import IPackagesetSet
 from lp.registry.interfaces.product import (
@@ -578,7 +577,6 @@
         'translations': IRosettaApplication,
         'testopenid': ITestOpenIDApplication,
         'questions': IQuestionSet,
-        '+rpconfig': IOpenIDRPConfigSet,
         'temporary-blobs': ITemporaryStorageManager,
         # These three have been renamed, and no redirects done, as the old
         # urls now point to the product pages.
 
=== removed file 'lib/lp/services/openid/browser/configure.zcml'
--- lib/lp/services/openid/browser/configure.zcml	2009-11-23 03:10:04 +0000
+++ lib/lp/services/openid/browser/configure.zcml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
-     GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<configure xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser">
-
-    <browser:url
-        for="..interfaces.openidrpconfig.IOpenIDRPConfig"
-        path_expression="string:${id}"
-        parent_utility="..interfaces.openidrpconfig.IOpenIDRPConfigSet"
-        />
-
-    <browser:page
-        for="..interfaces.openidrpconfig.IOpenIDRPConfig"
-        name="+edit"
-        class=".openidrpconfig.OpenIDRPConfigEditView"
-        permission="launchpad.Admin"
-        template="../templates/openidrpconfig-edit.pt"
-        />
-
-    <browser:defaultView
-        for="..interfaces.openidrpconfig.IOpenIDRPConfig"
-        name="+edit"
-        />
-
-    <!-- IOpenIDRPConfigSet -->
-
-    <browser:url
-        for="..interfaces.openidrpconfig.IOpenIDRPConfigSet"
-        path_expression="string:+rpconfig"
-        parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
-        />
-
-    <browser:navigation
-        module=".openidrpconfig"
-        classes="OpenIDRPConfigSetNavigation"
-        />
-
-    <browser:page
-        for="..interfaces.openidrpconfig.IOpenIDRPConfigSet"
-        name="+add"
-        class=".openidrpconfig.OpenIDRPConfigAddView"
-        permission="launchpad.Admin"
-        template="../templates/openidrpconfig-add.pt"
-        />
-
-    <browser:page
-        for="..interfaces.openidrpconfig.IOpenIDRPConfigSet"
-        name="+index"
-        class=".openidrpconfig.OpenIDRPConfigSetView"
-        permission="launchpad.Admin"
-        template="../templates/openidrpconfigset-index.pt"
-        />
-
-    <browser:defaultView
-        for="..interfaces.openidrpconfig.IOpenIDRPConfigSet"
-        name="+index"
-        />
-</configure>
 
=== removed file 'lib/lp/services/openid/browser/openidrpconfig.py'
--- lib/lp/services/openid/browser/openidrpconfig.py	2009-11-23 16:14:39 +0000
+++ lib/lp/services/openid/browser/openidrpconfig.py	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""View classes used to edit `IOpenIDRPConfig` objects.
-
-OpenID Relying Party configurations are used to customise the
-appearance and behaviour of the login page when authenticating to a
-particular RP.
-"""
-
-__metaclass__ = type
-__all__ = []
-
-from zope.component import getUtility
-
-from canonical.launchpad import _
-from lp.services.openid.interfaces.openidrpconfig import (
-    IOpenIDRPConfig, IOpenIDRPConfigSet)
-from canonical.launchpad.webapp import (
-    LaunchpadEditFormView, LaunchpadFormView, Navigation, action,
-    canonical_url, custom_widget)
-from canonical.launchpad.webapp.publisher import LaunchpadView
-from canonical.widgets import LabeledMultiCheckBoxWidget
-from canonical.widgets.image import ImageChangeWidget
-from lp.registry.interfaces.person import PersonCreationRationale
-
-
-class OpenIDRPConfigSetNavigation(Navigation):
-    """Navigation for `IOpenIDRPConfigSet`."""
-    usedfor = IOpenIDRPConfigSet
-
-    def traverse(self, config_id):
-        """Traverse to RP configs by ID."""
-        try:
-            config_id = int(config_id)
-        except ValueError:
-            return None
-
-        return getUtility(IOpenIDRPConfigSet).get(config_id)
-
-
-class OpenIDRPConfigSetView(LaunchpadView):
-    page_title = 'OpenID Relying Party Configurations'
-    label = page_title
-
-
-class OpenIDRPConfigAddView(LaunchpadFormView):
-    """View class for adding new RP configurations."""
-
-    schema = IOpenIDRPConfig
-    field_names = ['trust_root', 'displayname', 'description', 'logo',
-                   'allowed_sreg', 'creation_rationale', 'can_query_any_team',
-                   'auto_authorize']
-    custom_widget('logo', ImageChangeWidget, ImageChangeWidget.ADD_STYLE)
-    custom_widget('allowed_sreg', LabeledMultiCheckBoxWidget)
-    label = 'Add an OpenID Relying Party Configuration'
-    page_title = label
-
-    initial_values = {
-        'creation_rationale':
-            PersonCreationRationale.OWNER_CREATED_UNKNOWN_TRUSTROOT,
-        }
-
-    @action(_('Create'), name='create')
-    def create_action(self, action, data):
-        """Create the new RP configuration."""
-        rpconfig = getUtility(IOpenIDRPConfigSet).new(
-            trust_root=data['trust_root'],
-            displayname=data['displayname'],
-            description=data['description'],
-            logo=data['logo'],
-            allowed_sreg=data['allowed_sreg'],
-            creation_rationale=data['creation_rationale'],
-            can_query_any_team=data['can_query_any_team'],
-            auto_authorize=data['auto_authorize'])
-        self.request.response.addInfoNotification(
-            _('Created RP configuration for ${trust_root}.',
-            mapping=dict(trust_root=data['trust_root'])))
-
-    @property
-    def next_url(self):
-        return canonical_url(getUtility(IOpenIDRPConfigSet))
-
-    cancel_url = next_url
-
-
-class OpenIDRPConfigEditView(LaunchpadEditFormView):
-    """View class for editing or removing RP configurations."""
-
-    @property
-    def label(self):
-        return 'Edit Relying Party Configuration for %s' % (
-            self.context.displayname)
-    page_title = label
-
-    schema = IOpenIDRPConfig
-    field_names = ['trust_root', 'displayname', 'description', 'logo',
-                   'allowed_sreg', 'creation_rationale', 'can_query_any_team',
-                   'auto_authorize']
-    custom_widget('logo', ImageChangeWidget, ImageChangeWidget.EDIT_STYLE)
-    custom_widget('allowed_sreg', LabeledMultiCheckBoxWidget)
-
-    @action(_('Save'), name='save')
-    def save_action(self, action, data):
-        """Save the RP configuration."""
-        if self.updateContextFromData(data):
-            self.request.response.addInfoNotification(
-                _('Updated RP configuration for ${trust_root}.',
-                mapping=dict(trust_root=self.context.trust_root)))
-
-    @action(_('Remove'), name='remove')
-    def remove_action(self, action, data):
-        """Remove the RP configuration."""
-        trust_root = self.context.trust_root
-        self.context.destroySelf()
-        self.request.response.addInfoNotification(
-            _('Removed RP configuration for ${trust_root}.',
-            mapping=dict(trust_root=trust_root)))
-
-    @property
-    def next_url(self):
-        return canonical_url(getUtility(IOpenIDRPConfigSet))
-
-    cancel_url = next_url
 
=== modified file 'lib/lp/services/openid/configure.zcml'
--- lib/lp/services/openid/configure.zcml	2009-07-18 00:05:49 +0000
+++ lib/lp/services/openid/configure.zcml	2010-04-05 15:45:44 +0000
@@ -9,23 +9,6 @@
     i18n_domain="launchpad">
 
     <class
-        class=".model.openidrpconfig.OpenIDRPConfig">
-      <allow interface=".interfaces.openidrpconfig.IOpenIDRPConfig" />
-      <require
-          permission="launchpad.Admin"
-          attributes="destroySelf"
-          set_schema=".interfaces.openidrpconfig.IOpenIDRPConfig" />
-    </class>
-
-    <securedutility
-        class=".model.openidrpconfig.OpenIDRPConfigSet"
-        provides=".interfaces.openidrpconfig.IOpenIDRPConfigSet">
-      <allow
-          interface=".interfaces.openidrpconfig.IOpenIDRPConfigSet"
-          />
-    </securedutility>
-
-    <class
         class=".model.openidrpsummary.OpenIDRPSummary">
         <allow interface=".interfaces.openidrpsummary.IOpenIDRPSummary" />
     </class>
@@ -44,5 +27,4 @@
     <adapter factory=".adapters.openid.OpenIDPersistentIdentity" />
     <adapter factory=".adapters.openid.person_to_openidpersistentidentity" />
 
-    <include package=".browser" />
 </configure>
 
=== removed directory 'lib/lp/services/openid/doc'
=== removed file 'lib/lp/services/openid/doc/__init__.py'
=== removed file 'lib/lp/services/openid/doc/openid-rp-config.txt'
--- lib/lp/services/openid/doc/openid-rp-config.txt	2010-02-11 20:33:07 +0000
+++ lib/lp/services/openid/doc/openid-rp-config.txt	1970-01-01 00:00:00 +0000
@@ -1,171 +0,0 @@
-===================================
-OpenID Relying Party Configurations
-===================================
-
-Launchpad can store information about OpenID relying parties in order
-to provide a better user experience when using Launchpad to log in.
-This includes:
-
- * Providing a human readable name for the relying party, so we don't
-   have to display the raw URL to the user.
-
- * Providing a logo image to display on the log in page.
-
- * Specify what fields may be disclosed to the RP via OpenID Simple
-   Registration protocol.
-
- * What person creation rationale should be used for accounts created
-   while signing in to the RP.
-
-
-Creating OpenIDRPConfigs
-========================
-
-Configurations are created using the IOpenIDRPConfigSet utility:
-
-    >>> from zope.component import getUtility
-    >>> from lp.services.openid.interfaces.openidrpconfig import (
-    ...     IOpenIDRPConfigSet)
-    >>> login(ANONYMOUS)
-    >>> rpconfig = getUtility(IOpenIDRPConfigSet).new(
-    ...     trust_root='http://*.example.com/',
-    ...     displayname='Example RP',
-    ...     description='Example RP description',
-    ...     allowed_sreg=['fullname', 'nickname'])
-
-The resulting object implements the IOpenIDRPConfig interface:
-
-    >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from lp.services.openid.interfaces.openidrpconfig import (
-    ...     IOpenIDRPConfig)
-
-    >>> verifyObject(IOpenIDRPConfig, rpconfig)
-    True
-
-The utility itself implements IOpenIDRPConfigSet:
-
-    >>> verifyObject(IOpenIDRPConfigSet, getUtility(IOpenIDRPConfigSet))
-    True
-
-Some RPs include a trailing '/' on their URLs, which is the standard,
-while others do not.  The `trust_root` is always normalized to have a
-trailing slash.
-
-    >>> rpconfig2 = getUtility(IOpenIDRPConfigSet).new(
-    ...     trust_root='http://foo.example.com',
-    ...     displayname='Example RP',
-    ...     description='Example RP description',
-    ...     allowed_sreg=['fullname', 'nickname'])
-    >>> print rpconfig2.trust_root
-    http://foo.example.com/
-
-
-Modifying OpenIDRPConfig objects
-================================
-
-OpenIDRPConfig objects may only be modified by an administrator:
-
-    >>> rpconfig.displayname = 'New title'
-    Traceback (most recent call last):
-      ...
-    Unauthorized: (<OpenIDRPConfig at ...>, 'displayname', 'launchpad.Admin')
-    >>> login('[e-mail]')
-    >>> rpconfig.displayname = 'New title'
-    >>> print rpconfig.displayname
-    New title
-
-The allowed simple registration fields attribute sorts the field names
-to normalise the result:
-
-    >>> rpconfig.allowed_sreg = ['fullname', 'email']
-    >>> print rpconfig.allowed_sreg
-    [u'email', u'fullname']
-
-The auto_authorize attribute specifies whether this RP is allowed to
-skip the authorization page.  This behaviour is not turned on by
-default:
-
-    >>> rpconfig.auto_authorize
-    False
-    >>> rpconfig.auto_authorize = True
-    >>> rpconfig.auto_authorize
-    True
-
-
-Searching for OpenIDRPConfig objects
-====================================
-
-An RP config can be looked up by its ID using the get() method of the
-IOpenIDRPConfigSet:
-
-    >>> rpconfig2 = getUtility(IOpenIDRPConfigSet).get(rpconfig.id)
-    >>> print rpconfig2.trust_root
-    http://*.example.com/
-    >>> rpconfig2.id == rpconfig.id
-    True
-
-The get() method will return None for an unknown ID:
-
-    >>> print getUtility(IOpenIDRPConfigSet).get(-42)
-    None
-
-It is also possible to look up RP configs by their trust root:
-
-    >>> rpconfig3 = getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://*.example.com/')
-    >>> print rpconfig3.trust_root
-    http://*.example.com/
-    >>> rpconfig3.id == rpconfig.id
-    True
-
-The getByTrustRoot() method will return None for an unknown trust
-root:
-
-    >>> print getUtility(IOpenIDRPConfigSet).getByTrustRoot('http://unknown')
-    None
-
-Most RPs include the trailing '/' in their trust root URL but some do
-not.  The search should match whether the trailing slash is there or
-not.
-
-    >>> rpconfig3 = getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://*.example.com')
-    >>> print rpconfig3.trust_root
-    http://*.example.com/
-    >>> rpconfig3.id == rpconfig.id
-    True
-
-
-Listing all OpenIDRPConfig objects
-==================================
-
-The getAll() method of the IOpenIDRPConfigSet will return a result set
-containing all OpenIDRP's.
-
-    >>> configs = getUtility(IOpenIDRPConfigSet).getAll()
-    >>> rpconfig in configs
-    True
-
-
-Destroying OpenIDRPConfig objects
-=================================
-
-RP configs can be removed using the destroySelf() method, which is
-only available to administrators:
-
-    >>> login(ANONYMOUS)
-    >>> rpconfig = getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://*.example.com/')
-    >>> rpconfig.destroySelf()
-    Traceback (most recent call last):
-      ...
-    Unauthorized: (<OpenIDRPConfig at ...>, 'destroySelf', 'launchpad.Admin')
-
-The same method succeeds when run as an administrator.  Afterwards,
-attempts to get the RP config fail:
-
-    >>> login('[e-mail]')
-    >>> rpconfig.destroySelf()
-    >>> print getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://*.example.com/')
-    None
 
=== removed file 'lib/lp/services/openid/interfaces/openidrpconfig.py'
--- lib/lp/services/openid/interfaces/openidrpconfig.py	2009-07-17 02:25:09 +0000
+++ lib/lp/services/openid/interfaces/openidrpconfig.py	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""OpenIDRPConfig related interfaces."""
-
-__metaclass__ = type
-__all__ = [
-    'IOpenIDRPConfig',
-    'IOpenIDRPConfigSet',
-    ]
-
-from zope.component import getUtility
-from zope.schema import Bool, Choice, Int, List, Text, TextLine
-from zope.interface import Interface
-from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
-
-from canonical.launchpad import _
-from canonical.launchpad.fields import (
-    BaseImageUpload, URIField, UniqueField)
-from lp.registry.interfaces.person import PersonCreationRationale
-
-
-class TrustRootField(UniqueField, URIField):
-    """An OpenID Relying Party trust root, which is unique."""
-
-    attribute = 'trust_root'
-    errormessage = _("%s is already in use for another Relying Party.")
-
-    @property
-    def _content_iface(self):
-        return IOpenIDRPConfig
-
-    def _getByAttribute(self, trust_root):
-        return getUtility(IOpenIDRPConfigSet).getByTrustRoot(trust_root)
-
-
-class RPLogoImageUpload(BaseImageUpload):
-
-    dimensions = (400, 100)
-    exact_dimensions = False
-    max_size = 100*1024
-
-
-sreg_fields_vocabulary = SimpleVocabulary([
-    SimpleTerm('fullname', 'fullname', 'Full name'),
-    SimpleTerm('nickname', 'nickname', 'Launchpad ID'),
-    SimpleTerm('email', 'email', 'Email address'),
-    SimpleTerm('timezone', 'timezone', 'Time zone'),
-    SimpleTerm('x_address1', 'x_address1', 'Address line 1'),
-    SimpleTerm('x_address2', 'x_address2', 'Address line 2'),
-    SimpleTerm('x_city', 'x_city', 'City'),
-    SimpleTerm('x_province', 'x_province', 'State/Province'),
-    SimpleTerm('country', 'country', 'Country'),
-    SimpleTerm('postcode', 'postcode', 'Postcode'),
-    SimpleTerm('x_phone', 'x_phone', 'Phone number'),
-    SimpleTerm('x_organization', 'x_organization', 'Organization')])
-
-
-class IOpenIDRPConfig(Interface):
-    """Configuration for a particular OpenID Relying Party."""
-    id = Int(title=u'ID', required=True)
-    trust_root = TrustRootField(
-        title=_('Trust Root'), required=True,
-        trailing_slash=True,
-        description=_('The openid.trust_root value sent by the '
-                      'Relying Party'))
-    displayname = TextLine(
-        title=_('Display Name'), required=True,
-        description=_('A human readable name for the Relying Party'))
-    description = Text(
-        title=_('Description'), required=True,
-        description=_('A description of the Relying Party, explaining why '
-                      'the user should authenticate.'))
-    logo = RPLogoImageUpload(
-        title=_('Logo'), required=False,
-        default_image_resource='/@@/nyet-logo',
-        description=_('A banner that identifies the Relying Party, '
-                      'no larger than 400x100 pixels.'))
-    allowed_sreg = List(
-        title=_('Allowed Sreg Fields'),
-        description=_('The simple registration fields that may be '
-                      'transferred to this Relying Party'),
-        value_type=Choice(vocabulary=sreg_fields_vocabulary))
-    creation_rationale = Choice(
-        title=_('Creation Rationale'),
-        description=_('The creation rationale to use for user accounts '
-                      'created while logging in to this Relying Party'),
-        vocabulary=PersonCreationRationale)
-    can_query_any_team = Bool(
-        title=_('Query Any Team'),
-        description=_(
-            'Teammembership of any team can be requested, including '
-            'private teams.'),
-        required=True, readonly=False)
-    auto_authorize = Bool(
-        title=_('Automatically authorize requests'),
-        description=_(
-            'Authentication requests for this RP are responded to '
-            'automatically without explicit user authorization'),
-        required=True, readonly=False)
-
-
-class IOpenIDRPConfigSet(Interface):
-    """The set of OpenID Relying Party configurations."""
-    def new(trust_root, displayname, description, logo=None,
-            allowed_sreg=None, creation_rationale=PersonCreationRationale
-            .OWNER_CREATED_UNKNOWN_TRUSTROOT, can_query_any_team=False,
-            auto_authorize=False):
-        """Create a new IOpenIDRPConfig"""
-
-    def get(id):
-        """Get the IOpenIDRPConfig with a particular ID."""
-
-    def getAll():
-        """Return a sequence of all IOpenIDRPConfigs."""
-
-    def getByTrustRoot(trust_root):
-        """Return the IOpenIDRPConfig for a particular trust root"""
-
-
 
=== removed file 'lib/lp/services/openid/model/openidrpconfig.py'
--- lib/lp/services/openid/model/openidrpconfig.py	2009-07-17 02:25:09 +0000
+++ lib/lp/services/openid/model/openidrpconfig.py	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""OpenIDRPConfig related database classes."""
-
-__metaclass__ = type
-__all__ = [
-    'OpenIDRPConfig',
-    'OpenIDRPConfigSet',
-    ]
-
-
-import re
-
-from sqlobject import BoolCol, ForeignKey, SQLObjectNotFound, StringCol
-from storm.expr import Or
-from zope.interface import implements
-
-from canonical.database.enumcol import EnumCol
-from canonical.database.sqlbase import SQLBase
-from canonical.launchpad.interfaces import IStore
-from lp.registry.interfaces.person import PersonCreationRationale
-from lp.services.openid.interfaces.openidrpconfig import (
-    IOpenIDRPConfig, IOpenIDRPConfigSet)
-
-
-class OpenIDRPConfig(SQLBase):
-    implements(IOpenIDRPConfig)
-
-    _table = 'OpenIDRPConfig'
-    trust_root = StringCol(dbName='trust_root', notNull=True)
-    displayname = StringCol(dbName='displayname', notNull=True)
-    description = StringCol(dbName='description', notNull=True)
-    logo = ForeignKey(
-        dbName='logo', foreignKey='LibraryFileAlias', default=None)
-    _allowed_sreg = StringCol(dbName='allowed_sreg')
-    creation_rationale = EnumCol(
-        dbName='creation_rationale', notNull=True,
-        schema=PersonCreationRationale,
-        default=PersonCreationRationale.OWNER_CREATED_UNKNOWN_TRUSTROOT)
-    can_query_any_team = BoolCol(
-        dbName='can_query_any_team', notNull=True, default=False)
-    auto_authorize = BoolCol()
-
-    def allowed_sreg(self):
-        value = self._allowed_sreg
-        if not value:
-            return []
-        return value.split(',')
-
-    def _set_allowed_sreg(self, value):
-        if not value:
-            self._allowed_sreg = None
-        self._allowed_sreg = ','.join(sorted(value))
-
-    allowed_sreg = property(allowed_sreg, _set_allowed_sreg)
-
-
-class OpenIDRPConfigSet:
-    implements(IOpenIDRPConfigSet)
-
-    url_re = re.compile("^(.+?)\/*$")
-
-    def _normalizeTrustRoot(self, trust_root):
-        """Given a trust root URL ensure it ends with exactly one '/'."""
-        match = self.url_re.match(trust_root)
-        assert match is not None, (
-            "Attempting to normalize trust root %s failed." % trust_root)
-        return "%s/" % match.group(1)
-
-    def new(self, trust_root, displayname, description, logo=None,
-            allowed_sreg=None,
-            creation_rationale=
-                PersonCreationRationale.OWNER_CREATED_UNKNOWN_TRUSTROOT,
-            can_query_any_team=False, auto_authorize=False):
-        """See `IOpenIDRPConfigSet`"""
-        if allowed_sreg:
-            allowed_sreg = ','.join(sorted(allowed_sreg))
-        else:
-            allowed_sreg = None
-        trust_root = self._normalizeTrustRoot(trust_root)
-        return OpenIDRPConfig(
-            trust_root=trust_root, displayname=displayname,
-            description=description, logo=logo,
-            _allowed_sreg=allowed_sreg, creation_rationale=creation_rationale,
-            can_query_any_team=can_query_any_team,
-            auto_authorize=auto_authorize)
-
-    def get(self, id):
-        """See `IOpenIDRPConfigSet`"""
-        try:
-            return OpenIDRPConfig.get(id)
-        except SQLObjectNotFound:
-            return None
-
-    def getAll(self):
-        """See `IOpenIDRPConfigSet`"""
-        return OpenIDRPConfig.select(orderBy=['displayname', 'trust_root'])
-
-    def getByTrustRoot(self, trust_root):
-        """See `IOpenIDRPConfigSet`"""
-        trust_root = self._normalizeTrustRoot(trust_root)
-        # XXX: BradCrittenden 2008-09-26 bug=274774: Until the database is
-        # updated to normalize existing data the query must look for
-        # trust_roots that end in '/' and those that do not.
-        return IStore(OpenIDRPConfig).find(
-            OpenIDRPConfig,
-            Or(OpenIDRPConfig.trust_root==trust_root,
-               OpenIDRPConfig.trust_root==trust_root[:-1])).one()
-
-
 
=== removed directory 'lib/lp/services/openid/stories'
=== removed file 'lib/lp/services/openid/stories/__init__.py'
=== removed file 'lib/lp/services/openid/stories/rpconfig-admin.txt'
--- lib/lp/services/openid/stories/rpconfig-admin.txt	2009-07-15 15:39:49 +0000
+++ lib/lp/services/openid/stories/rpconfig-admin.txt	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-= Managing OpenID Relying Party Configurations =
-
-While Launchpad can act as an OpenID Provider for any Relying Party,
-it can provide a better user experience for RPs that it knows about,
-including:
-
- * A human readable name for the RP.
- * A logo for the RP to display on the login page.
- * Some descriptive text indicating why the user should authenticate
-   to the RP.
- * A creation rationale for new accounts created as part of the login
-   process for this RP.
-
-The pages used to view and edit these configurations are only visible
-to Launchpad administrators:
-
-    >>> user_browser.open('http://launchpad.dev/+rpconfig')
-    Traceback (most recent call last):
-      ...
-    Unauthorized: ...
-    >>> admin_browser.open('http://launchpad.dev/+rpconfig')
-    >>> print admin_browser.title
-    OpenID Relying Party Configurations
-
-
-== Adding RP Configurations ==
-
-We can add new RP configurations from this page:
-
-    >>> admin_browser.getLink('Add an RP config').click()
-    >>> print admin_browser.title
-    Add an OpenID Relying Party Configuration
-
-    >>> import os
-    >>> from canonical.config import config
-    >>> logo_file = os.path.join(
-    ...     config.root, 'lib/canonical/launchpad/images/nyet-logo.png')
-
-    >>> admin_browser.getControl('Trust Root').value = 'http://example.com/'
-    >>> admin_browser.getControl('Display Name').value = 'Example RP'
-    >>> admin_browser.getControl('Description').value = 'example description'
-    >>> admin_browser.getControl(name='field.logo.action').value = ['change']
-    >>> admin_browser.getControl(name='field.logo.image').add_file(
-    ...     open(logo_file), 'image/png', 'logo.png')
-    >>> admin_browser.getControl('Full name').click()
-    >>> admin_browser.getControl('Email address').click()
-    >>> admin_browser.getControl('Automatically authorize requests').click()
-    >>> admin_browser.getControl('Create').click()
-    >>> print admin_browser.title
-    OpenID Relying Party Configurations
-
-The new RP configuration page is now included in the list:
-
-    >>> print admin_browser.contents
-    <...
-    <td><a href="...">Example RP</a></td>
-    <td>http://example.com/</td>
-    ...
-
-The RP config contains all the information we'd expect:
-
-    >>> from zope.component import getUtility
-    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
-    >>> from lp.services.openid.interfaces.openidrpconfig import (
-    ...     IOpenIDRPConfigSet)
-
-    >>> login(ANONYMOUS)
-    >>> rpconfig = getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://example.com/')
-    >>> print rpconfig.displayname
-    Example RP
-    >>> print rpconfig.description
-    example description
-    >>> print rpconfig.logo.filename
-    logo.png
-    >>> print rpconfig.allowed_sreg
-    [u'email', u'fullname']
-    >>> print rpconfig.creation_rationale.name
-    OWNER_CREATED_UNKNOWN_TRUSTROOT
-    >>> print rpconfig.auto_authorize
-    True
-    >>> logout()
-
-The trust_root will have a trailing slash appended even if the user
-does not specify one.
-
-    >>> admin_browser.open('http://launchpad.dev/+rpconfig')
-    >>> admin_browser.getLink('Add an RP config').click()
-    >>> admin_browser.getControl('Trust Root').value = 'http://example-two.com'
-    >>> admin_browser.getControl('Display Name').value = 'Example Two RP'
-    >>> admin_browser.getControl('Description').value = 'example description'
-    >>> admin_browser.getControl('Create').click()
-
-The new RP configuration page is now included in the list, with the
-trailing slash in the trust root:
-
-    >>> print admin_browser.contents
-    <...
-    <td><a href="...">Example Two RP</a></td>
-    <td>http://example-two.com/</td>
-    ...
-
-
-== Editing RP Configurations ==
-
-We can also edit existing RP configurations:
-
-    >>> admin_browser.getLink('Example RP').click()
-    >>> print admin_browser.title
-    Edit Relying Party Configuration for Example RP
-
-    >>> admin_browser.getControl('Description').value = 'new description'
-    >>> admin_browser.getControl('Launchpad ID').click()
-    >>> admin_browser.getControl('Automatically authorize requests').click()
-    >>> admin_browser.getControl('Save').click()
-    >>> print admin_browser.title
-    OpenID Relying Party Configurations
-
-The changes have now been made to the RP configuration:
-
-    >>> login(ANONYMOUS)
-    >>> rpconfig = getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://example.com/')
-    >>> print rpconfig.description
-    new description
-    >>> print rpconfig.allowed_sreg
-    [u'email', u'fullname', u'nickname']
-    >>> print rpconfig.auto_authorize
-    False
-    >>> logout()
-
-
-== Only One RP Configuration Per Trust Root ==
-
-There can only be one RP configuration per trust root.  Trying to
-create a second configuration fails:
-
-    >>> admin_browser.getLink('Add an RP config').click()
-    >>> admin_browser.getControl('Trust Root').value = 'http://example.com/'
-    >>> admin_browser.getControl('Display Name').value = 'Second RP'
-    >>> admin_browser.getControl('Description').value = 'description'
-    >>> admin_browser.getControl('Create').click()
-    >>> print admin_browser.title
-    Add an OpenID Relying Party Configuration
-
-    >>> for error in find_tags_by_class(admin_browser.contents, 'message'):
-    ...     print extract_text(error)
-    There is 1 error.
-    http://example.com/ is already in use for another Relying Party.
-
-Changing the trust root value fixes the problem:
-
-    >>> admin_browser.getControl('Trust Root').value = 'http://example.net/'
-    >>> admin_browser.getControl('Create').click()
-    >>> print admin_browser.title
-    OpenID Relying Party Configurations
-
-Similarly, we can't change the trust root of a configuration to
-conflict with another configuration:
-
-    >>> admin_browser.getLink('Second RP').click()
-    >>> admin_browser.getControl('Trust Root').value = 'http://example.com/'
-    >>> admin_browser.getControl('Save').click()
-    >>> print admin_browser.title
-    Edit Relying Party Configuration for Second RP
-
-    >>> for error in find_tags_by_class(admin_browser.contents, 'message'):
-    ...     print extract_text(error)
-    There is 1 error.
-    http://example.com/ is already in use for another Relying Party.
-
-
-== Deleting RP Configurations ==
-
-RP configurations can be deleted from the edit form:
-
-    >>> admin_browser.open('http://launchpad.dev/+rpconfig')
-    >>> admin_browser.getLink('Example RP').click()
-    >>> admin_browser.getControl('Remove').click()
-    >>> print admin_browser.title
-    OpenID Relying Party Configurations
-
-The RP configuration has now been removed:
-
-    >>> login(ANONYMOUS)
-    >>> rpconfig = getUtility(IOpenIDRPConfigSet).getByTrustRoot(
-    ...     'http://example.com/')
-    >>> print rpconfig
-    None
-    >>> logout()
 
=== removed file 'lib/lp/services/openid/templates/openidrpconfig-add.pt'
--- lib/lp/services/openid/templates/openidrpconfig-add.pt	2009-11-23 03:10:04 +0000
+++ lib/lp/services/openid/templates/openidrpconfig-add.pt	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  metal:use-macro="view/macro:page/main_only"
-  i18n:domain="launchpad">
-
-<body>
-
-<div metal:fill-slot="main">
-  <div metal:use-macro="context/@@launchpad_form/form" />
-</div>
-
-</body>
-</html>
 
=== removed file 'lib/lp/services/openid/templates/openidrpconfig-edit.pt'
--- lib/lp/services/openid/templates/openidrpconfig-edit.pt	2009-11-23 03:10:04 +0000
+++ lib/lp/services/openid/templates/openidrpconfig-edit.pt	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  metal:use-macro="view/macro:page/main_only"
-  i18n:domain="launchpad">
-
-<body>
-
-<div metal:fill-slot="main">
-  <div metal:use-macro="context/@@launchpad_form/form" />
-</div>
-
-</body>
-</html>
 
=== removed file 'lib/lp/services/openid/templates/openidrpconfigset-index.pt'
--- lib/lp/services/openid/templates/openidrpconfigset-index.pt	2009-11-23 16:14:39 +0000
+++ lib/lp/services/openid/templates/openidrpconfigset-index.pt	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<html xml:lang="en" lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    metal:use-macro="view/macro:page/main_only"
-    i18n:domain="launchpad">
-
-  <body>
-    <div metal:fill-slot="main">
-      <table class="listing" tal:condition="context/getAll">
-        <thead>
-          <tr>
-            <th>Relying Party</th>
-            <th>Trust Root</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:repeat="rpconfig context/getAll">
-            <td><a tal:attributes="href rpconfig/fmt:url"
-                   tal:content="rpconfig/displayname">RP Config</a></td>
-            <td tal:content="rpconfig/trust_root">http://blah</td>
-          </tr>
-        </tbody>
-      </table>
-
-      <div>
-        <a tal:attributes="href string:${context/fmt:url}/+add">
-          Add an RP config</a>
-      </div>
-    </div>
-  </body>
-</html>