dav: fixes in #255

pulsejet · Dec 8, 2023 · ac62355 · ac62355
1 parent 22dd8a0
commit ac62355
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/lib/OIDCLoginOption.php b/lib/OIDCLoginOption.php
@@ -49,5 +49,7 @@ public function getClass(): string
         return 'oidc-button';
     }
 
-    public function load(): void {}
+    public function load(): void
+    {
+    }
 }
diff --git a/lib/Provider/OpenIDConnectClient.php b/lib/Provider/OpenIDConnectClient.php
@@ -139,7 +139,10 @@ public function getProfile(): array
     public function getTokenProfile(string $token): array
     {
         if ($this->isJWT($token)) {
-            return $this->decodeJWT($token, 1);
+            $jwt = $this->decodeJWT($token, 1);
+
+            // Convert stdClass to array recursively
+            return json_decode(json_encode($jwt), true);
         }
 
         $this->accessToken = $token;

diff --git a/lib/WebDAV/BasicAuthBackend.php b/lib/WebDAV/BasicAuthBackend.php
@@ -72,7 +72,8 @@ public function validateUserPass($username, $password)
      */
     public function handle(Event $event): void
     {
-        if (!$event instanceof \OCA\DAV\Events\SabrePluginAuthInitEvent) {
+        if (!$event instanceof \OCA\DAV\Events\SabrePluginAuthInitEvent
+            && !$event instanceof \OCP\SabrePluginEvent) {
             return;
         }
 

diff --git a/lib/WebDAV/BearerAuthBackend.php b/lib/WebDAV/BearerAuthBackend.php
@@ -73,7 +73,8 @@ public function validateBearerToken($bearerToken)
      */
     public function handle(Event $event): void
     {
-        if (!$event instanceof \OCA\DAV\Events\SabrePluginAuthInitEvent) {
+        if (!$event instanceof \OCA\DAV\Events\SabrePluginAuthInitEvent
+            && !$event instanceof \OCP\SabrePluginEvent) {
             return;
         }