Skip to content

Commit

Permalink
fix: 🐛 Use LS ID in BBMRI negotiator scripts
Browse files Browse the repository at this point in the history 
Switch from using BBMRI IDs and BBMRI usernames to usage of LS IDs and
LS usernames

BREAKING CHANGE: 🧨 bbmri_networks, bbmri_collections now use LS IDs and LS
usernames

DEPLOYMENT NOTE: Services need to have `urn:perun:user:attribute-def:def:login
-namespace:lifescienceid-persistent-shadow` and `urn:perun:user:attribute-def:
def:login-namespace:lifescienceid-username` attributes assigned as required
in Peurn configuration if they used BBMRI IDs or BBMRI usernames. See changes
to get hint what attribute needs to be assigned for which service. Consents should
be modified to be granted for these attributes, as the ID change is internal
change and does not reall affect users.
  • Loading branch information
Dominik Frantisek Bucik committed Oct 18, 2023
1 parent a921d88 commit a196c21
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
17 changes: 8 additions & 9 deletions gen/bbmri_collections
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use utf8;

local $::SERVICE_NAME = "bbmri_collections";
local $::PROTOCOL_VERSION = "1.0.1";
my $SCRIPT_VERSION = "1.0.3";
my $SCRIPT_VERSION = "1.0.4";

perunServicesInit::init;
my $DIRECTORY = perunServicesInit::getDirectory;
Expand All @@ -27,7 +27,7 @@ sub processMemberships;

#Constants
our $A_USER_ID; *A_USER_ID = \'urn:perun:user:attribute-def:core:id';
our $A_BBMRI_USER_ID; *A_BBMRI_USER_ID = \'urn:perun:user:attribute-def:virt:login-namespace:bbmriid-persistent';
our $A_LSRI_USER_ID; *A_LSRI_USER_ID = \'urn:perun:user:attribute-def:def:login-namespace:lifescienceid-persistent-shadow';
our $A_USER_STATUS; *A_USER_STATUS = \'urn:perun:member:attribute-def:core:status';
our $A_MEMBER_IS_SUSPENDED; *A_MEMBER_IS_SUSPENDED = \'urn:perun:member:attribute-def:virt:isSuspended';
our $A_USER_EMAIL; *A_USER_EMAIL = \'urn:perun:user:attribute-def:def:preferredMail';
Expand All @@ -49,7 +49,7 @@ our $u_email = {};
our $u_name = {};
our $u_eppn = {};
our $u_organization = {};
our $u_bbmri_user_id = {};
our $u_lsri_user_id = {};

