dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP - Modify oidcConsents key structure

Browse Source
This commit is contained in:
Christophe Maudoux 2018-07-15 22:08:30 +02:00
parent 4885fce87f
commit c381ae86b6
5 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -544,14 +544,14 @@ sub mkOidcConsent {
#####################
foreach (@$_consents) {
if ( defined $_->{rp} ){
my $rp = $_->{rp};
$self->logger->debug("RP $rp Consent found");
$consents->{$rp}->{epoch} = $_->{epoch};
$consents->{$rp}->{scope} = $_->{scope};
$consents->{$rp}->{displayName} =
$self->conf->{oidcRPMetaDataOptions}->{$rp}->{oidcRPMetaDataOptionsDisplayName};
}
if ( defined $_->{rp} ) {
my $rp = $_->{rp};
$self->logger->debug("RP { $rp } Consent found");
$consents->{$rp}->{epoch} = $_->{epoch};
$consents->{$rp}->{scope} = $_->{scope};
$consents->{$rp}->{displayName} =
$self->conf->{oidcRPMetaDataOptions}->{$rp}->{oidcRPMetaDataOptionsDisplayName};
}
}
#foreach ( keys %$session ) {
@ -573,7 +573,7 @@ sub mkOidcConsent {
map {
{
name => $_,
time => $consents->{$_}->{epoch},
epoch => $consents->{$_}->{epoch},
scope => $consents->{$_}->{scope},
displayName => $consents->{$_}->{displayName}
}

28
lemonldap-ng-portal/site/coffee/portal.coffee
View File

@ -54,7 +54,7 @@ getValues = () ->
# ----------------------------------------
setSelector = "#appslist"
# Function that writes the list order to session (network errors ignored)
# Function to write the sorted apps list to session (network errors ignored)
setOrder = ->
setKey '_appsListOrder', $(setSelector).sortable("toArray").join()
@ -71,16 +71,23 @@ removeOidcConsent = (partner) ->
# alert "#{s} #{e}"
e = (j,s,e) ->
alert "#{s} #{e}"
delKey "_oidc_consent_time_#{partner}"
#delKey "_oidc_consent_time_#{partner}"
## Success
#, () ->
#delKey "_oidc_consent_scope_#{partner}"
## Success
#, () ->
#$("[partner='#{partner}']").hide()
## Error
#, e
#, e
delKey "_oidcConsents",partner
# Success
, () ->
delKey "_oidc_consent_scope_#{partner}"
# Success
, () ->
$("[partner='#{partner}']").hide()
# Error
, e
$("[partner='#{partner}']").hide()
# Error
, e
# Function used by setOrder() and removeOidcConsent() to push new values
# For security reason, modification is rejected unless a valid token is given
@ -104,7 +111,7 @@ setKey = (key,val,success,error) ->
success: success
error: error
delKey = (key,success,error) ->
delKey = (key,partner,success,error) ->
$.ajax
type: "GET"
url: datas['scriptname'] + '/mysession/?gettoken'
@ -114,7 +121,8 @@ delKey = (key,success,error) ->
success: (data) ->
$.ajax
type: "DELETE"
url: "#{datas['scriptname']}/mysession/persistent/#{key}?token=#{data.token}"
url: "#{datas['scriptname']}/mysession/persistent/#{key}?option=#{partner}&token=#{data.token}"
#url: "#{datas['scriptname']}/mysession/persistent/#{key}?token=#{data.token}"
dataType: 'json'
success: success
error: error

10
lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
View File

@ -79,10 +79,8 @@ LemonLDAP::NG Portal jQuery scripts
e = function(j, s, e) {
return alert(s + " " + e);
};
return delKey("_oidc_consent_time_" + partner, function() {
return delKey("_oidc_consent_scope_" + partner, function() {
return $("[partner='" + partner + "']").hide();
}, e);
return delKey("_oidcConsents", partner, function() {
return $("[partner='" + partner + "']").hide();
}, e);
};
@ -110,7 +108,7 @@ LemonLDAP::NG Portal jQuery scripts
});
};
delKey = function(key, success, error) {
delKey = function(key, partner, success, error) {
return $.ajax({
type: "GET",
url: datas['scriptname'] + '/mysession/?gettoken',
@ -119,7 +117,7 @@ LemonLDAP::NG Portal jQuery scripts
success: function(data) {
return $.ajax({
type: "DELETE",
url: datas['scriptname'] + "/mysession/persistent/" + key + "?token=" + data.token,
url: datas['scriptname'] + "/mysession/persistent/" + key + "?option=" + partner + "&token=" + data.token,
dataType: 'json',
success: success,
error: error

2
lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-portal/site/templates/bootstrap/oidcConsents.tpl
View File

@ -11,7 +11,7 @@
<TMPL_LOOP NAME="partners">
<tr partner="<TMPL_VAR NAME="name">">
<td><TMPL_VAR NAME="displayName"></td>
<td class="localeDate" val="<TMPL_VAR NAME="time">"></td>
<td class="localeDate" val="<TMPL_VAR NAME="epoch">"></td>
<td><TMPL_VAR NAME="scope"></td>
<td><a partner="<TMPL_VAR NAME="name">" title="delete" class="oidcConsent link nodecor text-danger glyphicon glyphicon-minus-sign"></a></td>
</td>