diff --git a/app/config/providers.php b/app/config/providers.php
index a2a8f2f19e..061bbd9d8c 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -91,6 +91,12 @@ return [
         'enabled' => true,
         'mock' => false,
     ],
+    'twitch' => [
+        'developers' => 'https://dev.twitch.tv/docs/authentication',
+        'icon' => 'icon-twitch',
+        'enabled' => true,
+        'mock' => false,
+    ],
     // Keep Last
     'mock' => [
         'developers' => 'https://appwrite.io',
diff --git a/public/images/oauth/twitch.png b/public/images/oauth/twitch.png
new file mode 100644
index 0000000000..e90f548e4b
Binary files /dev/null and b/public/images/oauth/twitch.png differ
diff --git a/src/Auth/OAuth/Twitch.php b/src/Auth/OAuth/Twitch.php
new file mode 100644
index 0000000000..b9455bd58a
--- /dev/null
+++ b/src/Auth/OAuth/Twitch.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Auth\OAuth;
+
+use Auth\OAuth;
+
+// Reference Material
+// https://dev.twitch.tv/docs/authentication
+
+class Twitch extends OAuth
+{
+
+    /**
+     * @var string
+     */
+    private $endpoint = 'https://id.twitch.tv/oauth2/';
+
+    /**
+     * @var string
+     */
+    private $resourceEndpoint = 'https://api.twitch.tv/helix/users';
+
+    /**
+     * @var array
+     */
+    protected $scope = [
+            'user:read:email',
+    ];
+
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+    /**
+     * @return string
+     */
+    public function getName():string
+    {
+        return 'twitch';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLoginURL():string
+    {
+        return $this->endpoint . 'authorize?'.
+            http_build_query([
+                'response_type' => 'code',
+                'client_id' => $this->appID,
+                'scope' => implode(' ', $this->scope),
+                'redirect_uri' => $this->callback,
+                'force_verify' => true,
+                'state' => json_encode($this->state)
+            ]);
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code):string
+    {
+        $result = json_decode($this->request(
+            'POST',
+            $this->endpoint . 'token',
+            [],
+            http_build_query([
+                "client_id" => $this->appID,
+                "client_secret" => $this->appSecret,
+                "code" => $code,
+                "grant_type" => "authorization_code",
+                "redirect_uri" => $this->callback
+            ])
+        ), true);
+
+        if (isset($result['access_token'])) {
+            return $result['access_token'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken):string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['id'])) {
+            return $user['id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken):string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['email'])) {
+            return $user['email'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken):string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['display_name'])) {
+            return $user['display_name'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken)
+    {
+        if (empty($this->user)) {
+            $this->user = json_decode($this->request('GET',
+                $this->resourceEndpoint, ['Authorization: Bearer '.urlencode($accessToken)]), true)['data']['0'];
+        }
+
+        return $this->user;
+    }
+}