From 35ecaf1042ba01a4025772349d384d5742d36a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 6 Apr 2020 14:57:39 +0200 Subject: [PATCH] Add support for extended permissions --- permissions_app_ynh/manifest.json | 8 ++++++++ permissions_app_ynh/scripts/install | 10 +++++++--- permissions_app_ynh/scripts/upgrade | 10 ++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/permissions_app_ynh/manifest.json b/permissions_app_ynh/manifest.json index 8a1755b..d4d15b8 100644 --- a/permissions_app_ynh/manifest.json +++ b/permissions_app_ynh/manifest.json @@ -24,6 +24,14 @@ }, "example": "domain.org" }, + { + "name": "domain_2", + "type": "domain", + "ask": { + "en": "Choose a second domain for permissions_app" + }, + "example": "domain.org" + }, { "name": "path", "type": "path", diff --git a/permissions_app_ynh/scripts/install b/permissions_app_ynh/scripts/install index bca4f96..94b4630 100644 --- a/permissions_app_ynh/scripts/install +++ b/permissions_app_ynh/scripts/install @@ -13,19 +13,23 @@ ynh_abort_if_errors # Retrieve arguments app=$YNH_APP_INSTANCE_NAME domain=$YNH_APP_ARG_DOMAIN +domain_2=$YNH_APP_ARG_DOMAIN_2 path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH) admin_user=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC ynh_app_setting_set --app $app --key admin_user --value $admin_user +ynh_app_setting_set --app $app --key domain_2 --value $domain_2 # Check domain/path availability ynh_webpath_available $domain $path_url || ynh_die "$domain$path_url is not available, please use an other domain or path." ynh_webpath_register $app $domain $path_url -ynh_permission_create --permission "admin" --url "/admin" --allowed "$admin_user" --protected true - -ynh_permission_create --permission "dev" --url "/dev" --protected false +ynh_permission_create --permission "admin" --url "/admin" --allowed "$admin_user" --label "Testing app admin" --protected true --show_tile true --auth_header true +ynh_permission_create --permission "dev" --url "/dev" --additional_urls "/dev2" "/otherdev" "$domain_2/" --protected false --show_tile false --auth_header false +ynh_permission_create --permission "test" --protected false +ynh_permission_create --permission "trybreakssowat_1" --url "re:/break[a-z]*/" --protected false --show_tile true --auth_header true +ynh_permission_create --permission "trybreakssowat_2" --protected false --show_tile true --auth_header true #================================================= # SETUP SSOWAT diff --git a/permissions_app_ynh/scripts/upgrade b/permissions_app_ynh/scripts/upgrade index adc0c0c..2c7b417 100644 --- a/permissions_app_ynh/scripts/upgrade +++ b/permissions_app_ynh/scripts/upgrade @@ -13,10 +13,16 @@ ynh_abort_if_errors # Retrieve arguments app=$YNH_APP_INSTANCE_NAME admin_user=$(ynh_app_setting_get --app $app --key admin_user) +domain=$(ynh_app_setting_get --app $app --key domain) +domain_2=$(ynh_app_setting_get --app $app --key domain_2) #================================================= # UPDATE PERMISSIONS #================================================= -ynh_permission_update --permission admin --remove $admin_user --protected false -ynh_permission_update --permission dev --add $admin_user --protected true +ynh_permission_update --permission admin --remove $admin_user --show_tile false --protected false +ynh_permission_update --permission dev --add $admin_user --label "New tile" --protected true --show_tile true + +ynh_permission_url --permission admin --clear_urls --auth_header false +ynh_permission_url --permission dev --remove_url "$domain_2/" --auth_header true +ynh_permission_url --permission test --url "/mytest" --add_url "/otherTest" "$domain_2/bob"