Skip to content

Commit c8280da

Browse files
jonasbardinojonasbardino
committed
Manually merge PR146 to make index page quicktabs more flexible in site conf and query args in preparation for our switch to OpenID Connect. Sync some auth methods support like x509 certs even if left disabled by default.
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6164 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 8c0a2b5 commit c8280da

15 files changed

+563
-124
lines changed

‎mig/images/site-conf-dev-sif.erda.dk.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "SIF", "DEV.SIF"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoid", "migoid"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-dev.erda.dk.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "ERDA", "DEV.ERDA"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoid", "extoidc", "migoid", "extcert"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-erda.dk.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "ERDA"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoid", "migoid", "extcert"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-migrid.org.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "MiGrid"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoidc", "migoid", "extcert"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-sif.erda.dk.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "SIF"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoid", "migoid"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-status.erda.dk.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ function get_site_conf(key) {
1010
if (key === 'content_url') {
1111
value = "status-events.json";
1212
} else if (key === 'system_match') {
13-
value = ["ALL", "ERDA", "IDMC", "SIF", "MiGrid"];
13+
/* We keep IDMC for history */
14+
value = ["ALL", "ERDA", "SIF", "MiGrid", "IDMC"];
15+
} else if (key === 'auth_methods') {
16+
value = ["extoid", "extoidc", "migoid", "extcert"];
1417
}
1518
return value;
1619
}

‎mig/images/site-conf-storage.deic.dk.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "DeiC"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoidc", "migoid"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-test-sif.erda.dk.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function get_site_conf(key) {
99
value = "status-events.json";
1010
} else if (key === 'system_match') {
1111
value = ["ALL", "SIF", "TEST.SIF"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoid", "migoid"];
1214
}
1315
return value;
1416
}

‎mig/images/site-conf-migrid.erda.dk.js renamed to ‎mig/images/site-conf-test.erda.dk.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
/*
2-
Local site variables to adjust look n' feel of what is displayed on the
1+
/*
2+
Local site variables to adjust look n' feel of what is displayed on the
33
'static' html pages with javascript content loading on this site.
44
5-
IMPORTANT: ui doubles as status.erda.dk so we should only display production
6-
information in status.html here.
75
*/
86
function get_site_conf(key) {
97
var value;
108
if (key === 'content_url') {
119
value = "status-events.json";
1210
} else if (key === 'system_match') {
13-
value = ["ALL", "MiGrid"];
14-
}
11+
value = ["ALL", "ERDA", "TEST.ERDA"];
12+
} else if (key === 'auth_methods') {
13+
value = ["extoid", "extoidc", "migoid", "extcert"];
14+
}
1515
return value;
1616
}

‎state/wwwpublic/index-dev-sif.erda.dk-ucph-science.html

Lines changed: 153 additions & 22 deletions
Large diffs are not rendered by default.

‎state/wwwpublic/index-erda.dk-ucph-science.html

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<link rel="icon" type="image/vnd.microsoft.icon"
3535
href="/images/skin/erda-ucph-science/favicon.ico"/>
3636

37+
<!-- site-specific variables used to adjust displayed information -->
38+
<script type="text/javascript" src="/images/site-conf.js"></script>
39+
3740
<script type="text/javascript" src="/images/js/jquery.js"></script>
3841
<script type="text/javascript" src="/images/js/jquery-ui.js"></script>
3942
<script type="text/javascript" src="/assets/js/V2/ui-dynamic.js"></script>
@@ -114,26 +117,37 @@
114117
switch_language(user_lang);
115118
$("#langselect").msDropdown().fadeIn(500);
116119

