RPJosh
/
nc-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use config service in all controllers

master
Loic Blot 2017-07-03 23:12:50 +02:00
parent 1fd86ad5f7
commit 03dc83b4d5
5 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appinfo/application.php
View File

@ -36,6 +36,10 @@ class Application extends App {
return \OCP\User::getUser(); return \OCP\User::getUser();
}); });
$container->registerService('Config', function($c) {
return $c->query('ServerContainer')->getConfig();
});
/** /**
* Database Layer * Database Layer
*/ */
@ -53,6 +57,7 @@ class Application extends App {
$container->registerService('CityController', function(IContainer $c) { $container->registerService('CityController', function(IContainer $c) {
return new CityController( return new CityController(
$c->query('AppName'), $c->query('AppName'),
$c->query('Config'),
$c->query('Request'), $c->query('Request'),
$c->query('UserId'), $c->query('UserId'),
$c->query('CityMapper'), $c->query('CityMapper'),
@ -63,6 +68,7 @@ class Application extends App {
$container->registerService('SettingsController', function(IContainer $c) { $container->registerService('SettingsController', function(IContainer $c) {
return new SettingsController( return new SettingsController(
$c->query('AppName'), $c->query('AppName'),
$c->query('Config'),
$c->query('Request'), $c->query('Request'),
$c->query('UserId'), $c->query('UserId'),
$c->query('SettingsMapper'), $c->query('SettingsMapper'),
@ -73,6 +79,7 @@ class Application extends App {
$container->registerService('WeatherController', function(IContainer $c) { $container->registerService('WeatherController', function(IContainer $c) {
return new WeatherController( return new WeatherController(
$c->query('AppName'), $c->query('AppName'),
$c->query('Config'),
$c->query('Request'), $c->query('Request'),
$c->query('UserId'), $c->query('UserId'),
$c->query('CityMapper'), $c->query('CityMapper'),

12
controller/citycontroller.php
View File

@ -11,6 +11,7 @@
namespace OCA\Weather\Controller; namespace OCA\Weather\Controller;
use \OCP\IConfig;
use \OCP\IRequest; use \OCP\IRequest;
use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
@ -27,14 +28,14 @@ class CityController extends IntermediateController {
private $userId; private $userId;
private $mapper; private $mapper;
private $settingsMapper; private $settingsMapper;
private $apiKey; private $config;
public function __construct ($appName, IRequest $request, $userId, CityMapper $mapper, SettingsMapper $settingsMapper) { public function __construct ($appName, IConfig $config, IRequest $request, $userId, CityMapper $mapper, SettingsMapper $settingsMapper) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userId = $userId; $this->userId = $userId;
$this->mapper = $mapper; $this->mapper = $mapper;
$this->settingsMapper = $settingsMapper; $this->settingsMapper = $settingsMapper;
$this->apiKey = \OC::$server->getConfig()->getAppValue('weather', 'openweathermap_api_key', ''); $this->config = $config;
} }
/** /**
@ -120,15 +121,16 @@ class CityController extends IntermediateController {
} }
private function getCityInformations ($name) { private function getCityInformations ($name) {
$apiKey = $this->config->getAppValue($this->appName, 'openweathermap_api_key');
$cityDatas = json_decode($this->curlGET( $cityDatas = json_decode($this->curlGET(
"http://api.openweathermap.org/data/2.5/forecast?q=".urlencode($name)."&mode=json&APPID=".urlencode($this->apiKey))[1], "http://api.openweathermap.org/data/2.5/forecast?q=".urlencode($name)."&mode=json&APPID=".urlencode($apiKey))[1],
true); true);
if (in_array('cod', $cityDatas)) { if (in_array('cod', $cityDatas)) {
return array("code" => 502, "response" => null); return array("code" => 502, "response" => null);
} }
if ($cityDatas['cod'] != '200') { if ($cityDatas['cod'] != '200') {
return array("code" => $cityDatas['cod'], "response" => null); return array("code" => $cityDatas['cod'], "response" => null, "apikey" => $apiKey);
} }
return array("code" => 200, "response" => $cityDatas); return array("code" => 200, "response" => $cityDatas);

14
controller/settingscontroller.php
View File

@ -11,6 +11,7 @@
namespace OCA\Weather\Controller; namespace OCA\Weather\Controller;
use \OCP\IConfig;
use \OCP\IRequest; use \OCP\IRequest;
use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
@ -25,12 +26,14 @@ class SettingsController extends Controller {
private $userId; private $userId;
private $mapper; private $mapper;
private $cityMapper; private $cityMapper;
private $config;
public function __construct ($appName, IRequest $request, $userId, SettingsMapper $mapper, CityMapper $cityMapper) { public function __construct ($appName, IConfig $config, IRequest $request, $userId, SettingsMapper $mapper, CityMapper $cityMapper) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userId = $userId; $this->userId = $userId;
$this->mapper = $mapper; $this->mapper = $mapper;
$this->cityMapper = $cityMapper; $this->cityMapper = $cityMapper;
$this->config = $config;
} }
/** /**
@ -50,12 +53,11 @@ class SettingsController extends Controller {
return new JSONResponse(array("set" => true)); return new JSONResponse(array("set" => true));
} }
/**
* @NoCSRFRequired
*/
public function apiKeySet ($apikey) { public function apiKeySet ($apikey) {
\OC::$server->getConfig()->setAppValue('weather', 'openweathermap_api_key', $apiKey); $this->config->setAppValue($this->appName, 'openweathermap_api_key', $apikey);
return new JSONResponse(array("set" => true)); return new JSONResponse(array(
"apikey" => $this->config->getAppValue($this->appName, 'openweathermap_api_key', ''),
));
} }
/** /**

10
controller/weathercontroller.php
View File

@ -11,6 +11,7 @@
namespace OCA\Weather\Controller; namespace OCA\Weather\Controller;
use \OCP\IConfig;
use \OCP\IRequest; use \OCP\IRequest;
use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
@ -27,17 +28,15 @@ class WeatherController extends IntermediateController {
private $userId; private $userId;
private $mapper; private $mapper;
private $settingsMapper; private $settingsMapper;
private $apiKey;
private $metric; private $metric;
private static $apiWeatherURL = "http://api.openweathermap.org/data/2.5/weather?mode=json&q="; private static $apiWeatherURL = "http://api.openweathermap.org/data/2.5/weather?mode=json&q=";
private static $apiForecastURL = "http://api.openweathermap.org/data/2.5/forecast?mode=json&q="; private static $apiForecastURL = "http://api.openweathermap.org/data/2.5/forecast?mode=json&q=";
public function __construct ($appName, IRequest $request, $userId, CityMapper $mapper, SettingsMapper $settingsMapper) { public function __construct ($appName, IConfig $config, IRequest $request, $userId, CityMapper $mapper, SettingsMapper $settingsMapper) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->userId = $userId; $this->userId = $userId;
$this->mapper = $mapper; $this->mapper = $mapper;
$this->settingsMapper = $settingsMapper; $this->settingsMapper = $settingsMapper;
$this->apiKey = \OC::$server->getConfig()->getAppValue('weather', 'openweathermap_api_key', '');
$this->metric = $settingsMapper->getMetric($this->userId); $this->metric = $settingsMapper->getMetric($this->userId);
} }
@ -54,8 +53,9 @@ class WeatherController extends IntermediateController {
} }
private function getCityInformations ($name) { private function getCityInformations ($name) {
$apiKey = $this->config->getAppValue($this->appName, 'openweathermap_api_key');
$name = preg_replace("[ ]",'%20',$name); $name = preg_replace("[ ]",'%20',$name);
$reqContent = $this->curlGET(WeatherController::$apiWeatherURL.$name."&APPID=".$this->apiKey."&units=".$this->metric); $reqContent = $this->curlGET(WeatherController::$apiWeatherURL.$name."&APPID=".$apiKey."&units=".$this->metric);
if ($reqContent[0] != Http::STATUS_OK) { if ($reqContent[0] != Http::STATUS_OK) {
$this->errorCode = $reqContent[0]; $this->errorCode = $reqContent[0];
return null; return null;
@ -63,7 +63,7 @@ class WeatherController extends IntermediateController {
$cityDatas = json_decode($reqContent[1], true); $cityDatas = json_decode($reqContent[1], true);
$cityDatas["forecast"] = array(); $cityDatas["forecast"] = array();
$forecast = json_decode(file_get_contents(WeatherController::$apiForecastURL.$name."&APPID=".$this->apiKey."&units=".$this->metric), true); $forecast = json_decode(file_get_contents(WeatherController::$apiForecastURL.$name."&APPID=".$apiKey."&units=".$this->metric), true);
if ($forecast['cod'] == '200' && isset($forecast['cnt']) && is_numeric($forecast['cnt'])) { if ($forecast['cod'] == '200' && isset($forecast['cnt']) && is_numeric($forecast['cnt'])) {
// Show only 8 values max // Show only 8 values max
// @TODO: setting ? // @TODO: setting ?

4
js/admin.js
View File

@ -32,12 +32,12 @@
url: OC.generateUrl('/apps/weather/settings/apikey'), url: OC.generateUrl('/apps/weather/settings/apikey'),
type: 'POST', type: 'POST',
data: { data: {
apiKey: $('#openweathermap-api-key').val() apikey: $('#openweathermap-api-key').val()
} }
}); });
request.done(function (data) { request.done(function (data) {
$('#openweathermap-api-key').val(data.apiKey); $('#openweathermap-api-key').val(data.apikey);
OC.msg.finishedSuccess('#OWMApiKeySettingsMsg', 'Saved'); OC.msg.finishedSuccess('#OWMApiKeySettingsMsg', 'Saved');
}); });