work on

classes/OAuth.class.php

@@ -4,4 +4,97 @@ namespace Owncloud;
 
 class OAuth {
 
+    static public function request($url, $type = "get", $payload = array())
+    {
+        $owncloud = \Config::get()->OWNCLOUD_ENDPOINT ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
+        if ($owncloud[strlen($owncloud) - 1] !== "/") {
+            $owncloud .= "/";
+        }
+
+        $header = array();
+
+        $accessToken = self::getAccessToken();
+        if (!$accessToken) {
+            throw new Exception("No valid access token. Please refresh you connection to Owncloud.");
+        }
+
+        $header[] = "Authorization: Bearer ".$accessToken;
+
+        $r = curl_init();
+        curl_setopt($r, CURLOPT_URL, $url);
+        curl_setopt($r, CURLOPT_POST, $type === "get" ? 0 : 1);
+        curl_setopt($r, CURLOPT_HTTPHEADER, studip_utf8encode($header));
+        curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
+
+        curl_setopt($r, CURLOPT_POSTFIELDS, studip_utf8encode($payload));
+
+        $result = curl_exec($r);
+        curl_close($r);
+
+        $header_size = curl_getinfo($r, CURLINFO_HEADER_SIZE);
+        $header = substr($result, 0, $header_size);
+        $body = substr($result, $header_size);
+    }
+
+    static public function isReady()
+    {
+        return self::hasAccessToken() || \Config::get()->OWNCLOUD_REFRESH_TOKEN;
+    }
+
+    static public function getAccessToken()
+    {
+        if (self::hasAccessToken()) {
+            return \Config::get()->OWNCLOUD_ACCESS_TOKEN;
+        } elseif(\Config::get()->OWNCLOUD_REFRESH_TOKEN) {
+            self::refreshAccessToken();
+            return \Config::get()->OWNCLOUD_ACCESS_TOKEN;
+        } else {
+            return false;
+        }
+    }
+
+    static public function hasAccessToken()
+    {
+        return \Config::get()->OWNCLOUD_ACCESS_TOKEN
+            && (\Config::get()->OWNCLOUD_ACCESS_TOKEN_EXPIRES >= time());
+    }
+
+    static public function refreshAccessToken()
+    {
+        $owncloud = \Config::get()->OWNCLOUD_ENDPOINT ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT;
+        if ($owncloud[strlen($owncloud) - 1] !== "/") {
+            $owncloud .= "/";
+        }
+
+        $header = array();
+
+        $header[] = "Accept: application/json";
+
+        $payload = array(
+            'grant_type' => "refresh_token",
+            'refresh_token' => \Config::get()->OWNCLOUD_REFRESH_TOKEN,
+            'client_id' => \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID,    // The client ID assigned to you by the provider
+            'client_secret' => \Config::get()->OWNCLOUD_CLIENT_SECRET ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET,   // The client password assigned to you by the provider
+            'format' => "json"
+        );
+
+        $r = curl_init();
+        curl_setopt($r, CURLOPT_URL, $owncloud."index.php/apps/oauth2/api/v1/token");
+        curl_setopt($r, CURLOPT_POST, 1);
+        curl_setopt($r, CURLOPT_HTTPHEADER, studip_utf8encode($header));
+        curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
+
+        curl_setopt($r, CURLOPT_POSTFIELDS, studip_utf8encode($payload));
+
+        $result = curl_exec($r);
+        curl_close($r);
+
+        $header_size = curl_getinfo($r, CURLINFO_HEADER_SIZE);
+        $header = substr($result, 0, $header_size);
+        $body = studip_utf8decode(json_decode(substr($result, $header_size)));
+
+        $config = \UserConfig::get($GLOBALS['user']->id);
+        $config->store("OWNCLOUD_ACCESS_TOKEN", $body['access_token']);
+        $config->store("OWNCLOUD_ACCESS_TOKEN_EXPIRES", time() + $body['expires_in']);
+    }
 }
\ No newline at end of file

