aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Authorize.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-19 16:19:14 -0800
committerzotlabs <mike@macgirvin.com>2018-02-19 16:19:14 -0800
commit76b5c686460ed5fe4c93dc0e268d99dc9eb988b6 (patch)
treec8eb101027b5157014b50080a1d5c32101c67e42 /Zotlabs/Module/Authorize.php
parentb6b4827680d14bcb0062bba4a272f661bbb33d8c (diff)
parent66309a3fea4b087ffef53ea93d5573278515dcf0 (diff)
downloadvolse-hubzilla-76b5c686460ed5fe4c93dc0e268d99dc9eb988b6.tar.gz
volse-hubzilla-76b5c686460ed5fe4c93dc0e268d99dc9eb988b6.tar.bz2
volse-hubzilla-76b5c686460ed5fe4c93dc0e268d99dc9eb988b6.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Authorize.php')
-rw-r--r--Zotlabs/Module/Authorize.php45
1 files changed, 22 insertions, 23 deletions
diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php
index 7676b0855..254700b4e 100644
--- a/Zotlabs/Module/Authorize.php
+++ b/Zotlabs/Module/Authorize.php
@@ -2,13 +2,13 @@
namespace Zotlabs\Module;
+use Zotlabs\Identity\OAuth2Storage;
-class Authorize extends \Zotlabs\Web\Controller {
+class Authorize extends \Zotlabs\Web\Controller {
function init() {
-
// workaround for HTTP-auth in CGI mode
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
@@ -28,41 +28,40 @@ class Authorize extends \Zotlabs\Web\Controller {
}
}
- $s = new \Zotlabs\Identity\OAuth2Server();
+ $s = new \Zotlabs\Identity\OAuth2Server(new OAuth2Storage(\DBA::$dba->db));
$request = \OAuth2\Request::createFromGlobals();
$response = new \OAuth2\Response();
// validate the authorize request
- if (! $s->server->validateAuthorizeRequest($request, $response)) {
- $response->send();
- killme();
+ if (! $s->validateAuthorizeRequest($request, $response)) {
+ $response->send();
+ killme();
}
- // display an authorization form
- if (empty($_POST)) {
+ // display an authorization form
+ if (empty($_POST)) {
- return '
+ return '
<form method="post">
<label>Do You Authorize TestClient?</label><br />
<input type="submit" name="authorized" value="yes">
<input type="submit" name="authorized" value="no">
</form>';
- }
+ }
- // print the authorization code if the user has authorized your client
- $is_authorized = ($_POST['authorized'] === 'yes');
- $s->server->handleAuthorizeRequest($request, $response, $is_authorized, local_channel());
- if ($is_authorized) {
- // this is only here so that you get to see your code in the cURL request. Otherwise,
- // we'd redirect back to the client
- $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
- echo("SUCCESS! Authorization Code: $code");
-
- }
+ // print the authorization code if the user has authorized your client
+ $is_authorized = ($_POST['authorized'] === 'yes');
+ $s->handleAuthorizeRequest($request, $response, $is_authorized, local_channel());
+ if ($is_authorized) {
+ // this is only here so that you get to see your code in the cURL request. Otherwise,
+ // we'd redirect back to the client
+ $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+ echo("SUCCESS! Authorization Code: $code");
+ }
- $response->send();
- killme();
+ $response->send();
+ killme();
}
-} \ No newline at end of file
+}