sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Partial #1676

Browse Source
This commit is contained in:
Daniel Camargo 2013-09-04 13:08:37 -03:00
parent eabafea03b
commit 5fffecccd6
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/controllers/default/crunchbutton/api/user/index.php
View File

@ -236,31 +236,20 @@ class Controller_api_user extends Crunchbutton_Controller_Rest {
case 'facebook':
if ($_REQUEST['fbrtoken']) {
// log in from the app
c::auth()->facebook(new Crunchbutton_Auth_Facebook($_REQUEST['fbrtoken']));
$fb = c::auth()->facebook(new Crunchbutton_Auth_Facebook($_REQUEST['fbrtoken']));
$user = c::user();
if ( $fb->fbuser()->id ) {
$fb_user = User::facebook( $fb->fbuser()->id );
if ( $fb_user->id_user && $fb_user->id_user != $user->id_user ) {
echo json_encode(['error' => 'facebook id already in use']);
exit;
}
}
c::auth()->facebook()->check();
c::auth()->fbauth();
echo c::user()->json();
break;
}
// Force register or merge the facebook user and current user. do not merge if user has a facebook auth that is not current user auth
if (c::auth()->facebook()) {
$user = c::user();
$fb = c::auth()->facebook();
// @todo: changed alot of shit here. need to double check it all works
if ($fb->user()->id) {
// It seems the facebook user is already related with other user
$fb_user = User::facebook($fb->user()->id);
if ($fb_user->id_user && $user->id_user) {
if ($fb_user->id_user != $user->id_user) {
echo json_encode(['error' => 'facebook id already in use']);
exit;
}
}
}
}
echo c::user()->json();
break;

2
www/assets/js/services.facebook.js
View File

@ -127,7 +127,7 @@ NGApp.factory( 'FacebookService', function( $http, $location, $rootScope, Accoun
if (data.error) {
if (data.error == 'facebook id already in use') {
App.log.account({'error': data.error}, 'facebook error');
service.error.unknown = true;
service.error.userExists = true;
}
} else {