Skip to content

Commit ffc3adb

Browse files
committed
[SKIP-CI] auth-utils: Fix curl command
1 parent 6fa449e commit ffc3adb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

release/bash/gupload

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ cat "$TMPFILE.code"
10221022
return 1
10231023
fi
10241024
(rm -f "$TMPFILE.code"&)
1025-
response_check_refresh_token="$(_curl --compressed "$CURL_PROGRESS" -X POST \
1025+
response_check_refresh_token="$(curl --compressed "$CURL_PROGRESS" -X POST \
10261026
--data "code=$authorization_code&client_id=$CLIENT_ID&client_secret=$CLIENT_SECRET&redirect_uri=$REDIRECT_URI%3A$server_port_check_refresh_token&grant_type=authorization_code&code_verifier=$code_challenge_check_refresh_token" "$TOKEN_URL")"||:
10271027
_clear_line 1 1>&2
10281028
refresh_token_value_check_refresh_token="$(printf "%s\n" "$response_check_refresh_token"|_json_value refresh_token 1 1)"||{ printf "%s\n" "Error: Cannot fetch refresh token, make sure the authorization code was correct."&&printf "%s\n" "$response_check_refresh_token"&&return 1;}

release/sh/gupload

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ cat "$TMPFILE.code"
995995
return 1
996996
fi
997997
(rm -f "$TMPFILE.code"&)
998-
response_check_refresh_token="$(_curl --compressed "$CURL_PROGRESS" -X POST \
998+
response_check_refresh_token="$(curl --compressed "$CURL_PROGRESS" -X POST \
999999
--data "code=$authorization_code&client_id=$CLIENT_ID&client_secret=$CLIENT_SECRET&redirect_uri=$REDIRECT_URI%3A$server_port_check_refresh_token&grant_type=authorization_code&code_verifier=$code_challenge_check_refresh_token" "$TOKEN_URL")"||:
10001000
_clear_line 1 1>&2
10011001
refresh_token_value_check_refresh_token="$(printf "%s\n" "$response_check_refresh_token"|_json_value refresh_token 1 1)"||{ printf "%s\n" "Error: Cannot fetch refresh token, make sure the authorization code was correct."&&printf "%s\n" "$response_check_refresh_token"&&return 1;}

src/common/auth-utils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,12 @@ EOF
398398
(rm -f "${TMPFILE}.code" &)
399399

400400
# https://developers.google.com/identity/protocols/oauth2/native-app#handlingresponse
401-
response_check_refresh_token="$(_curl --compressed "${CURL_PROGRESS}" -X POST \
401+
response_check_refresh_token="$(curl --compressed "${CURL_PROGRESS}" -X POST \
402402
--data "code=${authorization_code}&client_id=${CLIENT_ID}&client_secret=${CLIENT_SECRET}&redirect_uri=${REDIRECT_URI}%3A${server_port_check_refresh_token}&grant_type=authorization_code&code_verifier=${code_challenge_check_refresh_token}" "${TOKEN_URL}")" || :
403403
_clear_line 1 1>&2
404404

405405
refresh_token_value_check_refresh_token="$(printf "%s\n" "${response_check_refresh_token}" | _json_value refresh_token 1 1)" ||
406-
{ printf "%s\n" "Error: Cannot fetch refresh token, make sure the authorization code was correct." && printf "%s\n" "${response_check_refresh_token}" && return 1; }
406+
{ printf "%s\n" "Error: Code was not fetched properly , here is some info that maybe helpful.." && printf "%s\n" "${response_check_refresh_token}" && return 1; }
407407

408408
_set_value direct REFRESH_TOKEN "${refresh_token_value_check_refresh_token}"
409409
{ _check_access_token "${account_name_check_refresh_token}" skip_check "${response_check_refresh_token}" &&

0 commit comments

Comments
 (0)