Skip to content

fix: Use backend model to get / generate key/hash #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manojLondhe merged 2 commits into from
Jan 10, 2019
Merged

fix: Use backend model to get / generate key/hash #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
350f6de
Task #139177 fix: Use backend model to get / generate key/hash
manojLondhe Jan 10, 2019
0a0a4b8
Task #139177 fix: Scrutinizer issues
manojLondhe Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 102 additions & 50 deletions src/users/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?php
/**
* @package API plugins
* @copyright Copyright (C) 2009 2014 Techjoomla, Tekdi Technologies Pvt. Ltd. All rights reserved.
* @license GNU GPLv2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
* @link http://www.techjoomla.com
* @package API
* @subpackage plg_api_users
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2019 Techjoomla, Tekdi Technologies Pvt. Ltd. All rights reserved.
* @license GNU GPLv2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
*/

defined('_JEXEC') or die( 'Restricted access' );
// No direct access.
defined('_JEXEC') or die('Restricted access');

require_once JPATH_SITE . '/components/com_api/vendors/php-jwt/src/JWT.php';

Expand All @@ -23,84 +26,125 @@
JModelLegacy::addIncludePath(JPATH_SITE . 'components/com_api/models');
require_once JPATH_SITE . '/components/com_api/libraries/authentication/user.php';
require_once JPATH_SITE . '/components/com_api/libraries/authentication/login.php';
require_once JPATH_SITE . '/components/com_api/models/key.php';
require_once JPATH_SITE . '/components/com_api/models/keys.php';
require_once JPATH_ADMINISTRATOR . '/components/com_api/models/key.php';
require_once JPATH_ADMINISTRATOR . '/components/com_api/models/keys.php';

/**
* Login API resource class
*
* @package API
* @since 1.6.0
*/
class UsersApiResourceLogin extends ApiResource
{
/**
* Get method
*
* @return object
*/
public function get()
{
$this->plugin->setResponse( JText::_('PLG_API_USERS_GET_METHOD_NOT_ALLOWED_MESSAGE'));
$this->plugin->setResponse(JText::_('PLG_API_USERS_GET_METHOD_NOT_ALLOWED_MESSAGE'));
}

/**
* Post method
*
* @return object
*/
public function post()
{
$this->plugin->setResponse($this->keygen());
}

/**
* Generate key method
*
* @return object|boolean
*/
public function keygen()
{
//init variable
$obj = new stdclass;
// Init variable
$obj = new stdclass;
$umodel = new JUser;
$user = $umodel->getInstance();
$user = $umodel->getInstance();

$app = JFactory::getApplication();
$app = JFactory::getApplication();
$username = $app->input->get('username', 0, 'STRING');

$user = JFactory::getUser();
$id = JUserHelper::getUserId($username);
$id = JUserHelper::getUserId($username);

if($id == null)
if ($id == null)
{
$model = FD::model('Users');
$id = $model->getUserId('email', $username);
$id = $model->getUserId('email', $username);
}

$kmodel = new ApiModelKey;
$model = new ApiModelKeys;
$key = null;
$model = new ApiModelKeys;
$key = null;

// Get login user hash
//$kmodel->setState('user_id', $user->id);
$kmodel->setState('user_id', $id);
$log_hash = $kmodel->getList();
$log_hash = (!empty($log_hash))?$log_hash[count($log_hash) - count($log_hash)]:$log_hash;
// $kmodel->setState('user_id', $user->id);

// $kmodel->setState('user_id', $id);
// $log_hash = $kmodel->getList();
$model->setState('user_id', $id);
$log_hash = $model->getItems();

$log_hash = (!empty($log_hash)) ? $log_hash[count($log_hash) - count($log_hash)] : $log_hash;

if( !empty($log_hash) )
if (!empty($log_hash))
{
$key = $log_hash->hash;
}
elseif( $key == null || empty($key) )
elseif ($key == null || empty($key))
{
// Create new key for user
$data = array(
// Create new key for user
$data = array (
'userid' => $user->id,
'domain' => '' ,
'state' => 1,
'id' => '',
'task' => 'save',
'c' => 'key',
'ret' => 'index.php?option=com_api&view=keys',
'state' => 1,
'id' => '',
'task' => 'save',
'c' => 'key',
'ret' => 'index.php?option=com_api&view=keys',
'option' => 'com_api',
JSession::getFormToken() => 1
);
);

$result = $kmodel->save($data);
$key = $result->hash;
$result = $kmodel->save($data);

//add new key in easysocial table
$easyblog = JPATH_ROOT . '/administrator/components/com_easyblog/easyblog.php';
if (JFile::exists($easyblog) && JComponentHelper::isEnabled('com_easysocial', true))
{
$this->updateEauth( $user , $key );
}
// $key = $result->hash;

if (!$result)
{
return false;
}

// Load api key table
JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_api/tables');
$table = JTable::getInstance('Key', 'ApiTable');
$table->load(array('userid' => $user->id));
$key = $table->hash;

// Add new key in easysocial table
$easyblog = JPATH_ROOT . '/administrator/components/com_easyblog/easyblog.php';

if (JFile::exists($easyblog) && JComponentHelper::isEnabled('com_easysocial', true))
{
$this->updateEauth($user, $key);
}
}

if( !empty($key) )
if (!empty($key))
{
$obj->auth = $key;
$obj->code = '200';
//$obj->id = $user->id;

// $obj->id = $user->id;

$obj->id = $id;

// Generate claim for jwt
Expand Down Expand Up @@ -129,21 +173,29 @@ public function keygen()
$obj->code = 403;
$obj->message = JText::_('PLG_API_USERS_BAD_REQUEST_MESSAGE');
}
return( $obj );

return ($obj);
}

/*
* function to update Easyblog auth keys
/**
* Method to update Easyblog auth keys
*
* @param mixed $user User object
* @param mixed $key Key
*
* @return integer
*
* @since 1.6
*/
public function updateEauth($user=null,$key=null)
public function updateEauth ($user = null, $key = null)
{
require_once JPATH_ADMINISTRATOR.'/components/com_easysocial/includes/foundry.php';
$model = FD::model('Users');
$id = $model->getUserId('username', $user->username);
$user = FD::user($id);
require_once JPATH_ADMINISTRATOR . '/components/com_easysocial/includes/foundry.php';

$model = FD::model('Users');
$id = $model->getUserId('username', $user->username);
$user = FD::user($id);
$user->alias = $user->username;
$user->auth = $key;
$user->auth = $key;
$user->store();

return $id;
Expand Down