Inspection of "Add HMAC key for 4.30.2" - mmainstreet/jodel-web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( e57fd9...512934 )

by mains

created 2016-12-15 16:18 UTC

Status

Indentation +116 added lines, -116 removed lines patch added patch discarded remove patch

@@ -2,19 +2,19 @@  discard block
 block discarded – undo
 
 abstract class AbstractRequest
 {	
-    CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    CONST APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = "zpwKnTvubiKritHEnjOTcTeHxLJJNTEVumuNZqcE";
-    const USERAGENT = "Jodel/4.30.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
-    const CLIENT_TYPE = 'android_4.30.2';
+	CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	CONST APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = "zpwKnTvubiKritHEnjOTcTeHxLJJNTEVumuNZqcE";
+	const USERAGENT = "Jodel/4.30.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
+	const CLIENT_TYPE = 'android_4.30.2';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = "";
-    public $version = 'v2';
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = "";
+	public $version = 'v2';
 
-    public function execute()
-    {
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,78 +24,78 @@  discard block
 block discarded – undo
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
-        /*
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
+		/*
         var_dump($url);
         var_dump($header);
         var_dump($this->payLoad);
         */
         
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                if($this->version == 'v3')
-                {
-                    $result = Requests::get($url, $header);
-                }
-                else
-                {
-                    $result = Requests::get($url, $header);
-                }
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = "Success";
-                break;
-            case 401:
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->version == 'v3')
+				{
+					$result = Requests::get($url, $header);
+				}
+				else
+				{
+					$result = Requests::get($url, $header);
+				}
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = "Success";
+				break;
+			case 401:
 				throw new \Exception('Unauthorized');
-                break;
-            case 404:
-                //echo "Es wurde bereits gevoted";
+				break;
+			case 404:
+				//echo "Es wurde bereits gevoted";
 			case 477:
-                //echo "Es wurde bereits gevoted";
-                //throw  new \Exception('Signing failed!');
-                break;
-            default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
-        }
+				//echo "Es wurde bereits gevoted";
+				//throw  new \Exception('Signing failed!');
+				break;
+			default:
+				throw  new \Exception('Unknown Error: '.$result->status_code);
+		}
 
-        if($device_uid != "")
-        {
+		if($device_uid != "")
+		{
 			$result[0] = $result;
 			$result[1] = $device_uid;
 		}
 
-        /*
+		/*
         var_dump($result);
         */
 
-        return $result;
-    }
-    abstract function getPayload();
-    /**
-     * Gets Sign headers
-     * @return array headers
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -104,54 +104,54 @@  discard block
 block discarded – undo
 			}
 			
 			
-        $headers = array(
-            "Connection" => "keep-alive",
-            "Accept-Encoding" => "gzip",
-            "Content-Type" => "application/json; charset=UTF-8",
-            "User-Agent" => self::USERAGENT
-        );
-        $timestamp = new DateTime();
-        $timestamp = $timestamp->format(DateTime::ATOM);
-        $timestamp = substr($timestamp, 0, -6);
-        $timestamp .= "Z";
-        $urlParts = parse_url($this->getFullUrl());
-        $url2 = "";
-        $req = [$this->getMethod(),
-            $urlParts['host'],
-            "443",
-            $urlParts['path'],
-            $payload_accessToken,
-            $timestamp,
-            $url2,
-            $this->payLoad];
-        $reqString = implode("%", $req);
-        $secret = self::SECRET;
-        $signature = hash_hmac('sha1', $reqString, $secret);
-        $signature = strtoupper($signature);
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
-        $headers['X-Timestamp'] = $timestamp;
-        $headers['X-Api-Version'] = '0.2';
-        return $headers;
-    }
-    private function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    private function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
+		$headers = array(
+			"Connection" => "keep-alive",
+			"Accept-Encoding" => "gzip",
+			"Content-Type" => "application/json; charset=UTF-8",
+			"User-Agent" => self::USERAGENT
+		);
+		$timestamp = new DateTime();
+		$timestamp = $timestamp->format(DateTime::ATOM);
+		$timestamp = substr($timestamp, 0, -6);
+		$timestamp .= "Z";
+		$urlParts = parse_url($this->getFullUrl());
+		$url2 = "";
+		$req = [$this->getMethod(),
+			$urlParts['host'],
+			"443",
+			$urlParts['path'],
+			$payload_accessToken,
+			$timestamp,
+			$url2,
+			$this->payLoad];
+		$reqString = implode("%", $req);
+		$secret = self::SECRET;
+		$signature = hash_hmac('sha1', $reqString, $secret);
+		$signature = strtoupper($signature);
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
+		$headers['X-Timestamp'] = $timestamp;
+		$headers['X-Api-Version'] = '0.2';
+		return $headers;
+	}
+	private function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	private function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken($accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

Please login to merge, or discard this patch.

		@@ -2,19 +2,19 @@ discard block
		block discarded – undo
2	2
3	3	abstract class AbstractRequest
4	4	{
5		- CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6		- CONST APIURL = 'https://api.go-tellm.com/api';
7		- const SECRET = "zpwKnTvubiKritHEnjOTcTeHxLJJNTEVumuNZqcE";
8		- const USERAGENT = "Jodel/4.30.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
9		- const CLIENT_TYPE = 'android_4.30.2';
	5	+ CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
	6	+ CONST APIURL = 'https://api.go-tellm.com/api';
	7	+ const SECRET = "zpwKnTvubiKritHEnjOTcTeHxLJJNTEVumuNZqcE";
	8	+ const USERAGENT = "Jodel/4.30.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
	9	+ const CLIENT_TYPE = 'android_4.30.2';
10	10
11		- private $accessToken = null;
12		- private $payLoad;
13		- public $expects = "";
14		- public $version = 'v2';
	11	+ private $accessToken = null;
	12	+ private $payLoad;
	13	+ public $expects = "";
	14	+ public $version = 'v2';
15	15
16		- public function execute()
17		- {
	16	+ public function execute()
	17	+ {
18	18	$result = new \stdClass();
19	19
20	20	$this->payLoad = $this->getPayload();
		@@ -24,78 +24,78 @@ discard block
		block discarded – undo
24	24	}
25	25
26	26
27		- $this->payLoad = json_encode($this->payLoad);
28		- $header = $this->getSignHeaders();
29		- $url = $this->getFullUrl();
	27	+ $this->payLoad = json_encode($this->payLoad);
	28	+ $header = $this->getSignHeaders();
	29	+ $url = $this->getFullUrl();
30	30
31		- if ($this->getAccessToken()) {
32		- $header['Authorization'] = "Bearer " . $this->getAccessToken();
33		- }
34		- //Comment out to debug the Request:
35		- /*
	31	+ if ($this->getAccessToken()) {
	32	+ $header['Authorization'] = "Bearer " . $this->getAccessToken();
	33	+ }
	34	+ //Comment out to debug the Request:
	35	+ /*
36	36	var_dump($url);
37	37	var_dump($header);
38	38	var_dump($this->payLoad);
39	39	*/
40	40
41	41
42		- switch ($this->getMethod()) {
43		- case 'POST':
44		- $result = Requests::post($url, $header, $this->payLoad);
45		- break;
46		- case 'GET':
47		- if($this->version == 'v3')
48		- {
49		- $result = Requests::get($url, $header);
50		- }
51		- else
52		- {
53		- $result = Requests::get($url, $header);
54		- }
55		- break;
56		- case 'PUT':
57		- $result = Requests::put($url, $header, $this->payLoad);
58		- break;
59		- }
60		- switch ($result->status_code) {
61		- case 200:
62		- $result = json_decode($result->body, true);
63		- break;
64		- case 204:
65		- $result = "Success";
66		- break;
67		- case 401:
	42	+ switch ($this->getMethod()) {
	43	+ case 'POST':
	44	+ $result = Requests::post($url, $header, $this->payLoad);
	45	+ break;
	46	+ case 'GET':
	47	+ if($this->version == 'v3')
	48	+ {
	49	+ $result = Requests::get($url, $header);
	50	+ }
	51	+ else
	52	+ {
	53	+ $result = Requests::get($url, $header);
	54	+ }
	55	+ break;
	56	+ case 'PUT':
	57	+ $result = Requests::put($url, $header, $this->payLoad);
	58	+ break;
	59	+ }
	60	+ switch ($result->status_code) {
	61	+ case 200:
	62	+ $result = json_decode($result->body, true);
	63	+ break;
	64	+ case 204:
	65	+ $result = "Success";
	66	+ break;
	67	+ case 401:
68	68	throw new \Exception('Unauthorized');
69		- break;
70		- case 404:
71		- //echo "Es wurde bereits gevoted";
	69	+ break;
	70	+ case 404:
	71	+ //echo "Es wurde bereits gevoted";
72	72	case 477:
73		- //echo "Es wurde bereits gevoted";
74		- //throw new \Exception('Signing failed!');
75		- break;
76		- default:
77		- throw new \Exception('Unknown Error: '.$result->status_code);
78		- }
	73	+ //echo "Es wurde bereits gevoted";
	74	+ //throw new \Exception('Signing failed!');
	75	+ break;
	76	+ default:
	77	+ throw new \Exception('Unknown Error: '.$result->status_code);
	78	+ }
