Changeset 1725
- Timestamp:
- 12/21/06 00:46:05 (2 years ago)
- Files:
-
- openidplugin/trunk/openidauth/auth.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openidplugin/trunk/openidauth/auth.py
r1723 r1725 16 16 from trac.core import * 17 17 from trac.db import * 18 from trac.env import IEnvironmentSetupParticipant 18 19 from trac.web.api import IAuthenticator, IRequestHandler 19 20 from trac.web.chrome import INavigationContributor, ITemplateProvider … … 44 45 lifetime INTEGER, 45 46 assoc_type VARCHAR(64), 46 PRIMARY KEY (server_url (255), handle)47 PRIMARY KEY (server_url, handle) 47 48 )""" 48 49 … … 87 88 88 89 implements(IAuthenticator, INavigationContributor, IRequestHandler, 89 ITemplateProvider )90 ITemplateProvider, IEnvironmentSetupParticipant) 90 91 91 92 sessions = {} … … 101 102 def __init__(self): 102 103 db = self.env.get_db_cnx() 103 self.store = TracOpenIDStore(db) 104 self.store = self._getStore(db) 105 106 def _getStore(self, db): 107 return TracOpenIDStore(db) 108 109 def _initStore(self, db): 110 self._getStore(db).createTables() 111 112 # IEnvironmentSetupParticipant methods 113 114 def environment_created(self): 115 db = self.env.get_db_cnx() 116 self._initStore(db) 117 db.commit() 118 119 def environment_needs_upgrade(self, db): 120 c = db.cursor() 104 121 try: 105 # Try to create the OpenID store tables. 106 self.store.createTables() 107 except: 108 # Assume they already exist if there was a failure. 109 pass 110 db.commit() 122 c.execute("SELECT count(*) FROM oid_associations") 123 db.rollback() 124 return False 125 except Exception, e: 126 db.rollback() 127 return True 128 129 def upgrade_environment(self, db): 130 self._initStore(db) 111 131 112 132 # IAuthenticator methods
