From dfe0266ba9cf47c95f6f5b9e88bd3d6fc301a64d Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Mon, 10 Dec 2018 15:10:55 +0100
Subject: [PATCH] rename url -> information_url, add organization_url
---
bin/update-metadata.in | 9 +++++----
conf/manager.sql | 3 ++-
lib/AccountManager/App.pm | 2 +-
lib/AccountManager/Entity.pm | 11 ++++++-----
lib/AccountManager/Metadata.pm | 4 ++--
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/bin/update-metadata.in b/bin/update-metadata.in
index 4e1609f..fa8a242 100755
--- a/bin/update-metadata.in
+++ b/bin/update-metadata.in
@@ -90,10 +90,11 @@ foreach my $id (split(/, */, $configuration->{groups}->{list})) {
next if $seen{$entry->{entityid}}++;
my $entity = AccountManager::Entity->new(
- db => $db,
- entityid => $entry->{entityid},
- displayname => $entry->{display_name},
- url => $entry->{url},
+ db => $db,
+ entityid => $entry->{entityid},
+ displayname => $entry->{display_name},
+ information_url => $entry->{information_url},
+ organization_url => $entry->{organization_url},
);
$entity->contacts(uniq map { $_->{EmailAddress} } @{$entry->{contacts}})
diff --git a/conf/manager.sql b/conf/manager.sql
index 322924a..3402cc1 100644
--- a/conf/manager.sql
+++ b/conf/manager.sql
@@ -14,7 +14,8 @@ CREATE TABLE tokens (
CREATE TABLE entities (
id bigint(20) NOT NULL AUTO_INCREMENT,
entityid varchar(200) NOT NULL,
- url varchar(200) DEFAULT NULL,
+ information_url varchar(200) DEFAULT NULL,
+ organization_url varchar(200) DEFAULT NULL,
displayname varchar(500) DEFAULT NULL,
contacts varchar(2000) DEFAULT NULL,
PRIMARY KEY (id),
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 6f93a70..9bce226 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -696,7 +696,7 @@ sub req_create_accounts {
action => 'create_accounts',
accounts => \@accounts,
entityid => $entityid,
- url => $sp->url(),
+ url => $sp->information_url(),
email => $email,
key => $key,
token => $download_token->secret(),
diff --git a/lib/AccountManager/Entity.pm b/lib/AccountManager/Entity.pm
index 1005691..970d0aa 100644
--- a/lib/AccountManager/Entity.pm
+++ b/lib/AccountManager/Entity.pm
@@ -12,11 +12,12 @@ __PACKAGE__->meta->setup(
table => 'entities',
columns => [
- id => { type => 'bigserial', not_null => 1 },
- entityid => { type => 'varchar', length => 200, not_null => 1 },
- displayname => { type => 'varchar', length => 500 },
- url => { type => 'varchar', length => 200 },
- contacts => { type => 'array' },
+ id => { type => 'bigserial', not_null => 1 },
+ entityid => { type => 'varchar', length => 200, not_null => 1 },
+ displayname => { type => 'varchar', length => 500 },
+ information_url => { type => 'varchar', length => 200 },
+ organization_url => { type => 'varchar', length => 200 },
+ contacts => { type => 'array' },
],
primary_key_columns => [ 'id' ],
diff --git a/lib/AccountManager/Metadata.pm b/lib/AccountManager/Metadata.pm
index e193795..654435b 100644
--- a/lib/AccountManager/Metadata.pm
+++ b/lib/AccountManager/Metadata.pm
@@ -146,7 +146,7 @@ sub parse {
my %urls =
map { $_->getAttribute('xml:lang') => $_->textContent() }
@urls;
- $data->{url} =
+ $data->{information_url} =
$urls{en} ? $urls{en} :
@urls ? $urls[0]->textContent() :
undef;
@@ -191,7 +191,7 @@ sub parse {
my %urls =
map { $_->getAttribute('xml:lang') => $_->textContent() }
@urls;
- $data->{organization} =
+ $data->{organization_url} =
$urls{en} ? $urls{en} :
@urls ? $urls[0]->textContent() :
undef;
--
GitLab