From b35b4e7234c2b1b16fc881ab69e9a3a663c4c769 Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Tue, 29 Oct 2019 15:49:17 +0100
Subject: [PATCH] Refactor hydra client script
---
.gitlab-ci.yml | 2 +-
...create-hydra-client.sh => create-hydra-client.bash} | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
rename test/{create-hydra-client.sh => create-hydra-client.bash} (69%)
mode change 100644 => 100755
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cb5769..c2fe605 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,7 +170,7 @@ behave-integration:
- /bin/bash user-panel/utils/create-role.bash ${ROLE} backend:5000
- /bin/bash user-panel/utils/grant-access.bash ${TESTUSER_USERNAME} ${KEY} backend:5000
- /bin/bash user-panel/utils/assign-role.bash ${TESTUSER_USERNAME} ${ROLE} backend:5000
- - /bin/sh test/create-hydra-client.sh ${KEY} ${SECRET} hydra 4445 http://oauth:5000/callback
+ - /bin/bash test/create-hydra-client.bash ${KEY} ${SECRET} hydra:4445 http://oauth:5000/callback
- cd test/login_logout/test/behave/
- >
python3 -m behave
diff --git a/test/create-hydra-client.sh b/test/create-hydra-client.bash
old mode 100644
new mode 100755
similarity index 69%
rename from test/create-hydra-client.sh
rename to test/create-hydra-client.bash
index 6bbde99..92103e8
--- a/test/create-hydra-client.sh
+++ b/test/create-hydra-client.bash
@@ -1,13 +1,17 @@
#!/bin/bash
+if [[ $1 == "" ]] || [[ $1 == "-h" ]] || [[ $1 == "--help" ]]; then
+ echo "usage: $0 OAUTH_CLIENT_ID OAUCH_CLIENT_SECRET HOST REDIRECT_URL";
+ exit 0;
+fi
+
KEY=$1
SECRET=$2
HOST=$3
-PORT=$4
-REDIRECT_URI=$5
+REDIRECT_URI=$4
SCOPES="openid profile email openappstack_roles"
curl --header "Content-Type: application/json" \
--request POST \
--data "{\"client_id\": \"$KEY\", \"client_name\": \"$KEY\", \"client_secret\": \"$SECRET\", \"redirect_uris\": [\"$REDIRECT_URI\"], \"scope\": \"$SCOPES\", \"grant-types\": \"authorization_code,refresh_token\", \"response_types\": [\"code\"], \"token_endpoint_auth_method\": \"client_secret_post\"}" \
- http://$HOST:$PORT/clients
+ http://$HOST/clients
--
GitLab