jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cloudron-activate: always login since activate return token and not accessToken

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-06-01 00:12:19 -07:00
parent 7717c7b1cd
commit 47f85434db
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/cloudron-activate
View File

@@ -87,11 +87,13 @@ if [[ $(get_status "activated") == "false" ]]; then
wait_for_status "activated" "true"
else
echo "=> Skipping activation. Getting token"
if ! activationResult=$($curl -X POST -H "Content-Type: application/json" -d "${activationData}" http://localhost:3000/api/v1/developer/login); then
echo "Failed to login with ${activationData}: ${activationResult}"
exit 1
fi
echo "=> Skipping Activation"
fi
echo "=> Getting token"
if ! activationResult=$($curl -X POST -H "Content-Type: application/json" -d "${activationData}" http://localhost:3000/api/v1/developer/login); then
echo "Failed to login with ${activationData}: ${activationResult}"
exit 1
fi
accessToken=$(echo "${activationResult}" | python3 -c 'import sys, json; print(json.load(sys.stdin)[sys.argv[1]])' "accessToken")
@@ -104,3 +106,5 @@ if ! appstoreResult=$($curl -X POST -H "Content-Type: application/json" -d "${ap
exit 1
fi
echo "=> Done!"