Inspection of "Merge pull request #56495 from nextcloud/fix/fix-i..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3a2657...9dd439 )

by Joas

created 2025-11-17 14:32 UTC

Status

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

@@ -13,244 +13,244 @@
 block discarded – undo
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Auth {
-	/** @var string */
-	private $unrestrictedClientToken;
-	/** @var string */
-	private $restrictedClientToken;
-	/** @var Client */
-	private $client;
-	/** @var string */
-	private $responseXml;
+    /** @var string */
+    private $unrestrictedClientToken;
+    /** @var string */
+    private $restrictedClientToken;
+    /** @var Client */
+    private $client;
+    /** @var string */
+    private $responseXml;
 
-	/** @BeforeScenario */
-	public function setUpScenario() {
-		$this->client = new Client();
-		$this->responseXml = '';
-		$this->cookieJar = new CookieJar();
-	}
+    /** @BeforeScenario */
+    public function setUpScenario() {
+        $this->client = new Client();
+        $this->responseXml = '';
+        $this->cookieJar = new CookieJar();
+    }
 
-	/**
-	 * @When requesting :url with :method
-	 */
-	public function requestingWith($url, $method) {
-		$this->sendRequest($url, $method);
-	}
+    /**
+     * @When requesting :url with :method
+     */
+    public function requestingWith($url, $method) {
+        $this->sendRequest($url, $method);
+    }
 
-	private function sendRequest($url, $method, $authHeader = null, $useCookies = false) {
-		$fullUrl = substr($this->baseUrl, 0, -5) . $url;
-		try {
-			if ($useCookies) {
-				$options = [
-					'cookies' => $this->cookieJar,
-				];
-			} else {
-				$options = [];
-			}
-			if ($authHeader) {
-				$options['headers'] = [
-					'Authorization' => $authHeader
-				];
-			}
-			$options['headers']['OCS_APIREQUEST'] = 'true';
-			$options['headers']['requesttoken'] = $this->requestToken;
-			$this->response = $this->client->request($method, $fullUrl, $options);
-		} catch (ClientException $ex) {
-			$this->response = $ex->getResponse();
-		} catch (ServerException $ex) {
-			$this->response = $ex->getResponse();
-		}
-	}
+    private function sendRequest($url, $method, $authHeader = null, $useCookies = false) {
+        $fullUrl = substr($this->baseUrl, 0, -5) . $url;
+        try {
+            if ($useCookies) {
+                $options = [
+                    'cookies' => $this->cookieJar,
+                ];
+            } else {
+                $options = [];
+            }
+            if ($authHeader) {
+                $options['headers'] = [
+                    'Authorization' => $authHeader
+                ];
+            }
+            $options['headers']['OCS_APIREQUEST'] = 'true';
+            $options['headers']['requesttoken'] = $this->requestToken;
+            $this->response = $this->client->request($method, $fullUrl, $options);
+        } catch (ClientException $ex) {
+            $this->response = $ex->getResponse();
+        } catch (ServerException $ex) {
+            $this->response = $ex->getResponse();
+        }
+    }
 
-	/**
-	 * @When the CSRF token is extracted from the previous response
-	 */
-	public function theCsrfTokenIsExtractedFromThePreviousResponse() {
-		$this->requestToken = substr(preg_replace('/(.*)data-requesttoken="(.*)">(.*)/sm', '\2', $this->response->getBody()->getContents()), 0, 89);
-	}
+    /**
+     * @When the CSRF token is extracted from the previous response
+     */
+    public function theCsrfTokenIsExtractedFromThePreviousResponse() {
+        $this->requestToken = substr(preg_replace('/(.*)data-requesttoken="(.*)">(.*)/sm', '\2', $this->response->getBody()->getContents()), 0, 89);
+    }
 
-	/**
-	 * @param bool $loginViaWeb
-	 * @return object
-	 */
-	private function createClientToken($loginViaWeb = true) {
-		if ($loginViaWeb) {
-			$this->loggingInUsingWebAs('user0');
-		}
+    /**
+     * @param bool $loginViaWeb
+     * @return object
+     */
+    private function createClientToken($loginViaWeb = true) {
+        if ($loginViaWeb) {
+            $this->loggingInUsingWebAs('user0');
+        }
 
-		$fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens';
-		$client = new Client();
-		$options = [
-			'auth' => [
-				'user0',
-				$loginViaWeb ? '123456' : $this->restrictedClientToken,
-			],
-			'form_params' => [
-				'requesttoken' => $this->requestToken,
-				'name' => md5(microtime()),
-			],
-			'cookies' => $this->cookieJar,
-		];
+        $fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens';
+        $client = new Client();
+        $options = [
+            'auth' => [
+                'user0',
+                $loginViaWeb ? '123456' : $this->restrictedClientToken,
+            ],
+            'form_params' => [
+                'requesttoken' => $this->requestToken,
+                'name' => md5(microtime()),
+            ],
+            'cookies' => $this->cookieJar,
+        ];
 
-		try {
-			$this->response = $client->request('POST', $fullUrl, $options);
-		} catch (\GuzzleHttp\Exception\ServerException $e) {
-			$this->response = $e->getResponse();
-		}
-		return json_decode($this->response->getBody()->getContents());
-	}
+        try {
+            $this->response = $client->request('POST', $fullUrl, $options);
+        } catch (\GuzzleHttp\Exception\ServerException $e) {
+            $this->response = $e->getResponse();
+        }
+        return json_decode($this->response->getBody()->getContents());
+    }
 
-	/**
-	 * @Given a new restricted client token is added
-	 */
-	public function aNewRestrictedClientTokenIsAdded() {
-		$tokenObj = $this->createClientToken();
-		$newCreatedTokenId = $tokenObj->deviceToken->id;
-		$fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens/' . $newCreatedTokenId;
-		$client = new Client();
-		$options = [
-			'auth' => ['user0', '123456'],
-			'headers' => [
-				'requesttoken' => $this->requestToken,
-			],
-			'json' => [
-				'name' => md5(microtime()),
-				'scope' => [
-					'filesystem' => false,
-				],
-			],
-			'cookies' => $this->cookieJar,
-		];
-		$this->response = $client->request('PUT', $fullUrl, $options);
-		$this->restrictedClientToken = $tokenObj->token;
-	}
+    /**
+     * @Given a new restricted client token is added
+     */
+    public function aNewRestrictedClientTokenIsAdded() {
+        $tokenObj = $this->createClientToken();
+        $newCreatedTokenId = $tokenObj->deviceToken->id;
+        $fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens/' . $newCreatedTokenId;
+        $client = new Client();
+        $options = [
+            'auth' => ['user0', '123456'],
+            'headers' => [
+                'requesttoken' => $this->requestToken,
+            ],
+            'json' => [
+                'name' => md5(microtime()),
+                'scope' => [
+                    'filesystem' => false,
+                ],
+            ],
+            'cookies' => $this->cookieJar,
+        ];
+        $this->response = $client->request('PUT', $fullUrl, $options);
+        $this->restrictedClientToken = $tokenObj->token;
+    }
 
-	/**
-	 * @Given a new unrestricted client token is added
-	 */
-	public function aNewUnrestrictedClientTokenIsAdded() {
-		$this->unrestrictedClientToken = $this->createClientToken()->token;
-	}
+    /**
+     * @Given a new unrestricted client token is added
+     */
+    public function aNewUnrestrictedClientTokenIsAdded() {
+        $this->unrestrictedClientToken = $this->createClientToken()->token;
+    }
 
-	/**
-	 * @When a new unrestricted client token is added using restricted basic token auth
-	 */
-	public function aNewUnrestrictedClientTokenIsAddedUsingRestrictedBasicTokenAuth() {
-		$this->createClientToken(false);
-	}
+    /**
+     * @When a new unrestricted client token is added using restricted basic token auth
+     */
+    public function aNewUnrestrictedClientTokenIsAddedUsingRestrictedBasicTokenAuth() {
+        $this->createClientToken(false);
+    }
 
-	/**
-	 * @When requesting :url with :method using basic auth
-	 *
-	 * @param string $url
-	 * @param string $method
-	 */
-	public function requestingWithBasicAuth($url, $method) {
-		$this->sendRequest($url, $method, 'basic ' . base64_encode('user0:123456'));
-	}
+    /**
+     * @When requesting :url with :method using basic auth
+     *
+     * @param string $url
+     * @param string $method
+     */
+    public function requestingWithBasicAuth($url, $method) {
+        $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:123456'));
+    }
 
-	/**
-	 * @When requesting :url with :method using unrestricted basic token auth
-	 *
-	 * @param string $url
-	 * @param string $method
-	 */
-	public function requestingWithUnrestrictedBasicTokenAuth($url, $method) {
-		$this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->unrestrictedClientToken), true);
-	}
+    /**
+     * @When requesting :url with :method using unrestricted basic token auth
+     *
+     * @param string $url
+     * @param string $method
+     */
+    public function requestingWithUnrestrictedBasicTokenAuth($url, $method) {
+        $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->unrestrictedClientToken), true);
+    }
 
-	/**
-	 * @When requesting :url with :method using restricted basic token auth
-	 *
-	 * @param string $url
-	 * @param string $method
-	 */
-	public function requestingWithRestrictedBasicTokenAuth($url, $method) {
-		$this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->restrictedClientToken), true);
-	}
+    /**
+     * @When requesting :url with :method using restricted basic token auth
+     *
+     * @param string $url
+     * @param string $method
+     */
+    public function requestingWithRestrictedBasicTokenAuth($url, $method) {
+        $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->restrictedClientToken), true);
+    }
 
-	/**
-	 * @When requesting :url with :method using an unrestricted client token
-	 *
-	 * @param string $url
-	 * @param string $method
-	 */
-	public function requestingWithUsingAnUnrestrictedClientToken($url, $method) {
-		$this->sendRequest($url, $method, 'Bearer ' . $this->unrestrictedClientToken);
-	}
+    /**
+     * @When requesting :url with :method using an unrestricted client token
+     *
+     * @param string $url
+     * @param string $method
+     */
+    public function requestingWithUsingAnUnrestrictedClientToken($url, $method) {
+        $this->sendRequest($url, $method, 'Bearer ' . $this->unrestrictedClientToken);
+    }
 
-	/**
-	 * @When requesting :url with :method using a restricted client token
-	 *
-	 * @param string $url
-	 * @param string $method
-	 */
-	public function requestingWithUsingARestrictedClientToken($url, $method) {
-		$this->sendRequest($url, $method, 'Bearer ' . $this->restrictedClientToken);
-	}
+    /**
+     * @When requesting :url with :method using a restricted client token
+     *
+     * @param string $url
+     * @param string $method
+     */
+    public function requestingWithUsingARestrictedClientToken($url, $method) {
+        $this->sendRequest($url, $method, 'Bearer ' . $this->restrictedClientToken);
+    }
 
