|
a/Allura/allura/model/auth.py |
|
b/Allura/allura/model/auth.py |
|
... |
|
... |
| 195 |
claimed_by_user_id=FieldProperty(S.ObjectId, if_missing=None)
|
195 |
claimed_by_user_id=FieldProperty(S.ObjectId, if_missing=None)
|
| 196 |
confirmed = FieldProperty(bool)
|
196 |
confirmed = FieldProperty(bool)
|
| 197 |
nonce = FieldProperty(str)
|
197 |
nonce = FieldProperty(str)
|
| 198 |
|
198 |
|
| 199 |
def claimed_by_user(self):
|
199 |
def claimed_by_user(self):
|
| 200 |
return User.query.get(_id=self.claimed_by_user_id)
|
200 |
return User.query.get(_id=self.claimed_by_user_id, disabled=False)
|
| 201 |
|
201 |
|
| 202 |
@classmethod
|
202 |
@classmethod
|
| 203 |
def upsert(cls, addr):
|
203 |
def upsert(cls, addr):
|
| 204 |
addr = cls.canonical(addr)
|
204 |
addr = cls.canonical(addr)
|
| 205 |
result = cls.query.get(_id=addr)
|
205 |
result = cls.query.get(_id=addr)
|
|
... |
|
... |
| 254 |
display_identifier=display_identifier)
|
254 |
display_identifier=display_identifier)
|
| 255 |
return result
|
255 |
return result
|
| 256 |
|
256 |
|
| 257 |
def claimed_by_user(self):
|
257 |
def claimed_by_user(self):
|
| 258 |
if self.claimed_by_user_id:
|
258 |
if self.claimed_by_user_id:
|
| 259 |
result = User.query.get(_id=self.claimed_by_user_id)
|
259 |
result = User.query.get(_id=self.claimed_by_user_id, disabled=False)
|
| 260 |
else: # pragma no cover
|
260 |
else: # pragma no cover
|
| 261 |
result = User.register(
|
261 |
result = User.register(
|
| 262 |
dict(username=None, password=None,
|
262 |
dict(username=None, password=None,
|
| 263 |
display_name=self.display_identifier,
|
263 |
display_name=self.display_identifier,
|
| 264 |
open_ids=[self._id]),
|
264 |
open_ids=[self._id]),
|