Skip to content

Ds v0.3.5 dev #8

Merged
merged 32 commits into from Apr 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fc0f8f2
Merge pull request #3 from TIER/master
pcaskey Nov 4, 2020
4c15361
Update custom-body.php
pcaskey Jun 10, 2021
96906f8
Update custom-body.php
pcaskey Jun 10, 2021
a56a3c7
Merge pull request #4 from TIER/v0.0.3-dev
pcaskey Jun 10, 2021
2ceb294
Update custom-body.php
pcaskey Jun 10, 2021
147d751
Merge pull request #5 from TIER/v0.0.3-dev
pcaskey Jun 10, 2021
dbf986e
Update custom-body.php
pcaskey Jun 11, 2021
cf57b7b
Merge pull request #6 from TIER/v0.0.3-dev
pcaskey Jun 11, 2021
ce53bb8
Update custom-body.php
pcaskey Jun 11, 2021
ece386e
Merge pull request #7 from TIER/v0.0.3-dev
pcaskey Jun 11, 2021
40feb20
add return URL for IdPoLR
pcaskey Aug 31, 2021
3a0449a
Update custom-body.php
pcaskey Sep 3, 2021
6cc2841
check remember-for-session
pcaskey Nov 2, 2021
6ad4867
Updated Internet2 Guest Language
aaschenbrener Mar 4, 2022
7f9b716
testing javascript cookie set for eduroam
chubing Apr 12, 2022
5fe9031
Update custom-body.php
chubing Apr 12, 2022
78e1eaf
Update custom-body.php
chubing Apr 12, 2022
dba8206
Update custom-body.php
chubing Apr 12, 2022
2368214
Update custom-body.php
chubing Apr 12, 2022
9e288fe
Update custom-body.php
chubing Apr 12, 2022
7ba5111
Update custom-body.php
chubing Apr 12, 2022
db43cd6
promote testing section to main section
chubing Apr 18, 2022
4fd9a89
update URLs for staging
chubing Apr 18, 2022
b3bd44c
Update custom-body.php
chubing Apr 18, 2022
3a416e8
Create custom-body.php
chubing Apr 18, 2022
53edc5a
Update custom-body.php
chubing Apr 18, 2022
9120685
Update custom-body.php
chubing Apr 18, 2022
5c39318
Update custom-body.php
chubing Apr 18, 2022
28b3ba1
Update custom-body.php
chubing Apr 18, 2022
0c6fab5
DEV
chubing Apr 19, 2022
b87868b
updating to match other branching strategies for IAM
chubing Apr 19, 2022
74f8a0e
Update README.md
chubing Apr 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion README.md
@@ -1,2 +1,15 @@
# CDS_Overlay
Contains UI/Overlay files for the SWITCHWAYF container
Contains UI/Overlay files for the SWITCHWAYF container for https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu

# Branches
Create branches that maps to its corresponding branch container at https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu

e.g.:


ds-v0.3.5-dev

ds-v0.3.5-staging

ds-v0.3.5-prod

32 changes: 29 additions & 3 deletions assets/dsroot/custom-body.php
@@ -1,12 +1,36 @@
<?php // Copyright (c) 2016, SWITCH
// CAF 2016 ?>
<strong> DEV </strong>
<script>
function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}

function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>

<!-- Identity Provider Selection: Start -->
<br /><?php echo getLocalString('header'); ?> <br /><br />

<div style="text-align:left;font-size:14px">
If you do not find your organization in this list, the other supported option is a Google account. You will find Google in the Identity Provider list. Please note that the old Internet2 SiteID is no longer available and those IDs no longer work.
If you do not find your organization in this list, there are two options:<br />
<ol>
<li>You can <a href="#" onclick="setGoogleIDP();return false;">login with your Google account</a>.<br /></li>
<li>You can <a href="#" onclick="setCirrusIDP();return false;">login with your Internet2 Guest account</a>.
If you are new, you may <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'>create an Internet2 Guest account</a>
(see <a href='https://spaces.at.internet2.edu/x/HpcbDQ'>Guest Account Guide</a>).<br /></li>
</ol>
</div>



<br />

<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
Expand All @@ -21,7 +45,7 @@
</div>
<div style="text-align: left">
<p class="selectOptions">
<input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true">
<input type="checkbox" checked name="session" id="rememberForSession" value="true">
<label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br>
<?php if ($showPermanentSetting) : ?>
<!-- Value permanent must be a number which is equivalent to the days the cookie should be valid -->
Expand All @@ -36,6 +60,8 @@
</div>
</form>

<br />
<input type="button" value="I'm having trouble logging in" href="#" onClick="script:window.open('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
<!-- no message -->

<!-- Identity Provider Selection: End -->
Expand Down