equal
deleted
inserted
replaced
356 * if a User has this Gooogle Account in their formerAccounts list |
356 * if a User has this Gooogle Account in their formerAccounts list |
357 """ |
357 """ |
358 |
358 |
359 self.checkIsLoggedIn(django_args) |
359 self.checkIsLoggedIn(django_args) |
360 |
360 |
361 if self.user or user_logic.isFormerAccount(self.id): |
361 if not self.user and not user_logic.isFormerAccount(self.id): |
362 message_fmt = DEF_USER_ACCOUNT_INVALID_MSG_FMT % { |
362 # this account has not been used yet |
363 'email' : self.id.email()} |
363 return |
364 raise out_of_band.LoginRequest(message_fmt=message_fmt) |
364 |
365 |
365 message_fmt = DEF_USER_ACCOUNT_INVALID_MSG_FMT % { |
366 return |
366 'email' : self.id.email()} |
|
367 raise out_of_band.LoginRequest(message_fmt=message_fmt) |
|
368 |
367 |
369 |
368 def checkHasUserEntity(self, django_args): |
370 def checkHasUserEntity(self, django_args): |
369 """Raises an alternate HTTP response if Google Account has no User entity. |
371 """Raises an alternate HTTP response if Google Account has no User entity. |
370 |
372 |
371 Args: |
373 Args: |