-	/**
-	 * @When requesting :url with :method using browser session
-	 *
-	 * @param string $url
-	 * @param string $method
-	 */
-	public function requestingWithBrowserSession($url, $method) {
-		$this->sendRequest($url, $method, null, true);
-	}
+    /**
+     * @When requesting :url with :method using browser session
+     *
+     * @param string $url
+     * @param string $method
+     */
+    public function requestingWithBrowserSession($url, $method) {
+        $this->sendRequest($url, $method, null, true);
+    }
 
-	/**
-	 * @Given a new browser session is started
-	 *
-	 * @param bool $remember
-	 */
-	public function aNewBrowserSessionIsStarted($remember = false) {
-		$baseUrl = substr($this->baseUrl, 0, -5);
-		$loginUrl = $baseUrl . '/login';
-		// Request a new session and extract CSRF token
-		$client = new Client();
-		$response = $client->get($loginUrl, [
-			'cookies' => $this->cookieJar,
-		]);
-		$this->extracRequestTokenFromResponse($response);
+    /**
+     * @Given a new browser session is started
+     *
+     * @param bool $remember
+     */
+    public function aNewBrowserSessionIsStarted($remember = false) {
+        $baseUrl = substr($this->baseUrl, 0, -5);
+        $loginUrl = $baseUrl . '/login';
+        // Request a new session and extract CSRF token
+        $client = new Client();
+        $response = $client->get($loginUrl, [
+            'cookies' => $this->cookieJar,
+        ]);
+        $this->extracRequestTokenFromResponse($response);
 
-		// Login and extract new token
-		$client = new Client();
-		$response = $client->post(
-			$loginUrl, [
-				'form_params' => [
-					'user' => 'user0',
-					'password' => '123456',
-					'rememberme' => $remember ? '1' : '0',
-					'requesttoken' => $this->requestToken,
-				],
-				'cookies' => $this->cookieJar,
-				'headers' => [
-					'Origin' => $baseUrl,
-				],
-			]
-		);
-		$this->extracRequestTokenFromResponse($response);
-	}
+        // Login and extract new token
+        $client = new Client();
+        $response = $client->post(
+            $loginUrl, [
+                'form_params' => [
+                    'user' => 'user0',
+                    'password' => '123456',
+                    'rememberme' => $remember ? '1' : '0',
+                    'requesttoken' => $this->requestToken,
+                ],
+                'cookies' => $this->cookieJar,
+                'headers' => [
+                    'Origin' => $baseUrl,
+                ],
+            ]
+        );
+        $this->extracRequestTokenFromResponse($response);
+    }
 