79	79
80		- if($device_uid != "")
81		- {
	80	+ if($device_uid != "")
	81	+ {
82	82	$result[0] = $result;
83	83	$result[1] = $device_uid;
84	84	}
85	85
86		- /*
	86	+ /*
87	87	var_dump($result);
88	88	*/
89	89
90		- return $result;
91		- }
92		- abstract function getPayload();
93		- /**
94		- * Gets Sign headers
95		- * @return array headers
96		- */
97		- private function getSignHeaders()
98		- {
	90	+ return $result;
	91	+ }
	92	+ abstract function getPayload();
	93	+ /**
	94	+ * Gets Sign headers
	95	+ * @return array headers
	96	+ */
	97	+ private function getSignHeaders()
	98	+ {
99	99	if($this->getAccessToken() == null) {
100	100	$payload_accessToken = "";
101	101	}
		@@ -104,54 +104,54 @@ discard block
		block discarded – undo
104	104	}
105	105
106	106
107		- $headers = array(
108		- "Connection" => "keep-alive",
109		- "Accept-Encoding" => "gzip",
110		- "Content-Type" => "application/json; charset=UTF-8",
111		- "User-Agent" => self::USERAGENT
112		- );
113		- $timestamp = new DateTime();
114		- $timestamp = $timestamp->format(DateTime::ATOM);
115		- $timestamp = substr($timestamp, 0, -6);
116		- $timestamp .= "Z";
117		- $urlParts = parse_url($this->getFullUrl());
118		- $url2 = "";
119		- $req = [$this->getMethod(),
120		- $urlParts['host'],
121		- "443",
122		- $urlParts['path'],
123		- $payload_accessToken,
124		- $timestamp,
125		- $url2,
126		- $this->payLoad];
127		- $reqString = implode("%", $req);
128		- $secret = self::SECRET;
129		- $signature = hash_hmac('sha1', $reqString, $secret);
130		- $signature = strtoupper($signature);
131		- $headers['X-Authorization'] = 'HMAC ' . $signature;
132		- $headers['X-Client-Type'] = self::CLIENT_TYPE;
133		- $headers['X-Timestamp'] = $timestamp;
134		- $headers['X-Api-Version'] = '0.2';
135		- return $headers;
136		- }
137		- private function getFullUrl()
138		- {
139		- return self::APIURL . $this->getApiEndPoint();
140		- }
141		- abstract function getApiEndPoint();
142		- abstract function getMethod();
143		- /**
144		- * @return string
145		- */
146		- private function getAccessToken()
147		- {
148		- return $this->accessToken;
149		- }
150		- /**
151		- * @param string $accessToken
152		- */
153		- public function setAccessToken($accessToken)
154		- {
155		- $this->accessToken = $accessToken;
156		- }
	107	+ $headers = array(
	108	+ "Connection" => "keep-alive",
	109	+ "Accept-Encoding" => "gzip",
	110	+ "Content-Type" => "application/json; charset=UTF-8",
	111	+ "User-Agent" => self::USERAGENT
	112	+ );
	113	+ $timestamp = new DateTime();
	114	+ $timestamp = $timestamp->format(DateTime::ATOM);
	115	+ $timestamp = substr($timestamp, 0, -6);
	116	+ $timestamp .= "Z";
	117	+ $urlParts = parse_url($this->getFullUrl());
	118	+ $url2 = "";
	119	+ $req = [$this->getMethod(),
	120	+ $urlParts['host'],
	121	+ "443",
	122	+ $urlParts['path'],
	123	+ $payload_accessToken,
	124	+ $timestamp,
	125	+ $url2,
	126	+ $this->payLoad];
	127	+ $reqString = implode("%", $req);
	128	+ $secret = self::SECRET;
	129	+ $signature = hash_hmac('sha1', $reqString, $secret);
	130	+ $signature = strtoupper($signature);
	131	+ $headers['X-Authorization'] = 'HMAC ' . $signature;
	132	+ $headers['X-Client-Type'] = self::CLIENT_TYPE;
	133	+ $headers['X-Timestamp'] = $timestamp;
	134	+ $headers['X-Api-Version'] = '0.2';
	135	+ return $headers;
	136	+ }
	137	+ private function getFullUrl()
	138	+ {
	139	+ return self::APIURL . $this->getApiEndPoint();
	140	+ }
	141	+ abstract function getApiEndPoint();
	142	+ abstract function getMethod();
	143	+ /**
	144	+ * @return string
	145	+ */
	146	+ private function getAccessToken()
	147	+ {
	148	+ return $this->accessToken;
	149	+ }
	150	+ /**
	151	+ * @param string $accessToken
	152	+ */
	153	+ public function setAccessToken($accessToken)
	154	+ {
	155	+ $this->accessToken = $accessToken;
	156	+ }
157	157	}

mmainstreet / jodel-web

Push — master ( e57fd9...512934 )

Status

Category

Indentation +116 added lines, -116 removed lines patch added patch discarded remove patch