Updated for new Adldap2.

Author: samwilson

README.md

@@ -1,16 +1,16 @@
 Active Directory and LDAP authentication for Kohana
 ===================================================
 
-A wrapper module for [Kohana 3.3](http://kohanaframework.org)
-to provide Active Directory and LDAP authentication
-with the [Adldap2](http://adldap2.github.io) library.
+A [Kohana 3.3](http://kohanaframework.org) module
+that wraps [Adldap2](https://github.com/Adldap2/Adldap2)
+to provide Active Directory and LDAP authentication.
 
 ## 1. Install
 Copy the module to the `kadldap` directory in your `MODPATH`, or install with
 [Composer](https://getcomposer.org) by adding the following to your
 `composer.json` file (to get the latest stable version):
 
- "samwilson/kohana_kadldap": "*"
+ "adldap2/adldap2-kohana": "3.*"
 
 Then enable the module with `Kohana::modules()` (usually in `bootstrap.php`).
 
@@ -31,3 +31,7 @@ Use [Auth](http://kohanaframework.org/3.3/guide/auth) as usual. e.g.:
 or:
 
  Auth::instance()->logged_in('Security Group Name');
+
+## 4. Contribute
+
+Please report all issues at https://github.com/Adldap2/Adldap2-Kohana/issues

classes/Controller/Kadldap.php

@@ -70,9 +70,11 @@ public function action_index()
 $username = Auth::instance()->get_user();
 $password = Auth::instance()->password($username);
 $view->kadldap->authenticate($username, $password);
-$view->user = $view->kadldap->users()->find($username);
+$view->userinfo = $view->kadldap->users()
+->find($username)
+->getAttributes();
 } else {
-$view->user = NULL;
+$view->userinfo = NULL;
 }
 }
 

classes/Kadldap/Auth/LDAP.php

@@ -91,20 +91,21 @@ public function logged_in($role = NULL)
 
 /**
  * Get list of all roles that the current user holds (i.e. LDAP groups
- * of which they are a member.
- * 
- * @uses adLDAPUsers::groups()
- * @return array An array of strings
+ * of which they are a member).
+ *
+ * @uses Adldap\Models\User::getGroups()
+ * @return string[]
  */
 public function get_roles()
 {
 $username = $this->get_user();
 $this->kadldap->authenticate($username, $this->password($username));
-return [];
-var_dump($username, $this->kadldap->users());exit();
 $user = $this->kadldap->users()->find($username);
-$groups = $user->getGroups();
-return $groups ? $groups : array();
+$groups = array();
+foreach ($user->getGroups() as $group) {
+$groups[$group->getCommonName()] = $group->getCommonName();
+}
+return $groups;
 }
 
 }

composer.json

@@ -1,13 +1,13 @@
 {
-"name": "samwilson/kohana_kadldap",
+"name": "adldap2/adldap2-kohana",
 "type": "kohana-module",
 "description": "Module for AD/LDAP support in Kohana 3 (includes an Auth driver).",
 "license": "MIT",
 "support": {
-"issues": "https://github.com/samwilson/kohana_kadldap/issues",
+"issues": "https://github.com/Adldap2/Adldap2-Kohana/issues",
 "forum": "http://forum.kohanaframework.org",
 "irc": "irc://irc.freenode.net/kohana",
-"source": "https://github.com/samwilson/kohana_kadldap"
+"source": "https://github.com/Adldap2/Adldap2-Kohana"
 },
 "authors": [
 {
@@ -25,6 +25,6 @@
 ],
 "require": {
 "kohana/auth": "*",
-"adldap2/adldap2": "5.0.*"
+"adldap2/adldap2": "5.*"
 }
 }

config/kadldap.php

@@ -12,7 +12,7 @@
 'domain_controllers' => array(), // array('dc.example.com','dc1.example.com')
 'account_suffix' => '', // '@example.com'
 'base_dn' => '', // 'dc=example,dc=com',
-'ad_username'  => NULL,
-'ad_password'  => NULL
+'admin_username' => NULL,
+'admin_password' => NULL
 )
 );