Merge pull request #16 from jonico/auto-org-trouble-trouble-shooting

Descriptive error if org cannot be determined

Author: jonico

.pscale/cli-helper-scripts/set-db-and-org-and-branch-name.sh

@@ -6,9 +6,9 @@ echo "Using DB name ${DB_NAME}"
 # set org name to first org the user has access to unless it is already set in ORG_NAME
 if [ -z "${ORG_NAME}" ]; then
     export ORG_NAME=`pscale org list --format json | jq -r ".[0].name"`
-    # check exit code
-    if [ $? -ne 0 ]; then
-        echo "Error: Failed to get PlanetScale org name"
+    # check exit code and name of the org
+    if [ $? -ne 0 ] || [ -z "${ORG_NAME}" ]; then
+        echo "Error: Failed to get PlanetScale org name, please set ORG_NAME explicitly or use Web based SSO, service tokens do not allow to list orgs."
         exit 1
     fi
 fi