Separate server and api in different classes

Signed-off-by: Marius David Wieschollek <passwords.public@mdns.eu>

3 files changed, 21 insertions, 21 deletions

diff --git a/src/Repositories/FolderRepository.js b/src/Repositories/FolderRepository.js
index 82c5e5d..73071bc 100644
--- a/src/Repositories/FolderRepository.js
+++ b/src/Repositories/FolderRepository.js
@@ -4,11 +4,11 @@ export default class FolderRepository {
 
     /**
      *
-     * @param {Server} server
+     * @param {Api} api
      * @param {Cache} cache
      */
-    constructor(server, cache) {
-        this._server = server;
+    constructor(api, cache) {
+        this._api = api;
         this._cache = cache;
     }
 
@@ -58,7 +58,7 @@ export default class FolderRepository {
             return this._cache.get(id);
         }
 
-        let request = this._server.createRequest()
+        let request = this._api.getRequest()
             .setPath('api/1.0/folder/show')
             .setData({id});
 
@@ -79,7 +79,7 @@ export default class FolderRepository {
             return this._cache.getByType('folder');
         }
 
-        let request = this._server.createRequest()
+        let request = this._api.getRequest()
             .setPath('api/1.0/folder/list');
 
         let response = await request.send();
@@ -102,10 +102,10 @@ export default class FolderRepository {
      */
     async _dataToModel(data) {
         if(data.cseType === 'CSEv1r1') {
-            data = await this._server.getCseV1Encryption().decrypt(data, 'folder');
+            data = await this._api.getCseV1Encryption().decrypt(data, 'folder');
         }
 
-        let folder = new Folder(this._server, data);
+        let folder = this._api.getClass('model.folder', this._api, data);
         this._cache.set(folder.getId(), folder, 'folder');
 
         return folder
diff --git a/src/Repositories/PasswordRepository.js b/src/Repositories/PasswordRepository.js
index 50b5f8a..ca6f5c1 100644
--- a/src/Repositories/PasswordRepository.js
+++ b/src/Repositories/PasswordRepository.js
@@ -4,11 +4,11 @@ export default class PasswordRepository {
 
     /**
      *
-     * @param {Server} server
+     * @param {Api} api
      * @param {Cache} cache
      */
-    constructor(server, cache) {
-        this._server = server;
+    constructor(api, cache) {
+        this._api = api;
         this._cache = cache;
     }
 
@@ -58,7 +58,7 @@ export default class PasswordRepository {
             return this._cache.get(id);
         }
 
-        let request = this._server.createRequest()
+        let request = this._api.getRequest()
             .setPath('api/1.0/password/show')
             .setData({id});
 
@@ -79,7 +79,7 @@ export default class PasswordRepository {
             return this._cache.getByType('password');
         }
 
-        let request = this._server.createRequest()
+        let request = this._api.getRequest()
             .setPath('api/1.0/password/list');
 
         let response = await request.send();
@@ -102,10 +102,10 @@ export default class PasswordRepository {
      */
     async _dataToModel(data) {
         if(data.cseType === 'CSEv1r1') {
-            data = await this._server.getCseV1Encryption().decrypt(data, 'password');
+            data = await this._api.getCseV1Encryption().decrypt(data, 'password');
         }
 
-        let password = new Password(this._server, data);
+        let password = this._api.getClass('model.password', this._api, data);
         this._cache.set(password.getId(), password, 'password');
 
         return password
diff --git a/src/Repositories/TagRepository.js b/src/Repositories/TagRepository.js
index 7a3665c..98902b8 100644
--- a/src/Repositories/TagRepository.js
+++ b/src/Repositories/TagRepository.js
@@ -4,11 +4,11 @@ export default class TagRepository {
 
     /**
      *
-     * @param {Server} server
+     * @param {Api} api
      * @param {Cache} cache
      */
-    constructor(server, cache) {
-        this._server = server;
+    constructor(api, cache) {
+        this._api = api;
         this._cache = cache;
     }
 
@@ -58,7 +58,7 @@ export default class TagRepository {
             return this._cache.get(id);
         }
 
-        let request = this._server.createRequest()
+        let request = this._api.getRequest()
             .setPath('api/1.0/tag/show')
             .setData({id});
 
@@ -79,7 +79,7 @@ export default class TagRepository {
             return this._cache.getByType('tag');
         }
 
-        let request = this._server.createRequest()
+        let request = this._api.getRequest()
             .setPath('api/1.0/tag/list');
 
         let response = await request.send();
@@ -102,10 +102,10 @@ export default class TagRepository {
      */
     async _dataToModel(data) {
         if(data.cseType === 'CSEv1r1') {
-            data = await this._server.getCseV1Encryption().decrypt(data, 'tag');
+            data = await this._api.getCseV1Encryption().decrypt(data, 'tag');
         }
 
-        let tag = new Tag(this._server, data);
+        let tag = this._api.getClass('model.tag', this._api, data);
         this._cache.set(tag.getId(), tag, 'tag');
 
         return tag