Merge branch 'release/v1.3.2'

Sebiworld · Aug 20, 2023 · eb099b3 · eb099b3
2 parents 8568f15 + 9f83149
commit eb099b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/AppApi.module.php b/AppApi.module.php
@@ -24,7 +24,7 @@ public static function getModuleInfo() {
 		return [
 			'title' => 'AppApi',
 			'summary' => 'Module to create a REST API with ProcessWire',
-			'version' => '1.3.1',
+			'version' => '1.3.2',
 			'author' => 'Sebastian Schendel',
 			'icon' => 'terminal',
 			'href' => 'https://modules.processwire.com/modules/app-api/',
@@ -848,6 +848,12 @@ public static function getAjaxOf($content) {
 				'title' => $content->title,
 				'value' => $content->value
 			];
+		} elseif ($content instanceof WireArray) {
+			foreach ($content as $item) {
+				$output[] = self::getAjaxOf($item);
+			}
+		} elseif ($content instanceof WireData) {
+			$output = $content->getArray();
 		}
 
 		return $output;

diff --git a/classes/Auth.php b/classes/Auth.php
@@ -113,6 +113,14 @@ protected function ___createSingleJWTToken($args = []) {
 		return $jwt;
 	}
 
+	public function ___doCurrentUser($data) {
+		return [
+			'id' => wire('user')->id,
+			'name' => wire('user')->name,
+			'loggedIn' => wire('user')->isLoggedIn()
+		];
+	}
+
 	public function ___doLogin($data) {
 		$access = $this->getLogintype($data);
 		$loggedIn = false;
@@ -602,11 +610,7 @@ public static function access() {
 		return self::getInstance()->getAccessToken();
 	}
 
-	public static function currentUser() {
-		return [
-			'id' => wire('user')->id,
-			'name' => wire('user')->name,
-			'loggedIn' => wire('user')->isLoggedIn()
-		];
+	public static function currentUser($data) {
+		return self::getInstance()->doCurrentUser($data);
 	}
 }