-	/**
-	 * @Given a new remembered browser session is started
-	 */
-	public function aNewRememberedBrowserSessionIsStarted() {
-		$this->aNewBrowserSessionIsStarted(true);
-	}
+    /**
+     * @Given a new remembered browser session is started
+     */
+    public function aNewRememberedBrowserSessionIsStarted() {
+        $this->aNewBrowserSessionIsStarted(true);
+    }
 
 
-	/**
-	 * @Given the cookie jar is reset
-	 */
-	public function theCookieJarIsReset() {
-		$this->cookieJar = new CookieJar();
-	}
+    /**
+     * @Given the cookie jar is reset
+     */
+    public function theCookieJarIsReset() {
+        $this->cookieJar = new CookieJar();
+    }
 
-	/**
-	 * @When the session cookie expires
-	 */
-	public function whenTheSessionCookieExpires() {
-		$this->cookieJar->clearSessionCookies();
-	}
+    /**
+     * @When the session cookie expires
+     */
+    public function whenTheSessionCookieExpires() {
+        $this->cookieJar->clearSessionCookies();
+    }
 }

Please login to merge, or discard this patch.

		@@ -13,244 +13,244 @@
		block discarded – undo
13	13	require __DIR__ . '/../../vendor/autoload.php';
14	14
15	15	trait Auth {
16		- /** @var string */
17		- private $unrestrictedClientToken;
18		- /** @var string */
19		- private $restrictedClientToken;
20		- /** @var Client */
21		- private $client;
22		- /** @var string */
23		- private $responseXml;
	16	+ /** @var string */
	17	+ private $unrestrictedClientToken;
	18	+ /** @var string */
	19	+ private $restrictedClientToken;
	20	+ /** @var Client */
	21	+ private $client;
	22	+ /** @var string */
	23	+ private $responseXml;
24	24
25		- /** @BeforeScenario */
26		- public function setUpScenario() {
27		- $this->client = new Client();
28		- $this->responseXml = '';
29		- $this->cookieJar = new CookieJar();
30		- }
	25	+ /** @BeforeScenario */
	26	+ public function setUpScenario() {
	27	+ $this->client = new Client();
	28	+ $this->responseXml = '';
	29	+ $this->cookieJar = new CookieJar();
	30	+ }
31	31
32		- /**
33		- * @When requesting :url with :method
34		- */
35		- public function requestingWith($url, $method) {
36		- $this->sendRequest($url, $method);
37		- }
	32	+ /**
	33	+ * @When requesting :url with :method
	34	+ */
	35	+ public function requestingWith($url, $method) {
	36	+ $this->sendRequest($url, $method);
	37	+ }
38	38
39		- private function sendRequest($url, $method, $authHeader = null, $useCookies = false) {
40		- $fullUrl = substr($this->baseUrl, 0, -5) . $url;
41		- try {
42		- if ($useCookies) {
43		- $options = [
44		- 'cookies' => $this->cookieJar,
45		- ];
46		- } else {
47		- $options = [];
48		- }
49		- if ($authHeader) {
50		- $options['headers'] = [
51		- 'Authorization' => $authHeader
52		- ];
53		- }
54		- $options['headers']['OCS_APIREQUEST'] = 'true';
55		- $options['headers']['requesttoken'] = $this->requestToken;
56		- $this->response = $this->client->request($method, $fullUrl, $options);
57		- } catch (ClientException $ex) {
58		- $this->response = $ex->getResponse();
59		- } catch (ServerException $ex) {
60		- $this->response = $ex->getResponse();
61		- }
62		- }
	39	+ private function sendRequest($url, $method, $authHeader = null, $useCookies = false) {
	40	+ $fullUrl = substr($this->baseUrl, 0, -5) . $url;
	41	+ try {
	42	+ if ($useCookies) {
	43	+ $options = [
	44	+ 'cookies' => $this->cookieJar,
	45	+ ];
	46	+ } else {
	47	+ $options = [];
	48	+ }
	49	+ if ($authHeader) {
	50	+ $options['headers'] = [
	51	+ 'Authorization' => $authHeader
	52	+ ];
	53	+ }
	54	+ $options['headers']['OCS_APIREQUEST'] = 'true';
	55	+ $options['headers']['requesttoken'] = $this->requestToken;
	56	+ $this->response = $this->client->request($method, $fullUrl, $options);
	57	+ } catch (ClientException $ex) {
	58	+ $this->response = $ex->getResponse();
	59	+ } catch (ServerException $ex) {
	60	+ $this->response = $ex->getResponse();
	61	+ }
	62	+ }
63	63
64		- /**
65		- * @When the CSRF token is extracted from the previous response
66		- */
67		- public function theCsrfTokenIsExtractedFromThePreviousResponse() {
68		- $this->requestToken = substr(preg_replace('/(.)data-requesttoken="(.)">(.*)/sm', '\2', $this->response->getBody()->getContents()), 0, 89);
69		- }
	64	+ /**
	65	+ * @When the CSRF token is extracted from the previous response
	66	+ */
	67	+ public function theCsrfTokenIsExtractedFromThePreviousResponse() {
	68	+ $this->requestToken = substr(preg_replace('/(.)data-requesttoken="(.)">(.*)/sm', '\2', $this->response->getBody()->getContents()), 0, 89);
	69	+ }
70	70
71		- /**
72		- * @param bool $loginViaWeb
73		- * @return object
74		- */
75		- private function createClientToken($loginViaWeb = true) {
76		- if ($loginViaWeb) {
77		- $this->loggingInUsingWebAs('user0');
78		- }
	71	+ /**
	72	+ * @param bool $loginViaWeb
	73	+ * @return object
	74	+ */
	75	+ private function createClientToken($loginViaWeb = true) {
	76	+ if ($loginViaWeb) {
	77	+ $this->loggingInUsingWebAs('user0');
	78	+ }
79	79
80		- $fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens';
81		- $client = new Client();
82		- $options = [
83		- 'auth' => [
84		- 'user0',
85		- $loginViaWeb ? '123456' : $this->restrictedClientToken,
86		- ],
87		- 'form_params' => [
88		- 'requesttoken' => $this->requestToken,
89		- 'name' => md5(microtime()),
90		- ],
91		- 'cookies' => $this->cookieJar,
92		- ];
	80	+ $fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens';
	81	+ $client = new Client();
	82	+ $options = [
	83	+ 'auth' => [
	84	+ 'user0',
	85	+ $loginViaWeb ? '123456' : $this->restrictedClientToken,
	86	+ ],
	87	+ 'form_params' => [
	88	+ 'requesttoken' => $this->requestToken,
	89	+ 'name' => md5(microtime()),
	90	+ ],
	91	+ 'cookies' => $this->cookieJar,
	92	+ ];
93	93
94		- try {
95		- $this->response = $client->request('POST', $fullUrl, $options);
96		- } catch (\GuzzleHttp\Exception\ServerException $e) {
97		- $this->response = $e->getResponse();
98		- }
99		- return json_decode($this->response->getBody()->getContents());
100		- }
	94	+ try {
	95	+ $this->response = $client->request('POST', $fullUrl, $options);
	96	+ } catch (\GuzzleHttp\Exception\ServerException $e) {
	97	+ $this->response = $e->getResponse();
	98	+ }
	99	+ return json_decode($this->response->getBody()->getContents());
	100	+ }
101	101
102		- /**
103		- * @Given a new restricted client token is added
104		- */
105		- public function aNewRestrictedClientTokenIsAdded() {
106		- $tokenObj = $this->createClientToken();
107		- $newCreatedTokenId = $tokenObj->deviceToken->id;
108		- $fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens/' . $newCreatedTokenId;
109		- $client = new Client();
110		- $options = [
111		- 'auth' => ['user0', '123456'],
112		- 'headers' => [
113		- 'requesttoken' => $this->requestToken,
114		- ],
115		- 'json' => [
116		- 'name' => md5(microtime()),
117		- 'scope' => [
118		- 'filesystem' => false,
119		- ],
120		- ],
121		- 'cookies' => $this->cookieJar,
122		- ];
123		- $this->response = $client->request('PUT', $fullUrl, $options);
124		- $this->restrictedClientToken = $tokenObj->token;
125		- }
	102	+ /**
	103	+ * @Given a new restricted client token is added
	104	+ */
	105	+ public function aNewRestrictedClientTokenIsAdded() {
	106	+ $tokenObj = $this->createClientToken();
	107	+ $newCreatedTokenId = $tokenObj->deviceToken->id;
	108	+ $fullUrl = substr($this->baseUrl, 0, -5) . '/index.php/settings/personal/authtokens/' . $newCreatedTokenId;
	109	+ $client = new Client();
	110	+ $options = [
	111	+ 'auth' => ['user0', '123456'],
	112	+ 'headers' => [
	113	+ 'requesttoken' => $this->requestToken,
	114	+ ],
	115	+ 'json' => [
	116	+ 'name' => md5(microtime()),
	117	+ 'scope' => [
	118	+ 'filesystem' => false,
	119	+ ],
	120	+ ],
	121	+ 'cookies' => $this->cookieJar,
	122	+ ];
	123	+ $this->response = $client->request('PUT', $fullUrl, $options);
	124	+ $this->restrictedClientToken = $tokenObj->token;
	125	+ }
126	126
127		- /**
128		- * @Given a new unrestricted client token is added
129		- */
130		- public function aNewUnrestrictedClientTokenIsAdded() {
131		- $this->unrestrictedClientToken = $this->createClientToken()->token;
132		- }
	127	+ /**
	128	+ * @Given a new unrestricted client token is added
	129	+ */
	130	+ public function aNewUnrestrictedClientTokenIsAdded() {
	131	+ $this->unrestrictedClientToken = $this->createClientToken()->token;
	132	+ }
133	133
134		- /**
135		- * @When a new unrestricted client token is added using restricted basic token auth
136		- */
137		- public function aNewUnrestrictedClientTokenIsAddedUsingRestrictedBasicTokenAuth() {
138		- $this->createClientToken(false);
139		- }
	134	+ /**
	135	+ * @When a new unrestricted client token is added using restricted basic token auth
	136	+ */
	137	+ public function aNewUnrestrictedClientTokenIsAddedUsingRestrictedBasicTokenAuth() {
	138	+ $this->createClientToken(false);
	139	+ }
140	140
141		- /**
142		- * @When requesting :url with :method using basic auth
143		- *
144		- * @param string $url
145		- * @param string $method
146		- */
147		- public function requestingWithBasicAuth($url, $method) {
148		- $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:123456'));
149		- }
	141	+ /**
	142	+ * @When requesting :url with :method using basic auth
	143	+ *
	144	+ * @param string $url
	145	+ * @param string $method
	146	+ */
	147	+ public function requestingWithBasicAuth($url, $method) {
	148	+ $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:123456'));
	149	+ }
150	150
151		- /**
152		- * @When requesting :url with :method using unrestricted basic token auth
153		- *
154		- * @param string $url
155		- * @param string $method
156		- */
157		- public function requestingWithUnrestrictedBasicTokenAuth($url, $method) {
158		- $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->unrestrictedClientToken), true);
159		- }
	151	+ /**
	152	+ * @When requesting :url with :method using unrestricted basic token auth
	153	+ *
	154	+ * @param string $url
	155	+ * @param string $method
	156	+ */
	157	+ public function requestingWithUnrestrictedBasicTokenAuth($url, $method) {
	158	+ $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->unrestrictedClientToken), true);
	159	+ }
