Merge pull request #3978 from nikolajbrinch/dev
Fixes Simply.com to use REST API version 2 with Basic Authpull/4006/head
						commit
						07cedc55e2
					
				| 
						 | 
				
			
			@ -5,8 +5,8 @@
 | 
			
		|||
#SIMPLY_AccountName="accountname"
 | 
			
		||||
#SIMPLY_ApiKey="apikey"
 | 
			
		||||
#
 | 
			
		||||
#SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
 | 
			
		||||
SIMPLY_Api_Default="https://api.simply.com/1"
 | 
			
		||||
#SIMPLY_Api="https://api.simply.com/2/"
 | 
			
		||||
SIMPLY_Api_Default="https://api.simply.com/2"
 | 
			
		||||
 | 
			
		||||
#This is used for determining success of REST call
 | 
			
		||||
SIMPLY_SUCCESS_CODE='"status":200'
 | 
			
		||||
| 
						 | 
				
			
			@ -237,12 +237,18 @@ _simply_rest() {
 | 
			
		|||
  _debug2 ep "$ep"
 | 
			
		||||
  _debug2 m "$m"
 | 
			
		||||
 | 
			
		||||
  export _H1="Content-Type: application/json"
 | 
			
		||||
  basicauth=$(printf "%s:%s" "$SIMPLY_AccountName" "$SIMPLY_ApiKey" | _base64)
 | 
			
		||||
 | 
			
		||||
  if [ "$basicauth" ]; then
 | 
			
		||||
    export _H1="Authorization: Basic $basicauth"
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  export _H2="Content-Type: application/json"
 | 
			
		||||
 | 
			
		||||
  if [ "$m" != "GET" ]; then
 | 
			
		||||
    response="$(_post "$data" "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep" "" "$m")"
 | 
			
		||||
    response="$(_post "$data" "$SIMPLY_Api/$ep" "" "$m")"
 | 
			
		||||
  else
 | 
			
		||||
    response="$(_get "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep")"
 | 
			
		||||
    response="$(_get "$SIMPLY_Api/$ep")"
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  if [ "$?" != "0" ]; then
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue