+
+
+
diff --git a/app/common.php b/app/common.php
index b8f5ccd29..8c1074d67 100644
--- a/app/common.php
+++ b/app/common.php
@@ -146,6 +146,7 @@ if (ENABLE_URL_REWRITE) {
// Auth routes
$container['router']->addRoute('oauth/google', 'oauth', 'google');
$container['router']->addRoute('oauth/github', 'oauth', 'github');
+ $container['router']->addRoute('oauth/gitlab', 'oauth', 'gitlab');
$container['router']->addRoute('login', 'auth', 'login');
$container['router']->addRoute('logout', 'auth', 'logout');
}
diff --git a/app/constants.php b/app/constants.php
index 99770abaa..4f82e3430 100644
--- a/app/constants.php
+++ b/app/constants.php
@@ -50,6 +50,14 @@ defined('GITHUB_OAUTH_AUTHORIZE_URL') or define('GITHUB_OAUTH_AUTHORIZE_URL', 'h
defined('GITHUB_OAUTH_TOKEN_URL') or define('GITHUB_OAUTH_TOKEN_URL', 'https://github.com/login/oauth/access_token');
defined('GITHUB_API_URL') or define('GITHUB_API_URL', 'https://api.github.com/');
+// Gitlab authentication
+defined('GITLAB_AUTH') or define('GITLAB_AUTH', false);
+defined('GITLAB_CLIENT_ID') or define('GITLAB_CLIENT_ID', '');
+defined('GITLAB_CLIENT_SECRET') or define('GITLAB_CLIENT_SECRET', '');
+defined('GITLAB_OAUTH_AUTHORIZE_URL') or define('GITLAB_OAUTH_AUTHORIZE_URL', 'https://gitlab.com/oauth/authorize');
+defined('GITLAB_OAUTH_TOKEN_URL') or define('GITLAB_OAUTH_TOKEN_URL', 'https://gitlab.com/oauth/token');
+defined('GITLAB_API_URL') or define('GITLAB_API_URL', 'https://gitlab.com/api/v3/');
+
// Proxy authentication
defined('REVERSE_PROXY_AUTH') or define('REVERSE_PROXY_AUTH', false);
defined('REVERSE_PROXY_USER_HEADER') or define('REVERSE_PROXY_USER_HEADER', 'REMOTE_USER');
diff --git a/config.default.php b/config.default.php
index baa9267df..d5d1b30dd 100644
--- a/config.default.php
+++ b/config.default.php
@@ -139,6 +139,24 @@ define('GITHUB_OAUTH_TOKEN_URL', 'https://github.com/login/oauth/access_token');
// Github API url (don't forget the slash at the end)
define('GITHUB_API_URL', 'https://api.github.com/');
+// Enable/disable Gitlab authentication
+define('GITLAB_AUTH', false);
+
+// Gitlab application id
+define('GITLAB_CLIENT_ID', '');
+
+// Gitlab application secret
+define('GITLAB_CLIENT_SECRET', '');
+
+// Gitlab oauth2 authorize url
+define('GITLAB_OAUTH_AUTHORIZE_URL', 'https://gitlab.com/oauth/authorize');
+
+// Gitlab oauth2 token url
+define('GITLAB_OAUTH_TOKEN_URL', 'https://gitlab.com/oauth/token');
+
+// Gitlab API url endpoint (don't forget the slash at the end)
+define('GITLAB_API_URL', 'https://gitlab.com/api/v3/');
+
// Enable/disable the reverse proxy authentication
define('REVERSE_PROXY_AUTH', false);
diff --git a/docs/github-authentication.markdown b/docs/github-authentication.markdown
index efefffc03..ba0f371fb 100644
--- a/docs/github-authentication.markdown
+++ b/docs/github-authentication.markdown
@@ -11,7 +11,7 @@ How does this work?
The Github authentication in Kanboard uses the [OAuth 2.0](http://oauth.net/2/) protocol, so any user of Kanboard can be linked to a Github account.
-That means you can use your Github account to connect to Kanboard.
+That means you can use your Github account to login on Kanboard.
How to link a Github account
----------------------------
diff --git a/docs/gitlab-authentication.markdown b/docs/gitlab-authentication.markdown
new file mode 100644
index 000000000..3cf6d2836
--- /dev/null
+++ b/docs/gitlab-authentication.markdown
@@ -0,0 +1,78 @@
+Gitlab Authentication
+=====================
+
+Requirements
+------------
+
+- Account on [Gitlab.com](https://gitlab.com) or you own self-hosted Gitlab instance
+- Have Kanboard registered as application in Gitlab
+
+How does this work?
+-------------------
+
+The Gitlab authentication in Kanboard uses the [OAuth 2.0](http://oauth.net/2/) protocol, so any user of Kanboard can be linked to a Gitlab account.
+
+That means you can use your Gitlab account to login on Kanboard.
+
+How to link a Gitlab account
+----------------------------
+
+1. Go to your user profile
+2. Click on **External accounts**
+3. Click on the link **Link my Gitlab Account**
+4. You are redirected to the **Gitlab authorization form**
+5. Authorize Kanboard by clicking on the button **Accept**
+6. Your account is now linked
+
+Now, on the login page you can be authenticated in one click with the link **Login with my Gitlab Account**.
+
+Your name and email are automatically updated from your Gitlab Account if defined.
+
+Installation instructions
+-------------------------
+
+### Setting up OAuth 2.0
+
+- On Gitlab, register a new application by following the [official documentation](http://doc.gitlab.com/ce/integration/oauth_provider.html)
+- In Kanboard, you can get the **callback url** in **Settings > Integrations > Gitlab Authentication**, just copy and paste the url
+
+### Setting up Kanboard
+
+Either create a new `config.php` file or rename the `config.default.php` file and set the following values:
+
+```php
+// Enable/disable Gitlab authentication
+define('GITLAB_AUTH', true);
+
+// Gitlab application id
+define('GITLAB_CLIENT_ID', 'YOUR_APPLICATION_ID');
+
+// Gitlab application secret
+define('GITLAB_CLIENT_SECRET', 'YOUR_APPLICATION_SECRET');
+```
+
+### Custom endpoints for self-hosted Gitlab
+
+Change these default values if you use a self-hosted instance of Gitlab:
+
+```php
+// Gitlab oauth2 authorize url
+define('GITLAB_OAUTH_AUTHORIZE_URL', 'https://gitlab.com/oauth/authorize');
+
+// Gitlab oauth2 token url
+define('GITLAB_OAUTH_TOKEN_URL', 'https://gitlab.com/oauth/token');
+
+// Gitlab API url endpoint (don't forget the slash at the end)
+define('GITLAB_API_URL', 'https://gitlab.com/api/v3/');
+```
+
+Notes
+-----
+
+Kanboard uses these information from your Gitlab profile:
+
+- Full name
+- Email address
+- Gitlab unique id
+
+The Gitlab unique id is used to link the local user account and the Gitlab account.
diff --git a/docs/index.markdown b/docs/index.markdown
index e14a6adf6..10db316a7 100644
--- a/docs/index.markdown
+++ b/docs/index.markdown
@@ -122,6 +122,7 @@ Technical details
- [LDAP authentication](ldap-authentication.markdown)
- [Google authentication](google-authentication.markdown)
- [Github authentication](github-authentication.markdown)
+- [Gitlab authentication](gitlab-authentication.markdown)
- [Reverse proxy authentication](reverse-proxy-authentication.markdown)
### Contributors
diff --git a/tests/units/UserTest.php b/tests/units/UserTest.php
index e3fa5f764..e52f28492 100644
--- a/tests/units/UserTest.php
+++ b/tests/units/UserTest.php
@@ -47,6 +47,36 @@ class UserTest extends Base
$this->assertEmpty($u->getByEmail(''));
}
+ public function testGetByGitlabId()
+ {
+ $u = new User($this->container);
+ $this->assertNotFalse($u->create(array('username' => 'user1', 'password' => '123456', 'gitlab_id' => '1234')));
+ $this->assertNotFalse($u->create(array('username' => 'user2', 'password' => '123456', 'gitlab_id' => '')));
+
+ $this->assertNotEmpty($u->getByGitlabId('1234'));
+ $this->assertEmpty($u->getByGitlabId(''));
+ }
+
+ public function testGetByGithubId()
+ {
+ $u = new User($this->container);
+ $this->assertNotFalse($u->create(array('username' => 'user1', 'password' => '123456', 'github_id' => 'plop')));
+ $this->assertNotFalse($u->create(array('username' => 'user2', 'password' => '123456', 'github_id' => '')));
+
+ $this->assertNotEmpty($u->getByGithubId('plop'));
+ $this->assertEmpty($u->getByGithubId(''));
+ }
+
+ public function testGetByGoogleId()
+ {
+ $u = new User($this->container);
+ $this->assertNotFalse($u->create(array('username' => 'user1', 'password' => '123456', 'google_id' => '1234')));
+ $this->assertNotFalse($u->create(array('username' => 'user2', 'password' => '123456', 'google_id' => '')));
+
+ $this->assertNotEmpty($u->getByGoogleId('1234'));
+ $this->assertEmpty($u->getByGoogleId(''));
+ }
+
public function testPassword()
{
$password = 'test123';
 ?>assets/img/gitlab-icon.png){kind=icon}
 ?>assets/img/mailgun-icon.png){kind=icon}