160	160
161		- /**
162		- * @When requesting :url with :method using restricted basic token auth
163		- *
164		- * @param string $url
165		- * @param string $method
166		- */
167		- public function requestingWithRestrictedBasicTokenAuth($url, $method) {
168		- $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->restrictedClientToken), true);
169		- }
	161	+ /**
	162	+ * @When requesting :url with :method using restricted basic token auth
	163	+ *
	164	+ * @param string $url
	165	+ * @param string $method
	166	+ */
	167	+ public function requestingWithRestrictedBasicTokenAuth($url, $method) {
	168	+ $this->sendRequest($url, $method, 'basic ' . base64_encode('user0:' . $this->restrictedClientToken), true);
	169	+ }
170	170
171		- /**
172		- * @When requesting :url with :method using an unrestricted client token
173		- *
174		- * @param string $url
175		- * @param string $method
176		- */
177		- public function requestingWithUsingAnUnrestrictedClientToken($url, $method) {
178		- $this->sendRequest($url, $method, 'Bearer ' . $this->unrestrictedClientToken);
179		- }
	171	+ /**
	172	+ * @When requesting :url with :method using an unrestricted client token
	173	+ *
	174	+ * @param string $url
	175	+ * @param string $method
	176	+ */
	177	+ public function requestingWithUsingAnUnrestrictedClientToken($url, $method) {
	178	+ $this->sendRequest($url, $method, 'Bearer ' . $this->unrestrictedClientToken);
	179	+ }
