Bugfixing configure and make temporary token possible
This commit is contained in:
@@ -90,7 +90,7 @@ get_nc_token() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -f ${DAVTOKENFILENAME} ]; then
|
||||
if [ ! -f ${DAVTOKENFILENAME} ] || [ -z ${DAVTOKENFILENAME} ]; then
|
||||
echo "No token found here. Getting a new WEBDAV Token for this Device."
|
||||
echo "Please logon to your Nextcloud instance via SSO/kerberos"
|
||||
|
||||
@@ -101,6 +101,9 @@ get_nc_token() {
|
||||
|
||||
REQTOKEN=$( echo "${REQJSON}" | grep -oP '(?<="token":")[^"]+(?=")' )
|
||||
REQURL=$( echo "${REQJSON}" | grep -oP '(?<="login":")[^"]+(?=")' )
|
||||
if [[ -z ${DISPLAY} ]]; then
|
||||
export DISPLAY=:0
|
||||
fi
|
||||
/usr/bin/firefox "${REQURL}" &
|
||||
|
||||
for i in {1..200}
|
||||
@@ -110,8 +113,12 @@ get_nc_token() {
|
||||
echo -n "Poll Number ${i}..."
|
||||
POLLJSON=$( curl -s -X POST "https://${SERVERFQDN_NC}/login/v2/poll" -d "token=${REQTOKEN}" )
|
||||
if [[ "${POLLJSON}" == *"appPassword"* ]]; then
|
||||
echo "${POLLJSON}" > ${DAVTOKENFILENAME}
|
||||
echo "found token. Token has been written to ${DAVTOKENFILENAME}"
|
||||
if [ ! -z ${DAVTOKENFILENAME} ]; then
|
||||
echo "${POLLJSON}" > ${DAVTOKENFILENAME}
|
||||
echo "Token has been written to ${DAVTOKENFILENAME}"
|
||||
else
|
||||
echo "Temporary token was obtained."
|
||||
fi
|
||||
pkill firefox
|
||||
break
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user