Guwan
/
ldap-matter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49 from grvsmth/abg_resource_dn 

Fixed 'dn' bug and documentation in resource.php
This commit is contained in:
Denis CLAVIER 2020-05-24 16:48:51 +02:00 committed by GitHub
parent 09c68d7d12 a6fa569775
commit 62f9248a3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
oauth/resource.php
View File

@ -33,8 +33,42 @@ $ldap = new LDAP($ldap_host, $ldap_port, $ldap_version);
try { try {
$data = $ldap->getDataForMattermost($ldap_base_dn, $ldap_filter, $ldap_bind_dn, $ldap_bind_pass, $ldap_search_attribute, $user); $data = $ldap->getDataForMattermost($ldap_base_dn, $ldap_filter, $ldap_bind_dn, $ldap_bind_pass, $ldap_search_attribute, $user);
// Here is the patch for Mattermost 4.4 and older. Gitlab has changed the JSON output of oauth service. Many data are not used by Mattermost, but there is a stack error if we delete them. That's the reason why date and many parameters are null or empty. // Here is the patch for Mattermost 4.4 and newer. Gitlab has changed the JSON output of oauth service. Many data are not used by Mattermost, but there is a stack error if we delete them. That's the reason why date and many parameters are null or empty.
$resp = array("id" => $assoc_id,"name" => $data['cn'],"username" => $user,"state" => "active","avatar_url" => "","web_url" => "","created_at" => "0000-00-00T00:00:00.000Z","bio" => null,"location" => null,"skype" => "","linkedin" => "","twitter" => "","website_url" => "","organization" => null,"last_sign_in_at" => "0000-00-00T00:00:00.000Z","confirmed_at" => "0000-00-00T00:00:00.000Z","last_activity_on" => null,"email" => $data['mail'],"theme_id" => 1,"color_scheme_id" => 1,"projects_limit" => 100000,"current_sign_in_at" => "0000-00-00T00:00:00.000Z","identities" => array(array("provider" => "ldapmain","extern_uid" => $data['dn'])),"can_create_group" => true,"can_create_project" => true,"two_factor_enabled" => false,"external" => false,"shared_runners_minutes_limit" => null); $resp = array(
"id" => $assoc_id,
"name" => $data['cn'],
"username" => $user,
"state" => "active",
"avatar_url" => "",
"web_url" => "",
"created_at" => "0000-00-00T00:00:00.000Z",
"bio" => null,
"location" => null,
"skype" => "",
"linkedin" => "",
"twitter" => "",
"website_url" => "",
"organization" => null,
"last_sign_in_at" => "0000-00-00T00:00:00.000Z",
"confirmed_at" => "0000-00-00T00:00:00.000Z",
"last_activity_on" => null,
"email" => $data['mail'],
"theme_id" => 1,
"color_scheme_id" => 1,
"projects_limit" => 100000,
"current_sign_in_at" => "0000-00-00T00:00:00.000Z",
"identities" => array(
array(
"provider" => "ldapmain",
"extern_uid" => $data['cn']
)
),
"can_create_group" => true,
"can_create_project" => true,
"two_factor_enabled" => false,
"external" => false,
"shared_runners_minutes_limit" => null
);
// Below is the old version, still consistent with Mattermost before version 4.4 // Below is the old version, still consistent with Mattermost before version 4.4
// $resp = array("name" => $data['cn'],"username" => $user,"id" => $assoc_id,"state" => "active","email" => $data['mail']); // $resp = array("name" => $data['cn'],"username" => $user,"id" => $assoc_id,"state" => "active","email" => $data['mail']);