180	180
181		- /**
182		- * @When requesting :url with :method using a restricted client token
183		- *
184		- * @param string $url
185		- * @param string $method
186		- */
187		- public function requestingWithUsingARestrictedClientToken($url, $method) {
188		- $this->sendRequest($url, $method, 'Bearer ' . $this->restrictedClientToken);
189		- }
	181	+ /**
	182	+ * @When requesting :url with :method using a restricted client token
	183	+ *
	184	+ * @param string $url
	185	+ * @param string $method
	186	+ */
	187	+ public function requestingWithUsingARestrictedClientToken($url, $method) {
	188	+ $this->sendRequest($url, $method, 'Bearer ' . $this->restrictedClientToken);
	189	+ }
190	190
191		- /**
192		- * @When requesting :url with :method using browser session
193		- *
194		- * @param string $url
195		- * @param string $method
196		- */
197		- public function requestingWithBrowserSession($url, $method) {
198		- $this->sendRequest($url, $method, null, true);
199		- }
	191	+ /**
	192	+ * @When requesting :url with :method using browser session
	193	+ *
	194	+ * @param string $url
	195	+ * @param string $method
	196	+ */
	197	+ public function requestingWithBrowserSession($url, $method) {
	198	+ $this->sendRequest($url, $method, null, true);
	199	+ }
