Merge pull request #1 from Daniel-WWU-IT/main

API updates
sciencemesh · Mar 30, 2021 · 9047978 · 9047978
2 parents 7158cc8 + b0b51cf
commit 9047978
Show file tree

Hide file tree

Showing 35 changed files with 290 additions and 161 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/.travis.yml b/.travis.yml
diff --git a/AUTHORS.md b/AUTHORS.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/COPYING b/COPYING
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/appinfo/Migrations/Version20191002101015.php b/appinfo/Migrations/Version20191002101015.php
diff --git a/appinfo/Migrations/Version20210324134421.php b/appinfo/Migrations/Version20210324134421.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace OCA\sciencemesh\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
+use OCP\Migration\ISchemaMigration;
+
+class Version20210324134421 implements ISchemaMigration
+{
+	public function changeSchema(Schema $schema, array $options)
+	{
+		$prefix = $options['tablePrefix'];
+
+		// Drop any previous version, as the settings have changed completely
+		if ($schema->hasTable("{$prefix}sciencemesh")) {
+			$schema->dropTable("{$prefix}sciencemesh");
+		}
+
+		$table = $schema->createTable("{$prefix}sciencemesh");
+		$table->addColumn('apikey', 'string', [
+			'notnull' => true,
+		]);
+		$table->addColumn('sitename', 'string', [
+			'notnull' => true,
+		]);
+		$table->addColumn('siteurl', 'string', [
+			'notnull' => true,
+		]);
+		$table->addColumn('siteid', 'string', [
+			'notnull' => false,
+		]);
+		$table->addColumn('country', 'string', [
+			'notnull' => true,
+			'length' => 3,
+		]);
+		$table->addColumn('iopurl', 'string', [
+			'notnull' => true,
+		]);
+		$table->addColumn('numusers', Type::BIGINT, [
+			'notnull' => true,
+			'default' => 0,
+			'unsigned' => true,
+		]);
+		$table->addColumn('numfiles', Type::BIGINT, [
+			'notnull' => true,
+			'default' => 0,
+			'unsigned' => true,
+		]);
+		$table->addColumn('numstorage', Type::BIGINT, [
+			'notnull' => true,
+			'default' => 0,
+			'unsigned' => true,
+		]);
+	}
+}
diff --git a/appinfo/app.php b/appinfo/app.php
diff --git a/appinfo/application.php b/appinfo/application.php
diff --git a/appinfo/autoload.php b/appinfo/autoload.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,14 +5,14 @@
     <description>This apps connects the site to the Science Mesh</description>
     <licence>MIT</licence>
     <author>Hugo Gonzalez Labrador</author>
-    <version>1.0.1</version>
+    <version>1.1.0</version>
     <namespace>ScienceMesh</namespace>
     <category>productivity</category>
-	  <dependencies>
-	    <owncloud min-version="10.0.0" max-version="11" />
-	  </dependencies>
+    <dependencies>
+        <owncloud min-version="10.0.0" max-version="11"/>
+    </dependencies>
     <settings>
-	  <admin>OCA\Sciencemesh\AdminSettings</admin>
+        <admin>OCA\Sciencemesh\AdminSettings</admin>
     </settings>
     <use-migrations>true</use-migrations>
-    </info>
+</info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
@@ -21,24 +21,26 @@
 use OCP\Http\Client\IClientService;
 use OCP\AppFramework\Http;
 
-class PageController extends Controller {
-    	private $logger;
+class PageController extends Controller
+{
+	private $logger;
 	private $userId;
 	protected $connection;
 
 	/** @var IClientService */
 	private $httpClientService;
 
-	public function __construct($AppName, 
-		IRequest $request,
-		$UserId,
-		IDBConnection $connection, 
-		IClientService $httpClientService,
-                ILogger $logger) {
+	public function __construct($AppName,
+	                            IRequest $request,
+	                            $UserId,
+	                            IDBConnection $connection,
+	                            IClientService $httpClientService,
+	                            ILogger $logger)
+	{
 
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
-		$this->connection = $connection; 
+		$this->connection = $connection;
 		$this->httpClientService = $httpClientService;
 		$this->logger = $logger;
 	}
@@ -53,7 +55,8 @@ public function __construct($AppName,
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function index() {
+	public function index()
+	{
 		$params = ['user' => $this->userId];
 		return new TemplateResponse('sciencemesh', 'main', $params);  // templates/main.php
 	}
@@ -62,7 +65,8 @@ public function index() {
 	 * Simply method that posts back the payload of the request
 	 * @NoAdminRequired
 	 */
-	public function doEcho($echo) {
+	public function doEcho($echo)
+	{
 		return new DataResponse(['echo' => $echo]);
 	}
 
@@ -71,7 +75,8 @@ public function doEcho($echo) {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function getMetrics() {
+	public function getMetrics()
+	{
 		// for localhost requests is needed to add
 		// 'allow_local_remote_servers' => true,
 		// to config.php
@@ -108,7 +113,8 @@ public function getMetrics() {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function getInternalMetrics() {
+	public function getInternalMetrics()
+	{
 		//$metrics = $this->getInternal();
 		$settings = $this->loadSettings();
 		if (!$settings) {
@@ -125,7 +131,8 @@ public function getInternalMetrics() {
 		return new JSONResponse($payload);
 	}
 
-	private function loadSettings(){
+	private function loadSettings()
+	{
 		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$query->select('*')->from('sciencemesh');
 		$result = $query->execute();
@@ -134,6 +141,7 @@ private function loadSettings(){
 		$row['numusers'] = intval($row['numusers']);
 		$row['numfiles'] = intval($row['numfiles']);
 		$row['numstorage'] = intval($row['numstorage']);
+		unset($row['apikey']); // Remove the private API key from the exposed settings
 		return $row;
 	}