Commit 320ec35d authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Various changes

parent ce73310a

.htaccess

+1 −0
Original line number Diff line number Diff line 
Options -Indexes

RewriteEngine On

RewriteCond %{REQUEST_FILENAME} !-f

RewriteCond %{REQUEST_FILENAME} !-d

README.md

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ For installing PHP dependencies run: 


    composer install



Install also the bcmath PHP package (used in X.509 parser).



To setup the database edit scripts in the sql folder and run them:



    mysql -u root -p < sql/create-db-and-user.sql

oauth2/facebook_login.php→auth/oauth2/facebook_login.php

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 */



include '../include/init.php';

include '../../include/init.php';

startSession();



$Facebook = $AUTHENTICATION_METHODS['Facebook'];

oauth2/facebook_token.php→auth/oauth2/facebook_token.php

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 */



include '../include/init.php';

include '../../include/init.php';

startSession();



$Facebook = $AUTHENTICATION_METHODS['Facebook'];
@@ -80,7 +80,7 @@ $fbUser = $response->getGraphUser(); 


$typedId = $fbUser["id"];



$user = RAP\UserHandler::findUserByIdentity(RAP\Identity::FACEBOOK, $typedId, null);

$user = RAP\UserHandler::findUserByIdentity(RAP\Identity::FACEBOOK, $typedId);



if ($user === null) {

    $user = new RAP\User();

oauth2/google_token.php→auth/oauth2/google_token.php

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 */



include '../include/init.php';

include '../../include/init.php';

startSession();



$Google = $AUTHENTICATION_METHODS['Google'];
@@ -74,7 +74,7 @@ if ($client->getAccessToken()) { 


    $typedId = explode('/', $res->getResourceName())[1];



    $user = RAP\UserHandler::findUserByIdentity(RAP\Identity::GOOGLE, $typedId, null);

    $user = RAP\UserHandler::findUserByIdentity(RAP\Identity::GOOGLE, $typedId);



    if ($user === null) {

        $user = new RAP\User();