200	200
201		- /**
202		- * @Given a new browser session is started
203		- *
204		- * @param bool $remember
205		- */
206		- public function aNewBrowserSessionIsStarted($remember = false) {
207		- $baseUrl = substr($this->baseUrl, 0, -5);
208		- $loginUrl = $baseUrl . '/login';
209		- // Request a new session and extract CSRF token
210		- $client = new Client();
211		- $response = $client->get($loginUrl, [
212		- 'cookies' => $this->cookieJar,
213		- ]);
214		- $this->extracRequestTokenFromResponse($response);
	201	+ /**
	202	+ * @Given a new browser session is started
	203	+ *
	204	+ * @param bool $remember
	205	+ */
	206	+ public function aNewBrowserSessionIsStarted($remember = false) {
	207	+ $baseUrl = substr($this->baseUrl, 0, -5);
	208	+ $loginUrl = $baseUrl . '/login';
	209	+ // Request a new session and extract CSRF token
	210	+ $client = new Client();
	211	+ $response = $client->get($loginUrl, [
	212	+ 'cookies' => $this->cookieJar,
	213	+ ]);
	214	+ $this->extracRequestTokenFromResponse($response);
215	215
216		- // Login and extract new token
217		- $client = new Client();
218		- $response = $client->post(
219		- $loginUrl, [
220		- 'form_params' => [
221		- 'user' => 'user0',
222		- 'password' => '123456',
223		- 'rememberme' => $remember ? '1' : '0',
224		- 'requesttoken' => $this->requestToken,
225		- ],
226		- 'cookies' => $this->cookieJar,
227		- 'headers' => [
228		- 'Origin' => $baseUrl,
229		- ],
230		- ]
231		- );
232		- $this->extracRequestTokenFromResponse($response);
233		- }
	216	+ // Login and extract new token
	217	+ $client = new Client();
	218	+ $response = $client->post(
	219	+ $loginUrl, [
	220	+ 'form_params' => [
	221	+ 'user' => 'user0',
	222	+ 'password' => '123456',
	223	+ 'rememberme' => $remember ? '1' : '0',
	224	+ 'requesttoken' => $this->requestToken,
	225	+ ],
	226	+ 'cookies' => $this->cookieJar,
	227	+ 'headers' => [
	228	+ 'Origin' => $baseUrl,
	229	+ ],
	230	+ ]
	231	+ );
	232	+ $this->extracRequestTokenFromResponse($response);
	233	+ }