controllers/oauth.php

@@ -63,7 +63,7 @@ class OauthController extends PluginController
             $owncloud .= "/";
         }
 
-        $provider = new \League\OAuth2\Client\Provider\GenericProvider([
+        /*$provider = new \League\OAuth2\Client\Provider\GenericProvider([
             'clientId'                => Config::get()->OWNCLOUD_CLIENT_ID ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID,    // The client ID assigned to you by the provider
             'clientSecret'            => Config::get()->OWNCLOUD_CLIENT_SECRET ?: UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET,   // The client password assigned to you by the provider
             'redirectUri'             => PluginEngine::getURL($this->plugin, array(), "oauth/receive_access_token_action", true),
@@ -76,6 +76,8 @@ class OauthController extends PluginController
             'code' => Request::get("code")
         ]);
 
+
+
         echo 'Access Token: ' . $accessToken->getToken() . "<br>";
         echo 'Refresh Token: ' . $accessToken->getRefreshToken() . "<br>";
         echo 'Expired in: ' . $accessToken->getExpires() . "<br>";
@@ -84,7 +86,45 @@ class OauthController extends PluginController
         $config = UserConfig::get($GLOBALS['user']->id);
         $config->store("OWNCLOUD_ACCESS_TOKEN", $accessToken->getToken());
         $config->store("OWNCLOUD_ACCESS_TOKEN_EXPIRES", $accessToken->getExpires());
-        $config->store("OWNCLOUD_REFRESH_TOKEN", $accessToken->getRefreshToken());
+        $config->store("OWNCLOUD_REFRESH_TOKEN", $accessToken->getRefreshToken());*/
+
+
+
+
+
+        $header = array();
+
+        $header[] = "Accept: application/json";
+
+        $payload = array(
+            'grant_type' => "authorization_code",
+            'code' => Request::get("code"),
+            'redirect_uri' => PluginEngine::getURL($this->plugin, array(), "oauth/receive_access_token", true),
+            'client_id' => \Config::get()->OWNCLOUD_CLIENT_ID ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_ID,    // The client ID assigned to you by the provider
+            'client_secret' => \Config::get()->OWNCLOUD_CLIENT_SECRET ?: \UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_CLIENT_SECRET,   // The client password assigned to you by the provider
+            'format' => "json"
+        );
+
+        $r = curl_init();
+        curl_setopt($r, CURLOPT_URL, $owncloud."index.php/apps/oauth2/authorize");
+        curl_setopt($r, CURLOPT_POST, 1);
+        curl_setopt($r, CURLOPT_HTTPHEADER, studip_utf8encode($header));
+        curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
+
+        curl_setopt($r, CURLOPT_POSTFIELDS, studip_utf8encode($payload));
+
+        $result = curl_exec($r);
+        $curl_info = curl_getinfo($r);
+        curl_close($r);
+
+        $header_size = $curl_info['header_size'];
+        $header = substr($result, 0, $header_size);
+        $body = studip_utf8decode(json_decode(substr($result, $header_size), true));
+        var_dump(($result));
+
+        $config = \UserConfig::get($GLOBALS['user']->id);
+        $config->store("OWNCLOUD_ACCESS_TOKEN", $body['access_token']);
+        $config->store("OWNCLOUD_ACCESS_TOKEN_EXPIRES", time() + $body['expires_in']);
 
         $this->render_nothing();
     }

views/configure/myarea.php

@@ -9,7 +9,7 @@
             <?= _("OwnCloud konfigurieren") ?>
         </legend>
 
-        <? if (UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_OAUTH_ACCESS_TOKEN && UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_OAUTH_REFRESH_TOKEN) : ?>
+        <? if (\Owncloud\OAuth::isReady()) : ?>
             <?= MessageBox::info(_("OwnCloud-Rechte sind freigegeben")) ?>
         <? elseif(UserConfig::get($GLOBALS['user']->id)->OWNCLOUD_ENDPOINT) : ?>
             <div style="text-align: center;">