Revision 412048af snf-astakos-app/astakos/im/views/target/shibboleth.py

b/snf-astakos-app/astakos/im/views/target/shibboleth.py
72 72 
        pass
73 73 

  		





  74
  74
  
    
    pending_users = \


  		





  75
  
  
    
<<<<<<< HEAD


  		





  76
  75
  
    
        PendingThirdPartyUser.objects.filter(third_party_identifier=eppn,


  		





  77
  76
  
    
                                             provider='shibboleth')


  		





  78
  
  
    
=======


  		





  79
  
  
    
            PendingThirdPartyUser.objects.filter(third_party_identifier=eppn,


  		





  80
  
  
    
                                                 provider='shibboleth')


  		





  81
  
  
    
>>>>>>> astakos: Shibboleth EPPN migration functionality


  		





  82
  77
  
    

  		





  83
  78
  
    
    for pending in pending_users:


  		





  84
  79
  
    
        msg = "Migrating pending user %s eppn (%s -> %s)"


  		





  ......




  168
  163
  
    

  		





  169
  164
  
    
    except KeyError, e:


  		





  170
  165
  
    
        # invalid shibboleth headers, redirect to login, display message


  		





  
  166
  
    
        logger.exception(e)


  		





  171
  167
  
    
        messages.error(request, e.message)


  		





  172
  168
  
    
        return HttpResponseRedirect(login_url(request))


  		





  173
  169
  
    

  		












Also available in:
  Unified diff