234	234
235		- /**
236		- * @Given a new remembered browser session is started
237		- */
238		- public function aNewRememberedBrowserSessionIsStarted() {
239		- $this->aNewBrowserSessionIsStarted(true);
240		- }
	235	+ /**
	236	+ * @Given a new remembered browser session is started
	237	+ */
	238	+ public function aNewRememberedBrowserSessionIsStarted() {
	239	+ $this->aNewBrowserSessionIsStarted(true);
	240	+ }
241	241
242	242
243		- /**
244		- * @Given the cookie jar is reset
245		- */
246		- public function theCookieJarIsReset() {
247		- $this->cookieJar = new CookieJar();
248		- }
	243	+ /**
	244	+ * @Given the cookie jar is reset
	245	+ */
	246	+ public function theCookieJarIsReset() {
	247	+ $this->cookieJar = new CookieJar();
	248	+ }
249	249
250		- /**
251		- * @When the session cookie expires
252		- */
253		- public function whenTheSessionCookieExpires() {
254		- $this->cookieJar->clearSessionCookies();
255		- }
	250	+ /**
	251	+ * @When the session cookie expires
	252	+ */
	253	+ public function whenTheSessionCookieExpires() {
	254	+ $this->cookieJar->clearSessionCookies();
	255	+ }
256	256	}

nextcloud / server

Push — master ( 3a2657...9dd439 )

Status

Category

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