diff --git a/app/config/providers.php b/app/config/providers.php
index 85d2326d5..d1d34630f 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -85,7 +85,11 @@ return [
         'enabled' => true,
         'mock' => false,
     ],
-
+    'discord' => [
+        'developers' => 'https://discordapp.com/developers/docs/topics/oauth2',
+        'icon' => 'icon-discord',
+        'enabled' => true,
+    ],
     // Keep Last
     'mock' => [
         'developers' => 'https://appwrite.io',
diff --git a/public/images/oauth/discord.png b/public/images/oauth/discord.png
new file mode 100644
index 000000000..08687e91d
Binary files /dev/null and b/public/images/oauth/discord.png differ
diff --git a/src/Auth/OAuth/Discord.php b/src/Auth/OAuth/Discord.php
new file mode 100644
index 000000000..b23653e99
--- /dev/null
+++ b/src/Auth/OAuth/Discord.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Auth\OAuth;
+
+use Auth\OAuth;
+
+// Reference Material
+// https://discordapp.com/developers/docs/topics/oauth2
+
+class Discord extends OAuth
+{
+    /**
+     * @var string
+     */
+    private $endpoint = 'https://discordapp.com/api';
+
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+
+    protected $scope = [
+            'identify',
+            'email'
+    ];
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'discord';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLoginURL(): string
+    {
+        $url = $this->endpoint . '/oauth2/authorize?'.
+            http_build_query([
+                'response_type' => 'code',
+                'client_id' => $this->appID,
+                'scope' => implode(' ', $this->scope),
+                'redirect_uri' => $this->callback
+            ]);
+
+        return $url;
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code): string
+    {
+        $accessToken = $this->request(
+            'POST',
+            $this->endpoint . '/oauth2/token',
+            ['Content-Type: application/x-www-form-urlencoded'],
+            http_build_query([
+                'grant_type' => 'authorization_code',
+                'code' => $code,
+                'redirect_uri' => $this->callback,
+                'client_id' => $this->appID,
+                'client_secret' => $this->appSecret,
+                'scope' => implode(' ', $this->scope)
+            ])
+        );
+
+
+        $accessToken = json_decode($accessToken, true);
+
+
+        if (isset($accessToken['access_token'])) {
+            return $accessToken['access_token'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['id'])) {
+            return $user['id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['email'])) {
+            return $user['email'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['username'])) {
+            return $user['username'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken): array
+    {
+        if (empty($this->user)) {
+            $user = $this->request(
+                'GET',
+                $this->endpoint . '/users/@me',
+                ['Authorization: Bearer '.urlencode($accessToken)]
+            );
+            $this->user = json_decode($user, true);
+        }
+
+        return $this->user;
+    }
+}