V2021 11

Handle new permission conditions since mod-permission-6 and above.

assets/scripts/register-tenant

@@ -12,7 +12,8 @@ okapi_token=""
 permission_id=""
 permissions=""
 module_descriptor=""
-tenantParameters=""
+loadSample=false
+loadReference=false
 
 parse_cmdline_parameters() {
 	! getopt --test >/dev/null
@@ -22,7 +23,7 @@ parse_cmdline_parameters() {
 	fi
 
 	OPTIONS=
-	LONGOPTS=install-backend-module:,install-frontend-module:,name:,id:,description:,debug,loadSampleWithReference,loadReference
+	LONGOPTS=install-backend-module:,install-frontend-module:,name:,id:,description:,debug,loadSample,loadReference
 	! PARSED=$(getopt --options=$OPTIONS --longoptions=$LONGOPTS --name "$0" -- "$@")
 
 	if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
@@ -60,12 +61,13 @@ parse_cmdline_parameters() {
 				debug=1
 				shift
 				;;
-			--loadSampleWithReference)
-				tenantParameters="tenantParameters=loadSample=true,loadReference=true"
+			--loadSample)
+				loadReference=true
+				loadSample=true
 				shift
 				;;
 			--loadReference)
-				tenantParameters="tenantParameters=loadReference=true"
+				loadReference=true
 				shift
 				;;
 			--)
@@ -332,7 +334,7 @@ EOF
 			-w "|%{http_code}" \
 			-H 'Content-type: application/json' \
 			--connect-timeout ${CURL_CONNECT_TIMEOUT} \
-			"${OKAPI_URL}/_/proxy/tenants/${tenant_id}/install?${tenantParameters}" \
+			"${OKAPI_URL}/_/proxy/tenants/${tenant_id}/install?tenantParameters=loadSample=${loadSample},loadReference=${loadReference}" \
 			-d @- 2>&1`
 
 		case "${result##*|}" in
@@ -489,7 +491,7 @@ create_admin_permission() {
 	read -r -d '' payload <<EOF
 {
   "userId": "${ADMIN_ID}",
-  "permissions": [ "${permission}" ]
+  "permissions": [ ${permission} ]
 }
 EOF
 
@@ -566,7 +568,7 @@ get_permissions() {
 		-H "X-Okapi-Tenant: ${tenant_id}" \
 		-H "X-Okapi-Token: ${okapi_token}" \
 		--connect-timeout ${CURL_CONNECT_TIMEOUT} \
-		"${OKAPI_URL}/perms/permissions?query=visible%3D%3Dtrue&length=500" 2>&1`
+		"${OKAPI_URL}/perms/permissions?query=childOf%3D%3D%5B%5D&length=4000" 2>&1`
 
 	case "${result##*|}" in
 		200|201)
@@ -640,7 +642,7 @@ main() {
 		&& disable_module_for_tenant $authtoken \
 		&& create_admin \
 		&& create_admin_credentials \
-		&& create_admin_permission "perms.all" \
+		&& create_admin_permission '"perms.all", "perms.users.item.post", "perms.users.assign.immutable", "perms.users.assign.mutable", "perms.users.assign.okapi"' \
 		&& install_modules $modules \
 		&& login \
 		&& get_permissions \
@@ -649,4 +651,4 @@ main() {
 	return $?
 }
 
-main "$@"
\ No newline at end of file
+main "$@"