Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools

src/Appwrite/Auth/OAuth2/Gitlab.php

@@ -39,7 +39,7 @@ class Gitlab extends OAuth2
      */
     public function getLoginURL(): string
     {
-        return 'https://gitlab.com/oauth/authorize?' . \http_build_query([
+        return $this->getEndpoint() . '/oauth/authorize?' . \http_build_query([
             'client_id' => $this->appID,
             'redirect_uri' => $this->callback,
             'scope' => \implode(' ', $this->getScopes()),
@@ -58,10 +58,10 @@ class Gitlab extends OAuth2
         if (empty($this->tokens)) {
             $this->tokens = \json_decode($this->request(
                 'POST',
-                'https://gitlab.com/oauth/token?' . \http_build_query([
+                $this->getEndpoint() . '/oauth/token?' . \http_build_query([
                     'code' => $code,
                     'client_id' => $this->appID,
-                    'client_secret' => $this->appSecret,
+                    'client_secret' => $this->getAppSecret()['clientSecret'],
                     'redirect_uri' => $this->callback,
                     'grant_type' => 'authorization_code'
                 ])
@@ -80,10 +80,10 @@ class Gitlab extends OAuth2
     {
         $this->tokens = \json_decode($this->request(
             'POST',
-            'https://gitlab.com/oauth/token?' . \http_build_query([
+            $this->getEndpoint() . '/oauth/token?' . \http_build_query([
                 'refresh_token' => $refreshToken,
                 'client_id' => $this->appID,
-                'client_secret' => $this->appSecret,
+                'client_secret' => $this->getAppSecret()['clientSecret'],
                 'grant_type' => 'refresh_token'
             ])
         ), true);
@@ -163,10 +163,39 @@ class Gitlab extends OAuth2
     protected function getUser(string $accessToken): array
     {
         if (empty($this->user)) {
-            $user = $this->request('GET', 'https://gitlab.com/api/v4/user?access_token=' . \urlencode($accessToken));
+            $user = $this->request('GET', $this->getEndpoint() . '/api/v4/user?access_token=' . \urlencode($accessToken));
             $this->user = \json_decode($user, true);
         }
 
         return $this->user;
     }
+
+    /**
+     * Decode the JSON stored in appSecret
+     *
+     * @return array
+     */
+    protected function getAppSecret(): array
+    {
+        try {
+            $secret = \json_decode($this->appSecret, true, 512, JSON_THROW_ON_ERROR);
+        } catch (\Throwable $th) {
+            throw new \Exception('Invalid secret');
+        }
+        return $secret;
+    }
+
+
+    /**
+     * Extracts the Tenant Id from the JSON stored in appSecret. Defaults to 'common' as a fallback
+     *
+     * @return string
+     */
+    protected function getEndpoint(): string
+    {
+        $defaultEndpoint = 'https://gitlab.com';
+        $secret = $this->getAppSecret();
+        $endpoint = $secret['endpoint'] ?? $defaultEndpoint;
+        return empty($endpoint) ? $defaultEndpoint : $endpoint;
+    }
 }

src/Appwrite/Utopia/Response/Model/Webhook.php

@@ -58,6 +58,12 @@ class Webhook extends Model
                 'default' => '',
                 'example' => 'password',
             ])
+            ->addRule('signatureKey', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Signature key which can be used to validated incoming',
+                'default' => '',
+                'example' => 'ad3d581ca230e2b7059c545e5a',
+            ])
         ;
     }
 

src/Executor/Executor.php

@@ -186,10 +186,18 @@ class Executor
                         );
                         $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
                         $status = $response['headers']['status-code'];
+
+                        if ($status < 400) {
+                            return $response['body'];
+                        }
                         break;
                     case $status === 406:
                         $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
                         $status = $response['headers']['status-code'];
+
+                        if ($status < 400) {
+                            return $response['body'];
+                        }
                         break;
                     default:
                         throw new \Exception($response['body']['message'], $status);