Merge ff5ceaa into 1cb9a02

bjyoungblood · Oct 6, 2013 · cb3a486 · cb3a486
2 parents 1cb9a02 + ff5ceaa
commit cb3a486
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 9 deletions.
diff --git a/src/BjyAuthorize/Provider/Identity/ZfcUserZendDb.php b/src/BjyAuthorize/Provider/Identity/ZfcUserZendDb.php
@@ -31,11 +31,6 @@ class ZfcUserZendDb implements ProviderInterface
      */
     protected $defaultRole;
 
-    /**
-     * @var string
-     */
-    protected $tableName = 'user_role_linker';
-
     /**
      * @var \Zend\Db\TableGateway\TableGateway
      */
@@ -62,12 +57,12 @@ public function getIdentityRoles()
             return array($this->getDefaultRole());
         }
 
+        list($tableName, $identifierFieldName) = $this->getRoleProviderTableMeta($this->userService->getServiceManager()->get('BjyAuthorize\Config'));
+
         // get roles associated with the logged in user
         $sql = new Select();
-
-        $sql->from($this->tableName);
-        // @todo these fields should eventually be configurable
-        $sql->join('user_role', 'user_role.id = ' . $this->tableName . '.role_id');
+        $sql->from($this->tableGateway->getTable());
+        $sql->join($tableName, $tableName . '.' . $identifierFieldName . ' = ' . $this->tableGateway->getTable() . '.role_id');
         $sql->where(array('user_id' => $authService->getIdentity()->getId()));
 
         $results = $this->tableGateway->selectWith($sql);
@@ -81,6 +76,45 @@ public function getIdentityRoles()
         return $roles;
     }
 
+    /**
+     * @param $config
+     * @return array
+     */
+    public function getRoleProviderTableMeta($config)
+    {
+        return array($this->getUserRoleTableName($config), $this->getUserRoleIdentifierFieldName($config));
+    }
+
+    /**
+     * @param $config
+     * @return string
+     */
+    private function getUserRoleTableName($config)
+    {
+        $tableName = 'user_role';
+        if (isset($config['role_providers']['BjyAuthorize\Provider\Role\ZendDb']) &&
+            isset($config['role_providers']['BjyAuthorize\Provider\Role\ZendDb']['table'])) {
+            $tableName = $config['role_providers']['BjyAuthorize\Provider\Role\ZendDb']['table'];
+        }
+
+        return $tableName;
+    }
+
+    /**
+     * @param $config
+     * @return string
+     */
+    private function getUserRoleIdentifierFieldName($config)
+    {
+        $identifierFieldName = 'id';
+        if (isset($config['role_providers']['BjyAuthorize\Provider\Role\ZendDb']) &&
+            isset($config['role_providers']['BjyAuthorize\Provider\Role\ZendDb']['identifier_field_name'])) {
+            $identifierFieldName = $config['role_providers']['BjyAuthorize\Provider\Role\ZendDb']['identifier_field_name'];
+        }
+
+        return $identifierFieldName;
+    }
+
     /**
      * @return string|\Zend\Permissions\Acl\Role\RoleInterface
      */

diff --git a/tests/BjyAuthorizeTest/Provider/Identity/ZfcUserZendDbTest.php b/tests/BjyAuthorizeTest/Provider/Identity/ZfcUserZendDbTest.php
@@ -93,4 +93,11 @@ public function testGetIdentityRoles()
         $roles = $this->provider->getIdentityRoles();
         $this->assertEquals($roles, array(null));
     }
+
+    public function testEmptyRoleProviderConfig()
+    {
+        list($tableName, $identifierFieldName) = $this->provider->getRoleProviderTableMeta(array());
+        $this->assertSame('user_role', $tableName);
+        $this->assertSame('id', $identifierFieldName);
+    }
 }