Revision 11d5fd8b

b/snf-astakos-app/astakos/im/tests/auth.py
820 820

  
821 821
        # new academic user
822 822
        self.assertFalse(academic_users.filter(email='newuser@synnefo.org'))
823
        cl_newuser.set_tokens(remote_user="newusereppn",
824
                              mail="newuser@synnefo.org",
823
        cl_newuser.set_tokens(eppn="newusereppn", mail="newuser@synnefo.org",
825 824
                              surname="Lastname")
826 825
        r = cl_newuser.get(ui_url('login/shibboleth?'), follow=True)
827 826
        initial = r.context['signup_form'].initial
b/snf-astakos-app/astakos/im/views/im.py
462 462
    form = activation_backend.get_signup_form(
463 463
        provider, None, **form_kwargs)
464 464

  
465

  
465 466
    if request.method == 'POST':
466 467
        form = activation_backend.get_signup_form(
467 468
            provider,
b/snf-astakos-app/astakos/im/views/target/shibboleth.py
158 158
        fullname = '%s %s' % (first_name, last_name)
159 159

  
160 160
        if not any([first_name, last_name]) and \
161
<<<<<<< HEAD
161 162
                settings.SHIBBOLETH_REQUIRE_NAME_INFO:
163
=======
164
                    settings.SHIBBOLETH_REQUIRE_NAME_INFO:
165
>>>>>>> astakos: Set initial signup values if available
162 166
            raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_NAME))
163 167

  
164 168
    except KeyError, e:
......
171 175

  
172 176
    affiliation = tokens.get(Tokens.SHIB_EP_AFFILIATION, 'Shibboleth')
173 177
    email = tokens.get(Tokens.SHIB_MAIL, '')
178
<<<<<<< HEAD
174 179
    provider_info = {'eppn': eppn, 'email': email, 'name': fullname,
175 180
                     'headers': shibboleth_headers, 'user_id': user_id}
181
=======
182
    eppn_info = tokens.get(Tokens.SHIB_EPPN)
183
    provider_info = {'eppn': eppn_info, 'email': email, 'name': fullname,
184
                     'headers': shibboleth_headers}
185
    userid = eppn
186

  
187
>>>>>>> astakos: Set initial signup values if available
176 188

  
177 189
    try:
178 190
        return handle_third_party_login(request, 'shibboleth',
......
184 196
                     'first_name': first_name,
185 197
                     'last_name': last_name,
186 198
                     'email': email}
199
<<<<<<< HEAD
187 200
        return handle_third_party_signup(request, user_id, 'shibboleth',
201
=======
202
        return handle_third_party_signup(request, userid, 'shibboleth',
203
>>>>>>> astakos: Set initial signup values if available
188 204
                                         third_party_key,
189 205
                                         provider_info,
190 206
                                         user_info,

Also available in: Unified diff