Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/5476 #5479

Merged
merged 4 commits into from
Jun 24, 2020
Merged

Fix/5476 #5479

merged 4 commits into from
Jun 24, 2020

Conversation

julsemaan
Copy link
Collaborator

Description

Adjustments for SAML + OAuth for the portal modules

Impacts

SAML + OAuth portal modules

Issue

fixes #5476

Delete branch after merge

YES

Checklist

(REQUIRED) - [yes, no or n/a]

  • Document the feature
  • Add unit tests
  • Add acceptance tests (TestLink)

NEWS file entries

Enhancements

  • Adjust the settings in the admin for the SAML and OAuth portal modules

Bug Fixes

  • Honor the AUP setting of the SAML portal module

Copy link
Contributor

@nqb nqb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • aup_template and landing_template fields are missing when editing an SAML portal module.
    Not sure if it's expected.

  • If I set with_aup=0 on a SAML portal module, AUP is always displayed. Tested with

[saml_portal]
source_id=saml
actions=
fields_to_save=
custom_fields=
description=saml_portal
with_aup=0
signup_template=signin.html
pid_field=email
aup_template=aup_text.html
type=Authentication::SAML

@nqb
Copy link
Contributor

nqb commented Jun 16, 2020

Hello @julsemaan,

could you provide me your feedback ?

Thanks.

@julsemaan
Copy link
Collaborator Author

I tested it and it worked fine on my end before your comment.

I will have to revisit this and see where is the issue but it did work when I pushed the code

I'll also check to add the missing fields in the admin

@nqb
Copy link
Contributor

nqb commented Jun 16, 2020

Regarding issue with with_aup=0, I double checked and was not able to make it working.

@julsemaan
Copy link
Collaborator Author

@nqb, the with_aup is properly honored on my end

conf:

[custom-saml]
source_id=maml
actions=
fields_to_save=
custom_fields=
description=custom-saml
with_aup=0
signup_template=signin.html
pid_field=email
aup_template=aup_text.html
type=Authentication::SAML

@nqb
Copy link
Contributor

nqb commented Jun 16, 2020

I will test again.

@nqb
Copy link
Contributor

nqb commented Jun 16, 2020

It finally worked without any change on my side (except a reboot). I will test your new changes.

Comment on lines +10 to +12
<button id="button" type="submit" name="submit" class="c-btn c-btn--primary u-1/1 c-card--hidden">
[% i18n('Login') %]
</button>
Copy link
Contributor

@nqb nqb Jun 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I'm missing something, there is no need for this code here.

This code add an invisible button below "I accept the terms", you can click on it and you got "You must accept the terms and conditions"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That "I accept the terms" needs a target to submit the form

You can try to remove it and we'll see if it still works but AFAIK this is needed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right.

@nqb nqb merged commit b19fc03 into devel Jun 24, 2020
nqb added a commit that referenced this pull request Jun 24, 2020
@satkunas satkunas deleted the fix/5476 branch May 15, 2024 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Authentication::SAML: with_aup setting ignored on captive portal
2 participants