Merge pull request #11003 from annando/fix-api

[friendica.git] / src / Module / Owa.php

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index 9a8d8fbb6536f86321ee91e20d48011fb4cde1fe..6062f2c998a32b6de67ef23a3098c1e0794d34f1 100644 (file)
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -44,9 +44,8 @@ use Friendica\Util\Strings;
  */
 class Owa extends BaseModule
 {
-       public static function init(array $parameters = [])
+       public function rawContent()
        {
-
                $ret = [ 'success' => false ];
 
                foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
@@ -76,8 +75,7 @@ class Owa extends BaseModule
                                                        $verified = HTTPSignature::verifyMagic($contact['pubkey']);
 
                                                        if ($verified && $verified['header_signed'] && $verified['header_valid']) {
-                                                               Logger::log('OWA header: ' . print_r($verified, true), Logger::DATA);
-                                                               Logger::log('OWA success: ' . $contact['addr'], Logger::DATA);
+                                                               Logger::debug('OWA header', ['addr' => $contact['addr'], 'data' => $verified]);
 
                                                                $ret['success'] = true;
                                                                $token = Strings::getRandomHex(32);
@@ -94,10 +92,10 @@ class Owa extends BaseModule
                                                                openssl_public_encrypt($token, $result, $contact['pubkey']);
                                                                $ret['encrypted_token'] = Strings::base64UrlEncode($result);
                                                        } else {
-                                                               Logger::log('OWA fail: ' . $contact['id'] . ' ' . $contact['addr'] . ' ' . $contact['url'], Logger::DEBUG);
+                                                               Logger::info('OWA fail', ['id' => $contact['id'], 'addr' => $contact['addr'], 'url' => $contact['url']]);
                                                        }
                                                } else {
-                                                       Logger::log('Contact not found: ' . $handle, Logger::DEBUG);
+                                                       Logger::info('Contact not found', ['handle' => $handle]);
                                                }
                                        }
                                }