mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

offer login popup from oauth dialog, correct base uri

This commit is contained in:
Michiel@unhosted 2011-09-12 15:04:21 +02:00
parent 6e569c5ed1
commit d0746d7e32
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/unhosted/compat.php
View File

@ -67,7 +67,7 @@ if(count($pathParts) >= 8 && $pathParts[0] == '' && $pathParts[2] == 'unhosted'
$server = new Sabre_DAV_Server($publicDir); $server = new Sabre_DAV_Server($publicDir);
// Path to our script // Path to our script
$server->setBaseUri("$WEBROOT/apps/core_unhosted/compat.php/$ownCloudUser"); $server->setBaseUri("$WEBROOT/apps/unhosted/compat.php/$ownCloudUser");
// Auth backend // Auth backend
$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(OC_UnhostedWeb::getValidTokens($ownCloudUser, $userName.'@'.$userHost, $dataScope)); $authBackend = new OC_Connector_Sabre_Auth_ro_oauth(OC_UnhostedWeb::getValidTokens($ownCloudUser, $userName.'@'.$userHost, $dataScope));
@ -100,7 +100,12 @@ if(count($pathParts) >= 8 && $pathParts[0] == '' && $pathParts[2] == 'unhosted'
$token=OC_UnhostedWeb::createDataScope($appUrl, $userAddress, $dataScope); $token=OC_UnhostedWeb::createDataScope($appUrl, $userAddress, $dataScope);
header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=unhosted'); header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=unhosted');
} else { } else {
die('not logged in: '.var_export($pathParts, true)); die('Please '
.'<input type="submit" onclick="'
."window.open('https://myfavouritesandwich.org:444/','Close me!','height=600,width=300');"
.'" value="log in">'
.', close the pop-up, and '
.'<form method="POST"><input name="allow" type="submit" value="Try again"></form>');
} }
} else { } else {
echo '<form method="POST"><input name="allow" type="submit" value="Allow this web app to store stuff on your owncloud."></form>'; echo '<form method="POST"><input name="allow" type="submit" value="Allow this web app to store stuff on your owncloud."></form>';