our $groupStruc = {};
our $g_name = {};
Expand All @@ -73,7 +73,7 @@ foreach my $resourceId ( $data->getResourceIds() ) {
my @users;
foreach my $uid (sort keys %$userStruc) {
my $user = {};
$user->{"id"} = "$userStruc->{$uid}->{$u_bbmri_user_id}";
$user->{"id"} = "$userStruc->{$uid}->{$u_lsri_user_id}";
$user->{"perun_user_id"} = $uid;
$user->{"displayName"} = $userStruc->{$uid}->{$u_name};
$user->{"status"} = $userStruc->{$uid}->{$u_status};
Expand Down Expand Up @@ -103,7 +103,7 @@ foreach my $gid (sort keys %$groupStruc) {
my @members;
foreach my $uid (sort keys %{$membershipStruc->{$gid}}){
my $struct = {};
$struct->{"userId"} = "$userStruc->{$uid}->{$u_bbmri_user_id}";
$struct->{"userId"} = "$userStruc->{$uid}->{$u_lsri_user_id}";
push @members, $struct;
}

Expand All @@ -128,7 +128,7 @@ sub processUsers {
my ($gid, $memberId) = @_;

my $uid = $data->getUserAttributeValue( member => $memberId, attrName => $A_USER_ID );
my $bbmriUserId = $data->getUserAttributeValue( member => $memberId, attrName => $A_BBMRI_USER_ID );
my $lsriUserId = $data->getUserAttributeValue( member => $memberId, attrName => $A_LSRI_USER_ID );
my $status = $data->getMemberAttributeValue(member => $memberId, attrName => $A_USER_STATUS);
my $isSuspended = $data->getMemberAttributeValue( member => $memberId, attrName => $A_MEMBER_IS_SUSPENDED );
if ($isSuspended) { $status = $STATUS_SUSPENDED; }
Expand All @@ -152,10 +152,9 @@ sub processUsers {
# change from SUSPENDED to EXPIRED
$userStruc->{$uid}->{$u_status} = $status;
}
}
else{
} else {
$userStruc->{$uid}->{$u_status} = $status;
$userStruc->{$uid}->{$u_bbmri_user_id} = $bbmriUserId;
$userStruc->{$uid}->{$u_lsri_user_id} = $lsriUserId;
$userStruc->{$uid}->{$u_email} = $email;
$userStruc->{$uid}->{$u_name} = $d_name;
$userStruc->{$uid}->{$u_eppn} = \@eppns;
Expand Down
14 changes: 7 additions & 7 deletions gen/bbmri_networks
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use utf8;

local $::SERVICE_NAME = "bbmri_networks";
local $::PROTOCOL_VERSION = "1.0.0";
my $SCRIPT_VERSION = "1.0.2";
my $SCRIPT_VERSION = "1.0.3";

perunServicesInit::init;
my $DIRECTORY = perunServicesInit::getDirectory;
Expand All @@ -27,7 +27,7 @@ sub processMemberships;

#Constants
our $A_USER_ID; *A_USER_ID = \'urn:perun:user:attribute-def:core:id';
our $A_BBMRI_USER_ID; *A_BBMRI_USER_ID = \'urn:perun:user:attribute-def:virt:login-namespace:bbmriid-persistent';
our $A_LSRI_USER_ID; *A_LSRI_USER_ID = \'urn:perun:user:attribute-def:def:login-namespace:lifescienceid-persistent-shadow';
our $A_USER_STATUS; *A_USER_STATUS = \'urn:perun:member:attribute-def:core:status';
our $A_USER_EMAIL; *A_USER_EMAIL = \'urn:perun:user:attribute-def:def:preferredMail';
our $A_USER_EPPNS; *A_USER_EPPNS = \'urn:perun:user:attribute-def:virt:eduPersonPrincipalNames';
Expand All @@ -46,7 +46,7 @@ our $u_status = {};
our $u_email = {};
our $u_name = {};
our $u_eppn = {};
our $u_bbmri_user_id = {};
our $u_lsri_user_id = {};

our $groupStruc = {};
our $g_name = {};
Expand All @@ -69,7 +69,7 @@ foreach my $resourceId ( $data->getResourceIds() ) {
my @users;
foreach my $uid (sort keys %$userStruc) {
my $user = {};
$user->{"id"} = "$userStruc->{$uid}->{$u_bbmri_user_id}";
$user->{"id"} = "$userStruc->{$uid}->{$u_lsri_user_id}";
$user->{"perun_user_id"} = $uid;
$user->{"displayName"} = $userStruc->{$uid}->{$u_name};
$user->{"status"} = $userStruc->{$uid}->{$u_status};
Expand All @@ -96,7 +96,7 @@ foreach my $gid (sort keys %$groupStruc) {
my @members;
foreach my $uid (sort keys %{$membershipStruc->{$gid}}){
my $struct = {};
$struct->{"userId"} = "$userStruc->{$uid}->{$u_bbmri_user_id}";
$struct->{"userId"} = "$userStruc->{$uid}->{$u_lsri_user_id}";
push @members, $struct;
}

Expand All @@ -121,7 +121,7 @@ sub processUsers {
my ($gid, $memberId) = @_;

my $uid = $data->getUserAttributeValue( member => $memberId, attrName => $A_USER_ID );
my $bbmriUserId = $data->getUserAttributeValue( member => $memberId, attrName => $A_BBMRI_USER_ID );
my $lsriUserId = $data->getUserAttributeValue( member => $memberId, attrName => $A_LSRI_USER_ID );
my $status = $data->getMemberAttributeValue( member => $memberId, attrName => $A_USER_STATUS );
my $isSuspended = $data->getMemberAttributeValue( member => $memberId, attrName => $A_MEMBER_IS_SUSPENDED );
if ($isSuspended) { $status = $STATUS_SUSPENDED; }
Expand All @@ -147,7 +147,7 @@ sub processUsers {
}
else{
$userStruc->{$uid}->{$u_status} = $status;
$userStruc->{$uid}->{$u_bbmri_user_id} = $bbmriUserId;
$userStruc->{$uid}->{$u_lsri_user_id} = $lsriUserId;
$userStruc->{$uid}->{$u_email} = $email;
$userStruc->{$uid}->{$u_name} = $d_name;
$userStruc->{$uid}->{$u_eppn} = \@eppns;
Expand Down

0 comments on commit a196c21

Please sign in to comment.