allow to use dot notation on individual group members

cosmocode · Mar 21, 2024 · 420dfed · 420dfed
1 parent bf300a6
commit 420dfed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/DotAccess.php b/DotAccess.php
@@ -20,6 +20,8 @@ class DotAccess
      */
     public static function get($array, $key, $default = null)
     {
+        $key = trim($key, '.');
+
         if (!static::accessible($array)) {
             return $default;
         }

diff --git a/action.php b/action.php
@@ -29,10 +29,18 @@ public function getUser()
         $result = json_decode($raw, true);
         if (!$result) throw new OAuthException('Failed to parse data from userurl');
 
+        $grpdots = sexplode('[]', $this->getConf('json-grps'), 2);
         $user = DotAccess::get($result, $this->getConf('json-user'), '');
         $name = DotAccess::get($result, $this->getConf('json-name'), '');
         $mail = DotAccess::get($result, $this->getConf('json-mail'), '');
-        $grps = DotAccess::get($result, $this->getConf('json-grps'), []);
+        $grps = DotAccess::get($result, $grpdots[0], []);
+
+        // use dot notation on each group
+        if(is_array($grps) && $grpdots[1]) {
+            $grps = array_map(function($grp) use ($grpdots) {
+                return DotAccess::get($grp, $grpdots[1], '');
+            }, $grps);
+        }
 
         // type fixes
         if (is_array($user)) $user = array_shift($user);