Revision 606dea8d

b/snf-astakos-app/astakos/im/models.py
1174 1174 
        self.last_login = datetime.now()
1175 1175 
        self.token = default_token_generator.make_token(self)
1176 1176 

  		





  
  1177
  
    
    def existing_user(self):


  		





  
  1178
  
    
        return AstakosUser.objects.filter(auth_providers__module=self.provider,


  		





  
  1179
  
    
                                         auth_providers__identifier=self.third_party_identifier)


  		





  
  1180
  
    

  		





  1177
  1181
  
    
class SessionCatalog(models.Model):


  		





  1178
  1182
  
    
    session_key = models.CharField(_('session key'), max_length=40)


  		





  1179
  1183
  
    
    user = models.ForeignKey(AstakosUser, related_name='sessions', null=True)


  		












  

    
      b/snf-astakos-app/astakos/im/static/im/css/modules.css
    
  






  35
  35
  
    
.top-msg.error                              	{ background-color:#EF4F54; color: #fff}


  		





  36
  36
  
    
.top-msg.warning                                { background-color:#F6921E; color: #fff}


  		





  37
  37
  
    
.top-msg.info                                 	{ background-color:#C3C3B9; color: #fff}


  		





  38
  
  
    
.top-msg.warning a                              { color: #fff}


  		





  
  38
  
    
.top-msg.warning a                              { color: #4F3515}


  		





  39
  39
  
    
.top-msg.info a                                 { color: #222}


  		





  40
  40
  
    

  		





  41
  41
  
    
/* container */


  		












  

    
      b/snf-astakos-app/astakos/im/target/shibboleth.py
    
  






  90
  90
  
    

  		





  91
  91
  
    
    try:


  		





  92
  92
  
    
        eppn = tokens.get(Tokens.SHIB_EPPN)


  		





  93
  
  
    
        eppn = "124"


  		





  94
  93
  
    
        if not eppn:


  		





  95
  94
  
    
            raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_EPPN) % {


  		





  96
  95
  
    
                'domain': settings.BASEURL,


  		












  

    
      b/snf-astakos-app/astakos/im/views.py
    
  






  487
  487
  
    
    except AstakosUser.DoesNotExist:


  		





  488
  488
  
    
        instance = None


  		





  489
  489
  
    

  		





  
  490
  
    
    pending_user = None


  		





  490
  491
  
    
    third_party_token = request.REQUEST.get('third_party_token', None)


  		





  491
  492
  
    
    if third_party_token:


  		





  492
  493
  
    
        pending = get_object_or_404(PendingThirdPartyUser,


  		





  493
  494
  
    
                                    token=third_party_token)


  		





  494
  495
  
    
        provider = pending.provider


  		





  495
  496
  
    
        instance = pending.get_user_instance()


  		





  
  497
  
    
        if pending.existing_user().count() > 0:


  		





  
  498
  
    
            pending_user = pending.existing_user().get()


  		





  
  499
  
    
            if request.method == "GET":


  		





  
  500
  
    
                messages.warning(request, pending_user.get_inactive_message())


  		





  
  501
  
    

  		





  
  502
  
    

  		





  
  503
  
    
    extra_context['pending_user_exists'] = pending_user


  		





  496
  504
  
    

  		





  497
  505
  
    
    try:


  		





  498
  506
  
    
        if not backend:


  		












Also available in:
  Unified diff