117-
var query = window.location.search;
118-
const urlParams = new URLSearchParams(query);
119-
var show = [];
120-
var quicktabs = ['extoid', 'extoidc', 'migoid', 'extcert'];
121-
urlParams.forEach((value, key) => {
122-
//console.log("Found "+value+" in "+key);
123-
show.push(value);
124-
});
125-
if (!urlParams.get('show')) {
126-
show = ['extoid', 'migoid', 'extcert'];
127-
}
128-
quicktabs.forEach((name) => {
129-
if (show.indexOf(name) >= 0) {
130-
//console.log("show "+name+" tab");
120+
var auth_methods = lookup_site_conf('auth_methods', ['extoid', 'migoid', 'extcert']);
121+
var query = window.location.search;
122+
const urlParams = new URLSearchParams(query);
123+
var show = [];
124+
var quicktabs = ['extoid', 'extoidc', 'migoid', 'extcert'];
125+
urlParams.forEach((value, key) => {
126+
//console.log("Found "+value+" in "+key);
127+
if (quicktabs.indexOf(value) >= 0) {
128+
show.push(value);
129+
}
130+
});
131+
if (!urlParams.get('show')) {
132+
if (auth_methods.length > 0) {
133+
//console.log("show auth_methods: " + auth_methods);
134+
show = auth_methods;
135+
} else {
136+
//console.log("show quicktabs: " + quicktabs);
137+
show = quicktabs;
138+
}
139+
} else {
140+
//console.log("show urlparams: " + show);
141+
}
142+
quicktabs.forEach((name) => {
143+
if (show.indexOf(name) >= 0) {
144+
//console.log("show "+name+" tab");
131145
$(".show-"+name).show();
132-
} else {
133-
//console.log("remove "+name+" tab");
146+
} else {
147+
//console.log("remove "+name+" tab");
134148
$(".show-"+name).remove();
135-
}
136-
});
149+
}
150+
});
137151

138152
/* Init Quick Start as tabs to avoid information overload and do
139153
last for proper init. */
@@ -202,10 +216,10 @@ <h1 class="staticpage">Welcome to ERDA</h1>
202216

203217
<div id="quick-start-tabs-en">
204218
<ul class="fillwidth padspace">
205-
<li title="KU OpenID 2.0 Auth" class="show-extoid"><a href="#ucph-user-tab-en">KU / UCPH Users</a></li>
206-
<li title="KU OpenID Connect Auth" class="show-extoidc"><a href="#ucph-oidc-user-tab-en">KU / UCPH Users (NEW OIDC)</a></li>
207-
<li title="Built-in OpenID 2.0 Auth" class="show-migoid"><a href="#external-user-tab-en">External Users</a></li>
208-
<li title="X509 User Certificate Auth" class="show-extcert"><a href="#cert-user-tab-en">Advanced Access</a></li>
219+
<li title="KU OpenID 2.0 Auth" class="show-extoid"><a class="extoid-icon" href="#ucph-user-tab-en">KU / UCPH Users</a></li>
220+
<li title="KU OpenID Connect Auth" class="show-extoidc"><a class="extoidc-icon" href="#ucph-oidc-user-tab-en">KU / UCPH Users</a></li>
221+
<li title="Built-in OpenID 2.0 Auth" class="show-migoid"><a class="migoid-icon" href="#external-user-tab-en">External Users</a></li>
222+
<li title="X509 User Certificate Auth" class="show-extcert"><a class="extcert-icon" href="#cert-user-tab-en">Advanced Access</a></li>
209223
</ul>
210224

211225
<div id="ucph-user-tab-en" class="show-extoid">
@@ -401,10 +415,10 @@ <h1 class="staticpage">Velkommen til ERDA</h1>
401415
<div id="quick-start-tabs-da">
402416

403417
<ul>
404-
<li class="show-extoid" title="UCPH OpenID 2.0 Auth"><a href="#ucph-user-tab-da">KU / UCPH brugere</a></li>
405-
<li class="show-extoidc" title="UCPH OpenID Connect Auth"><a href="#ucph-oidc-user-tab-da">KU / UCPH brugere (NY OIDC)</a></li>
406-
<li class="show-migoid" title="Built-in OpenID 2.0 Auth"><a href="#external-user-tab-da">Eksterne brugere</a></li>
407-
<li class="show-extcert" title="X509 User Certificate Auth"><a href="#cert-user-tab-da">Avanceret adgang</a></li>
418+
<li title="UCPH OpenID 2.0 Auth" class="show-extoid"><a class="extoid-icon" href="#ucph-user-tab-da">KU / UCPH brugere</a></li>
419+
<li title="UCPH OpenID Connect Auth" class="show-extoidc"><a class="extoidc-icon" href="#ucph-oidc-user-tab-da">KU / UCPH brugere</a></li>
420+
<li title="Built-in OpenID 2.0 Auth" class="show-migoid"><a class="migoid-icon" href="#external-user-tab-da">Eksterne brugere</a></li>
421+
<li title="X509 User Certificate Auth" class="show-extcert"><a class="extcert-icon" href="#cert-user-tab-da">Avanceret adgang</a></li>
408422
</ul>
409423

410424
<div id="ucph-user-tab-da" class="show-extoid">

0 commit comments

Comments
 (0)