kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Added possibility to export the calendar in iCal format (closes #141)

Browse Source
This commit is contained in:
Bernd Bestel
2019-03-04 17:44:48 +01:00
parent 77b0bc675c
commit 90291fdbca
14 changed files with 336 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/ApiKeyService.php
View File

@@ -4,10 +4,13 @@ namespace Grocy\Services;
class ApiKeyService extends BaseService
{
const API_KEY_TYPE_DEFAULT = 'default';
const API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL = 'special-purpose-calendar-ical';
/**
* @return boolean
*/
public function IsValidApiKey($apiKey)
public function IsValidApiKey($apiKey, $keyType = self::API_KEY_TYPE_DEFAULT)
{
if ($apiKey === null || empty($apiKey))
{
@@ -15,7 +18,7 @@ class ApiKeyService extends BaseService
}
else
{
$apiKeyRow = $this->Database->api_keys()->where('api_key = :1 AND expires > :2', $apiKey, date('Y-m-d H:i:s', time()))->fetch();
$apiKeyRow = $this->Database->api_keys()->where('api_key = :1 AND expires > :2 AND key_type = :3', $apiKey, date('Y-m-d H:i:s', time()), $keyType)->fetch();
if ($apiKeyRow !== null)
{
$apiKeyRow->update(array(
@@ -33,14 +36,15 @@ class ApiKeyService extends BaseService
/**
* @return string
*/
public function CreateApiKey()
public function CreateApiKey($keyType = self::API_KEY_TYPE_DEFAULT)
{
$newApiKey = $this->GenerateApiKey();
$apiKeyRow = $this->Database->api_keys()->createRow(array(
'api_key' => $newApiKey,
'user_id' => GROCY_USER_ID,
'expires' => '2999-12-31 23:59:59' // Default is that API keys expire never
'expires' => '2999-12-31 23:59:59', // Default is that API keys expire never
'key_type' => $keyType
));
$apiKeyRow->save();
@@ -68,6 +72,28 @@ class ApiKeyService extends BaseService
return null;
}
// Returns any valid key for $keyType,
// not allowed for key type "default"
public function GetOrCreateApiKey($keyType)
{
if ($keyType === self::API_KEY_TYPE_DEFAULT)
{
return null;
}
else
{
$apiKeyRow = $this->Database->api_keys()->where('key_type = :1 AND expires > :2', $keyType, date('Y-m-d H:i:s', time()))->fetch();
if ($apiKeyRow !== null)
{
return $apiKeyRow->api_key;
}
else
{
return $this->CreateApiKey($keyType);
}
}
}
private function GenerateApiKey()
{
return RandomString(50);