1 files changed, 14 insertions, 5 deletions
diff --git a/iptv.sh b/iptv.sh
index ad2dd04..aa9fd55 100755
--- a/iptv.sh
+++ b/iptv.sh
@@ -98,6 +98,18 @@ extract_hostname () {
   printf '%s\n' "$res"
 }
 
+retrieve_encry_token () {
+  local endpoint="$1"
+  local user_id="$2"
+  local url="http://$endpoint/EPG/oauth/v2/authorize?response_type=EncryToken&client_id=jiulian&userid=$user_id"
+  local response
+  local token
+  response=$(curl "${CURL_ARGS[@]}" "$url") || return 1
+  token=$(printf '%s' "$response" | jq -r '.EncryToken') || return 1
+  [[ -n "$token" && "$token" != "null" ]] || return 1
+  printf '%s\n' "$token"
+}
+
 build_authinfo () {
   local encry_token="$1"
   local user_id="$2"
@@ -239,11 +251,8 @@ make_playlist () {
   local host
   host=$(retrieve_endpoint "$user_id") || fatal 'Failed to retrieve endpoint'
 
-  # Retreive challenge token
-  response=$(curl "${CURL_ARGS[@]}" \
-    "http://$host/EPG/oauth/v2/authorize?response_type=EncryToken&client_id=jiulian&userid=$user_id")
-
-  encry_token=$(echo "$response" | jq -r '.EncryToken')
+  local encry_token
+  encry_token=$(retrieve_encry_token "$host" "$user_id") || fatal 'Failed to retrieve encry token'
 
   # Authenticate
   local key