Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0

2 files changed, 19 insertions, 1 deletions

diff --git a/src/api/UserApi.js b/src/api/UserApi.js
index edfb88988..8ba8cd1e9 100644
--- a/src/api/UserApi.js
+++ b/src/api/UserApi.js
@@ -25,6 +25,10 @@ export default class UserApi {
     return this.server.retrievePassword(email);
   }
 
+  activateTrial(data) {
+    return this.server.activateTrial(data);
+  }
+
   invite(data) {
     return this.server.inviteUser(data);
   }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index efac5ca19..293fcda26 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -76,6 +76,20 @@ export default class ServerApi {
     return u.token;
   }
 
+  async activateTrial(data) {
+    const request = await sendAuthRequest(`${API_URL}/payment/trial`, {
+      method: 'POST',
+      body: JSON.stringify(data),
+    });
+    if (!request.ok) {
+      throw request;
+    }
+    const trial = await request.json();
+
+    debug('ServerApi::signup resolves', trial);
+    return true;
+  }
+
   async inviteUser(data) {
     const request = await sendAuthRequest(`${apiBase()}/invite`, {
       method: 'POST',
@@ -468,7 +482,7 @@ export default class ServerApi {
         return services;
       }
     } catch (err) {
-      throw (new Error('ServerApi::getLegacyServices no config found'));
+      console.error('ServerApi::getLegacyServices no config found');
     }
 
     return [];