This repository has been archived by the owner on Dec 19, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix broken CCD client and update xui client
- Loading branch information
Showing
5 changed files
with
50 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,8 @@ binFolder=$($(dirname "$0")/probate-dev-env-realpath) | |
| (${binFolder}/idam-create-caseworker.sh caseworker-probate,caseworker-probate-superuser [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-issuer [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-issuer [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-solicitor,XUI-SuperUser,XUI-Admin [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-solicitor,XUI-SuperUser,XUI-Admin [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-solicitor [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-solicitor [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker-probate,caseworker-probate-systemupdate [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-caseofficer [email protected]) | ||
| (${binFolder}/idam-create-caseworker.sh caseworker,caseworker-probate,caseworker-probate-caseadmin [email protected]) | ||
|
|
@@ -39,3 +39,9 @@ binFolder=$($(dirname "$0")/probate-dev-env-realpath) | |
| (${binFolder}/ccd-add-role.sh caseworker-probate-charity) | ||
| (${binFolder}/ccd-add-role.sh caseworker-probate-bulkscan) | ||
|
|
||
| # Setup Profiles in XUI | ||
| echo "Setting up profiles in XUI..." | ||
|
|
||
| (${binFolder}/xui-add-role.sh caseworker-probate-solicitor) | ||
| (${binFolder}/xui-add-role.sh XUI-SuperUser) | ||
| (${binFolder}/xui-add-role.sh XUI-Admin) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ REDIRECT_URI="http://localhost:3451/oauth2redirect" | |
| CLIENT_ID="ccd_gateway" | ||
| CLIENT_SECRET="ccd_gateway_secret" | ||
| XUI_CLIENT_ID="xuiwebapp" | ||
| XUI_CLIENT_SECRET=${OAUTH2_CLIENT_SECRET} | ||
| XUI_CLIENT_SECRET="ccd_gateway_secret" | ||
| BIN_FOLDER=$($(dirname "$0")/probate-dev-env-realpath) | ||
|
|
||
| authToken=$(curl -s -H 'Content-Type: application/x-www-form-urlencoded' -XPOST "${IDAM_URI}/[email protected]&password=Ref0rmIsFun" | docker run --rm --interactive stedolan/jq -r .api_auth_token) | ||
|
|
@@ -20,7 +20,7 @@ curl -XPOST \ | |
| ${IDAM_URI}/services \ | ||
| -H "Authorization: AdminApiAuthToken ${authToken}" \ | ||
| -H "Content-Type: application/json" \ | ||
| -d '{ "activationRedirectUrl": "", "allowedRoles": ["ccd-import", "caseworker", "caseworker-probate", "caseworker-probate", "caseworker-probate-issuer", "caseworker-probate-solicitor", "caseworker-probate-authoriser", "caseworker-probate-systemupdate", "caseworker-probate-scheduler", "caseworker-probate-caseofficer", "caseworker-probate-caseadmin", "caseworker-probate-registrar", "caseworker-probate-superuser", "caseworker-probate-charity", "payment", "caseworker-probate-bulkscan"], "description": "ccd_gateway", "label": "ccd_gateway", "oauth2ClientId": "ccd_gateway", "oauth2ClientSecret": "ccd_gateway_secret", "oauth2RedirectUris": ["http://localhost:3451/oauth2redirect", "http://localhost:3000/oauth2/callback"], "oauth2Scope": "string", "onboardingEndpoint": "string", "onboardingRoles": ["ccd-import", "caseworker", "caseworker-probate", "caseworker-probate", "caseworker-probate-issuer", "caseworker-probate-solicitor", "caseworker-probate-authoriser", "caseworker-probate-systemupdate", "caseworker-probate-caseofficer", "caseworker-probate-caseadmin", "caseworker-probate-registrar", "caseworker-probate-superuser", "caseworker-probate-charity", "payment", "caseworker-probate-bulkscan" ], "selfRegistrationAllowed": true}' | ||
| -d '{ "activationRedirectUrl": "", "allowedRoles": ["ccd-import", "caseworker", "caseworker-probate", "caseworker-probate", "caseworker-probate-issuer", "caseworker-probate-solicitor", "caseworker-probate-authoriser", "caseworker-probate-systemupdate", "caseworker-probate-scheduler", "caseworker-probate-caseofficer", "caseworker-probate-caseadmin", "caseworker-probate-registrar", "caseworker-probate-superuser", "caseworker-probate-charity", "payment", "caseworker-probate-bulkscan"], "description": "ccd_gateway", "label": "ccd_gateway", "oauth2ClientId": "ccd_gateway", "oauth2ClientSecret": "ccd_gateway_secret", "oauth2RedirectUris": ["http://localhost:3451/oauth2redirect", "http://localhost:3000/oauth2/callback" ], "oauth2Scope": "string", "onboardingEndpoint": "string", "onboardingRoles": ["ccd-import", "caseworker", "caseworker-probate", "caseworker-probate", "caseworker-probate-issuer", "caseworker-probate-solicitor", "caseworker-probate-authoriser", "caseworker-probate-systemupdate", "caseworker-probate-caseofficer", "caseworker-probate-caseadmin", "caseworker-probate-registrar", "caseworker-probate-superuser", "caseworker-probate-charity", "payment", "caseworker-probate-bulkscan" ], "selfRegistrationAllowed": true}' | ||
|
|
||
| echo "Setup xui client" | ||
| # Create a xui client | ||
|
|
@@ -66,37 +66,5 @@ curl -XPUT \ | |
| -H "Content-Type: application/json" \ | ||
| -d '["ccd-import", "caseworker", "caseworker-probate", "caseworker-probate", "caseworker-probate-solicitor", "caseworker-probate-superuser", "payment", "XUI-Admin", "XUI-SuperUser"]' | ||
|
|
||
|
|
||
|
|
||
| echo "Creating idam users" | ||
| $BIN_FOLDER/idam-create-user.sh ccd-import [email protected] Pa55word11 Default CCD_Docker | ||
| $BIN_FOLDER/idam-create-user.sh caseworker-probate,caseworker-probate-caseofficer [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker-probate,caseworker-probate-caseadmin [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker-probate,caseworker-probate-registrar [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker-probate,caseworker-probate-superuser [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-issuer [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-issuer [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-solicitor,XUI-Admin,XUI-SuperUser [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-solicitor,XUI-Admin,XUI-SuperUser [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker-probate,caseworker-probate-systemupdate [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-caseofficer [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-caseadmin [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-registrar [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-superuser [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-scheduler [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-pcqextractor [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh citizen [email protected] | ||
| $BIN_FOLDER/idam-create-user.sh caseworker,caseworker-probate,caseworker-probate-charity [email protected] | ||
|
|
||
|
|
||
| # Setup Profiles in XUI | ||
| echo "Setting up profiles in XUI..." | ||
|
|
||
| USER_TOKEN="$($BIN_FOLDER/idam-xui-user-token.sh)" | ||
| SERVICE_TOKEN="$($BIN_FOLDER/idam-service-token.sh xuiwebapp)" | ||
| $BIN_FOLDER/register-role.sh "caseworker-probate-solicitor" "$USER_TOKEN" "$SERVICE_TOKEN" | ||
| $BIN_FOLDER/register-role.sh "caseworker-probate" "$USER_TOKEN" "$SERVICE_TOKEN" | ||
| $BIN_FOLDER/register-role.sh "XUI-SuperUser" "$USER_TOKEN" "$SERVICE_TOKEN" | ||
| $BIN_FOLDER/register-role.sh "XUI-Admin" "$USER_TOKEN" "$SERVICE_TOKEN" | ||
|
|
||
| echo "" | ||
| echo "Idam setup complete" | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #!/bin/bash | ||
| ## Usage: ./ccd-add-role.sh role [classification] | ||
| ## | ||
| ## Options: | ||
| ## - role: Name of the role. Must be an existing IDAM role. | ||
| ## - classification: Classification granted to the role; one of `PUBLIC`, | ||
| ## `PRIVATE` or `RESTRICTED`. Default to `PUBLIC`. | ||
| ## | ||
| ## Add support for an IDAM role in CCD. | ||
|
|
||
| role=$1 | ||
| classification=${2:-PUBLIC} | ||
|
|
||
| if [ -z "$role" ] | ||
| then | ||
| echo "Usage: ./ccd-add-role.sh role [classification]" | ||
| exit 1 | ||
| fi | ||
|
|
||
| case $classification in | ||
| PUBLIC|PRIVATE|RESTRICTED) | ||
| ;; | ||
| *) | ||
| echo "Classification must be one of: PUBLIC, PRIVATE or RESTRICTED" | ||
| exit 1 ;; | ||
| esac | ||
|
|
||
| binFolder=$($(dirname "$0")/probate-dev-env-realpath) | ||
|
|
||
| userToken="$(${binFolder}/idam-xui-user-token.sh)" | ||
| serviceToken="$(${binFolder}/idam-service-token.sh xuiwebapp)" | ||
|
|
||
| curl -s -XPUT \ | ||
| http://localhost:4451/api/user-role \ | ||
| -H "Authorization: Bearer ${userToken}" \ | ||
| -H "ServiceAuthorization: Bearer ${serviceToken}" \ | ||
| -H "Content-Type: application/json" \ | ||
| -d '{"role":"'${role}'","security_classification":"'${classification}'"}' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters