ref: make Memsource API calls from Kirby fixes #10

OblikStudio · Aug 19, 2020 · d0e2fd8 · d0e2fd8
1 parent 41264f0
commit d0e2fd8
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 77 deletions.
diff --git a/index.php b/index.php
@@ -5,6 +5,7 @@
 use Kirby\Cms\App;
 
 load([
+    'Oblik\\Memsource\\Service' => 'Service.php',
     'Oblik\\Memsource\\Snapshot' => 'Snapshot.php'
 ], __DIR__ . '/lib');
 
@@ -60,9 +61,8 @@ function walkerSettings($config = [])
     ],
     'api' => [
         'routes' => array_merge(
-            include 'routes/export.php',
-            include 'routes/import.php',
-            include 'routes/snapshot.php'
+            include 'routes/snapshot.php',
+            include 'routes/export.php'
         )
     ],
     'translations' => [

diff --git a/lib/Service.php b/lib/Service.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Oblik\Memsource;
+
+use Kirby\Http\Cookie;
+use Kirby\Http\Remote;
+use Kirby\Http\Response;
+
+class Service
+{
+	public const API_URL = 'https://cloud.memsource.com/web/api2/v1';
+
+	public $token = null;
+
+	public function __construct()
+	{
+		$this->token = Cookie::get('memsource_session');
+	}
+
+	public function login()
+	{
+		$remote = Remote::request(self::API_URL . '/auth/login', [
+			'method' => 'POST',
+			'data' => json_encode(kirby()->request()->data()),
+			'headers' => [
+				'Content-Type' => 'application/json'
+			]
+		]);
+
+		if ($remote->code() === 200) {
+			$data = json_decode($remote->content(), true);
+			$token = $data['token'] ?? null;
+			$expires = $data['expires'] ?? null;
+
+			if ($token) {
+				Cookie::set('memsource_session', $token, [
+					'lifetime' => strtotime($expires)
+				]);
+			}
+		}
+
+		return new Response($remote->content(), 'application/json', $remote->code());
+	}
+
+	public function get(string $resource)
+	{
+		$remote = Remote::request(self::API_URL . '/' . $resource . '?token=' . $this->token, [
+			'method' => 'GET'
+		]);
+
+		return new Response($remote->content(), 'application/json', $remote->code());
+	}
+
+	public function upload(string $projectId, string $filename)
+	{
+		$remote = Remote::request(self::API_URL . '/projects/' . $projectId . '/jobs?token=' . $this->token, [
+			'method' => 'POST',
+			'data' => json_encode(kirby()->request()->data()),
+			'headers' => [
+				'Memsource' => kirby()->request()->headers()['Memsource'],
+				'Content-Type' => 'application/octet-stream',
+				'Content-Disposition' => "filename*=UTF-8''{$filename}"
+			]
+		]);
+
+		return new Response($remote->content(), 'application/json', $remote->code());
+	}
+}
diff --git a/routes/export.php b/routes/export.php
@@ -5,10 +5,49 @@
 use Exception;
 use Oblik\Outsource\Util\Diff;
 use Oblik\Outsource\Walker\Exporter;
+use Oblik\Outsource\Walker\Importer;
 
 return [
     [
-        'pattern' => 'export',
+        'pattern' => 'memsource/login',
+        'method' => 'POST',
+        'action' => function () {
+            return (new Service)->login();
+        }
+    ],
+    [
+        'pattern' => 'memsource/upload/(:any)/(:any)',
+        'method' => 'POST',
+        'action' => function ($project, $filename) {
+            return (new Service)->upload($project, $filename);
+        }
+    ],
+    [
+        'pattern' => 'memsource/import',
+        'method' => 'POST',
+        'action' => function () {
+            if ($config = $_SERVER['HTTP_MEMSOURCE'] ?? null) {
+                $config = json_decode($config, true);
+            }
+
+            $language = $config['language'] ?? null;
+            $postData = file_get_contents('php://input');
+            $content = json_decode($postData, true);
+
+            if (empty($language)) {
+                throw new Exception('Missing language', 400);
+            }
+
+            if (empty($content)) {
+                throw new Exception('Missing content', 400);
+            }
+
+            $importer = new Importer(walkerSettings());
+            return $importer->import($content, $language);
+        }
+    ],
+    [
+        'pattern' => 'memsource/export',
         'method' => 'GET',
         'action' => function () {
             $pattern = $_GET['pages'] ?? null;
@@ -41,5 +80,12 @@
 
             return $data;
         }
+    ],
+    [
+        'pattern' => 'memsource/(:all)',
+        'method' => 'GET',
+        'action' => function ($resource) {
+            return (new Service)->get($resource);
+        }
     ]
 ];
diff --git a/routes/import.php b/routes/import.php
diff --git a/routes/snapshot.php b/routes/snapshot.php
@@ -6,7 +6,7 @@
 
 return [
     [
-        'pattern' => 'snapshot',
+        'pattern' => 'memsource/snapshot',
         'method' => 'GET',
         'action' => function () {
             return array_map(function ($file) {
@@ -18,7 +18,7 @@
         }
     ],
     [
-        'pattern' => 'snapshot',
+        'pattern' => 'memsource/snapshot',
         'method' => 'POST',
         'action' => function () {
             $lang = kirby()->defaultLanguage()->code();
@@ -30,7 +30,7 @@
         }
     ],
     [
-        'pattern' => 'snapshot',
+        'pattern' => 'memsource/snapshot',
         'method' => 'DELETE',
         'action' => function () {
             return Snapshot::remove($_GET['name']);

diff --git a/src/components/tabs/service/views/Export.vue b/src/components/tabs/service/views/Export.vue
@@ -46,7 +46,7 @@ export default {
       }
 
       this.$loading(
-        this.$store.dispatch('outsource', {
+        this.$store.dispatch('memsource', {
           url: '/export',
           params
         }).then(response => {
@@ -58,7 +58,7 @@ export default {
   },
   created () {
     this.$loading(
-      this.$store.dispatch('outsource', {
+      this.$store.dispatch('memsource', {
         url: '/snapshot',
         method: 'get'
       }).then(response => {

diff --git a/src/components/tabs/service/views/Import.vue b/src/components/tabs/service/views/Import.vue
@@ -128,7 +128,7 @@ export default {
             language: language.code
           }
 
-          return this.$store.dispatch('outsource', {
+          return this.$store.dispatch('memsource', {
             url: '/import',
             method: 'post',
             headers: {

diff --git a/src/components/tabs/service/views/Upload.vue b/src/components/tabs/service/views/Upload.vue
@@ -162,12 +162,10 @@ export default {
         }
 
         return this.$store.dispatch('memsource', {
-          url: `/projects/${ this.project.uid }/jobs`,
+          url: `/upload/${ this.project.uid }/${ filename }`,
           method: 'post',
           headers: {
-            'Memsource': JSON.stringify(memsourceHeader),
-            'Content-Type': 'application/octet-stream',
-            'Content-Disposition': `filename*=UTF-8''${ filename }`
+            Memsource: JSON.stringify(memsourceHeader),
           },
           data: this.data
         })

diff --git a/src/components/tabs/snapshots/Snapshots.vue b/src/components/tabs/snapshots/Snapshots.vue
@@ -46,7 +46,7 @@ export default {
       return (new Date(seconds * 1000)).toLocaleString()
     },
     fetch () {
-      this.$store.dispatch('outsource', {
+      this.$store.dispatch('memsource', {
         url: '/snapshot',
         method: 'get'
       }).then(response => {
@@ -56,7 +56,7 @@ export default {
       }).catch(this.$alert)
     },
     create () {
-      this.$store.dispatch('outsource', {
+      this.$store.dispatch('memsource', {
         url: '/snapshot',
         method: 'post',
         params: {
@@ -67,7 +67,7 @@ export default {
       }).catch(this.$alert)
     },
     remove (name) {
-      this.$store.dispatch('outsource', {
+      this.$store.dispatch('memsource', {
         url: '/snapshot',
         method: 'delete',
         params: {

diff --git a/src/components/tabs/user/views/Login.vue b/src/components/tabs/user/views/Login.vue
@@ -33,7 +33,7 @@ export default {
     submit () {
       this.$loading(
         this.$store.dispatch('memsource', {
-          url: '/auth/login',
+          url: '/login',
           method: 'post',
           data: this.credentials
         }).then(response => {

diff --git a/src/store.js b/src/store.js
@@ -11,15 +11,6 @@ class MemsourceError extends Error {
   }
 }
 
-class OutsourceError extends Error {
-  constructor (response) {
-    super(response.data.message)
-    this.name = 'OutsourceError'
-    this.code = response.data.code
-    this.type = response.data.exception
-  }
-}
-
 function formatRejection (Error) {
   return function (error) {
     if (error.response && error.response.data) {
@@ -61,20 +52,9 @@ export default (Vuex, rootStore) => new Vuex.Store({
     sourceLanguage: function (state, getters) {
       return getters.languages.current.code
     },
-    msClient: function (state, getters, rootState) {
-      var token = (rootState.session && rootState.session.token)
-
+    msClient: function () {
       return axios.create({
-        baseURL: 'https://cloud.memsource.com/web/api2/v1',
-        method: 'get',
-        params: {
-          token: token
-        }
-      })
-    },
-    exporterClient: () => {
-      return axios.create({
-        baseURL: panel.api,
+        baseURL: panel.api + '/memsource',
         method: 'get',
         headers: {
           'X-CSRF': panel.csrf
@@ -126,7 +106,7 @@ export default (Vuex, rootStore) => new Vuex.Store({
       }
 
       if (!alert.text && alert.error) {
-        alert.text = `${ alert.error.name }: ${ alert.error.message }`
+        alert.text = `${alert.error.name}: ${alert.error.message}`
       }
 
       state.alerts.push(alert)
@@ -138,9 +118,6 @@ export default (Vuex, rootStore) => new Vuex.Store({
   actions: {
     memsource: ({ getters }, payload) => {
       return getters.msClient(payload).catch(formatRejection(MemsourceError))
-    },
-    outsource: ({ getters }, payload) => {
-      return getters.exporterClient(payload).catch(formatRejection(OutsourceError))
     }
   }
 })