Switch to unified view

a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
...
...
15
15
16
from ming import schema as S
16
from ming import schema as S
17
from ming.orm import session, state, MappedClass
17
from ming.orm import session, state, MappedClass
18
from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty
18
from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty
19
19
20
import allura.tasks
20
from allura.lib import helpers as h
21
from allura.lib import helpers as h
21
from allura.lib import plugin
22
from allura.lib import plugin
22
from allura.lib import security
23
23
from .session import main_orm_session
24
from .session import main_orm_session
24
from .session import project_orm_session
25
from .session import project_orm_session
25
26
26
log = logging.getLogger(__name__)
27
log = logging.getLogger(__name__)
27
28
...
...
190
please visit the following URL:
191
please visit the following URL:
191
192
192
    %s
193
    %s
193
''' % (self._id, self.claimed_by_user().username, g.url('/auth/verify_addr', a=self.nonce))
194
''' % (self._id, self.claimed_by_user().username, g.url('/auth/verify_addr', a=self.nonce))
194
        log.info('Verification email:\n%s', text)
195
        log.info('Verification email:\n%s', text)
195
        g.publish('audit', 'forgemail.send_email', {
196
        allura.tasks.mail_tasks.sendmail.post(
196
                'destinations':[self._id],
197
            destinations=[self._id],
197
                'from':self._id,
198
            fromaddr=self._id,
198
                'reply_to':'',
199
            reply_to='',
199
                'message_id':'',
200
                'subject':'Email address verification',
200
            subject='Email address verification',
201
            message_id=h.gen_message_id(),
201
                'text':text})
202
            text=text)
202
203
203
class OpenId(MappedClass):
204
class OpenId(MappedClass):
204
    class __mongometa__:
205
    class __mongometa__:
205
        name='openid'
206
        name='openid'
206
        session = main_orm_session
207
        session = main_orm_session