BuiltonDev · NicolasBonduel · Jan 27, 2020 · Feb 12, 2020 · Feb 12, 2020 · Feb 12, 2020
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,5 +6,8 @@
     "rules": {
         "no-underscore-dangle": "off",
         "consistent-return": "off"
+    },
+    "globals": {
+        "File": true
     }
 }
diff --git a/dist/main.bundle.js b/dist/main.bundle.js
diff --git a/examples/stripe-firebase-full-order/index.html b/examples/stripe-firebase-full-order/index.html
@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>Builton SDK & Firebase example</title>
+    <style type="text/css">
+        .contentContainer {
+            display: flex;
+        }
+
+        #apiResponse {
+            background-color: #f1f1f1;
+            ;
+            min-height: 100px;
+            width: 100%;
+            overflow: scroll;
+            margin: 0 10px 0 10px;
+            padding: 10px;
+        }
+
+        #actionContainer {
+            background-color: #fcfcfc;
+            min-height: 100px;
+            width: 100%;
+            margin: 0 10px 0 10px;
+            padding: 10px;
+        }
+
+        #stepButton {
+            float: right;
+        }
+
+        #cardDetails {
+            background-color: lightsteelblue;
+            margin: 100px;
+            padding: 50px;
+        }
+
+        #cardElement {
+            margin-top: 20px
+        }
+
+        #cardButton {
+            margin: 20px 0 20px 20px;
+            float: right;
+        }
+
+        button {
+            margin: 10px;
+        }
+    </style>
+    <script src="https://js.stripe.com/v3/"></script>
+    <!-- <script src="https://unpkg.com/@builton/core-sdk@4/dist/main.bundle.js"></script> -->
+    <script src="../../dist/main.bundle.js"></script>
+    <script src="https://www.gstatic.com/firebasejs/6.6.2/firebase-app.js"></script>
+    <script src="https://www.gstatic.com/firebasejs/6.6.2/firebase-auth.js"></script>
+</head>
+
+<body>
+    <div class="contentContainer">
+        <div id="actionContainer">
+            <button id="stepButton" onclick="stateMachine()"></button>
+            <div id="steps"></div>
+            <div id="cardDetails">
+                <div>Please use a <a href="https://stripe.com/docs/testing#cards">Stripe test card</a></div>
+                <div id="cardElement"></div>
+                <button id="cardButton">send card</button>
+            </div>
+        </div>
+        <pre id="apiResponse"></pre>
+    </div>
+    <script>
+        const conf = {
+            stripe: {
+                pk: 'pk_test_fa7Dxe5u3x2dn6DoZNROpKJO00E0earGo8'
+            },
+            firebase: {
+                apiKey: "AIzaSyC3aEQEFUzZjao3XTYfm1yqDXLC-uOcy0Y",
+                authDomain: "builton-demo.firebaseapp.com",
+            },
+            builton: {
+                apiKey: 'YEX5tfHumpzhlp0UUGJdrkLztQf75ajj9_-T4IesGbxOPootfnMWKf82a9sGyjpDeKtjZU5chmKHKVW9Duc4Gw=='
+            }
+        }
+        const stripe = Stripe(conf.stripe.pk);
+        let elements = stripe.elements();
+        let cardElement = elements.create('card');
+        cardElement.mount('#cardElement');
+        document.getElementById('cardDetails').style.visibility = "hidden";
+
+        let builton = new Builton({
+            apiKey: conf.builton.apiKey
+        });
+
+        const stripeProvider = new builton.paymentMethods.StripePaymentProvider(
+            stripe, cardElement
+        );
+        // Initialize Firebase
+        firebase.initializeApp(conf.firebase);
+
+        let userRef = null;
+        let productsRef = null;
+        let paymentMethodRef = null;
+        let orderRef = null;
+
+        const events = {
+            listProducts: () => {
+                return builton.products.get({ urlParams: { type: 'main' } }).then((productPage) => {
+                    productsRef = productPage.current;
+                    return productPage.current;
+                });
+            },
+            authenticate: () => {
+                return firebase.auth().signInAnonymously()
+                    .then((authResult) => {
+                        addSubStep('Firebase Authentication', true);
+                        return authResult.user.getIdToken()
+                            .then((bearerToken) => {
+                                addSubStep('Got bearerToken', true);
+                                return builton.authenticate({
+                                    bearerToken,
+                                    refreshTokenFn: async () => {
+                                        return await authResult.user.getIdToken();
+                                    }
+                                });
+                            })
+                    })
+                    .then((user) => {
+                        addSubStep('BuiltOn Authentication', true);
+                        userRef = user;
+                        return user;
+                    });
+            },
+            addAddress: () => {
+                return userRef.update({
+                    addresses: [{ "street_name": "Nadderudåsen 30", "city": "Bekkestua", "zip_code": "1357", "country": "Norway" }]
+                }).then((updatedUser) => {
+                    userRef = updatedUser;
+                    return updatedUser;
+                });
+            },
+            addPaymentMethod: () => {
+                document.getElementById('cardDetails').style.visibility = "visible";
+                let cardButton = document.getElementById('cardButton');
+                return new Promise((resolve, reject) => {
+                    cardButton.addEventListener('click', (ev) => {
+                        builton.paymentMethods.createWithProvider(stripeProvider).then(paymentMethod => {
+                            paymentMethodRef = paymentMethod;
+                            document.getElementById('cardDetails').style.visibility = "hidden";
+                            resolve(paymentMethod);
+                        }).catch(err => reject(err));
+                    });
+                });
+            },
+            createOrder: () => {
+                return builton.orders.create({
+                    items: [{
+                        product: productsRef[0].id,
+                        quantity: '1',
+                    }],
+                    delivery_address: { "street_name": "Slottsplassen 1", "city": "Oslo", "zip_code": "0010", "country": "Norway" },
+                }).then((order) => {
+                    orderRef = order;
+                    return order;
+                });
+            },
+            payForOrder: () => {
+                return builton.payments.createWithProvider(
+                    stripeProvider,
+                    {
+                        orders: [orderRef.id],
+                        payment_method: paymentMethodRef.id
+                    }
+                ).then(payments => {
+                    for (let payment of payments) {
+                        if (payment.error) {
+                            return Promise.reject(payments);
+                        }
+                    }
+                    return payments;
+                });
+            }
+        }
+
+        const camelCaseToWords = (str) => {
+            return str.match(/^[a-z]+|[A-Z][a-z]*/g).map((x) => {
+                return x[0].toUpperCase() + x.substr(1).toLowerCase();
+            }).join(' ');
+        };
+
+        const steps = Object.keys(events);
+        let currentStep = 0;
+        const stepButton = document.getElementById("stepButton");
+        stepButton.innerHTML = camelCaseToWords(steps[currentStep]);
+        const stateMachine = () => {
+            stepButton.disabled = true;
+            document.getElementById('apiResponse').innerHTML = '';
+            events[steps[currentStep]]().then((response) => {
+                displayResponse(response);
+                addStep(steps[currentStep], response ? true : false);
+                currentStep += 1;
+                if (currentStep < steps.length) {
+                    stepButton.innerHTML = camelCaseToWords(steps[currentStep]);
+                    stepButton.disabled = false;
+                } else {
+                    stepButton.innerHTML = 'Done!';
+                }
+            }).catch((error) => {
+                displayResponse(error);
+                addStep(steps[currentStep], false);
+            });
+        }
+
+        const displayResponse = (response) => {
+            console.log(response);
+            document.getElementById('apiResponse').innerHTML = JSON.stringify(response, null, 2);
+        }
+
+        const addStep = (step, success) => {
+            console.info(step);
+            const div = document.createElement('div');
+            div.innerHTML = `${success ? '✅' : '❌'} ${camelCaseToWords(step)}`;
+            document.getElementById('steps').appendChild(div);
+        }
+
+        const addSubStep = (step, success) => {
+            console.info(step);
+            const div = document.createElement('div');
+            div.innerHTML = `&#09;┌ ${success ? '✅' : '❌'} ${step}`;
+            document.getElementById('steps').appendChild(div);
+        }
+    </script>
+</body>
+
+</html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builton/core-sdk",
-  "version": "4.1.5",
+  "version": "4.2.2",
   "description": "Builton JavaScript SDK.",
   "main": "src/main.js",
   "scripts": {
@@ -48,7 +48,6 @@
     "webpack-cli": "3.3.7"
   },
   "dependencies": {
-    "form-data": "^2.5.1",
     "jwt-decode": "^2.2.0",
     "store2": "^2.9.0",
     "superagent": "^5.1.0"

diff --git a/src/collection/resources/_methods.js b/src/collection/resources/_methods.js
@@ -1,12 +1,12 @@
 module.exports = (ObjectClass) => ({
   getAll({
-    page, size, urlParams, json = false,
+    page, size, urlParams, tags, json = false,
   } = {}, done) {
     return this.paginate({
       page,
       size,
       type: 'get',
-      urlParams,
+      urlParams: { ...urlParams, ...(tags && { tags: tags.toString() }) },
       json,
     }, done);
   },
@@ -44,10 +44,10 @@ module.exports = (ObjectClass) => ({
   },
 
   search(query, {
-    page = 0, size = 100, urlParams, json = false,
+    page = 0, size = 100, tags, urlParams, json = false,
   } = {}, done) {
     return this.paginate({
-      page, size, type: 'get', action: 'search', urlParams: { ...urlParams, query }, json,
+      page, size, type: 'get', action: 'search', urlParams: { ...urlParams, query, ...(tags && { tags: tags.toString() }) }, json,
     }, done);
   },
 

diff --git a/src/collection/resources/images.js b/src/collection/resources/images.js
@@ -1,6 +1,6 @@
-const FormData = require('form-data');
 const Components = require('./_resources');
 const Image = require('../objects/image');
+const Error = require('../../utils/error');
 
 class Images extends Components {
   constructor(request) {
@@ -10,21 +10,25 @@ class Images extends Components {
     this.ResConstructor = Image;
   }
 
-  create(imageData, { isPublic, urlParams } = {}, done) {
-    let form = new FormData();
-    form.append('image', imageData);
-    if (isPublic !== undefined) {
-      form.append('public', isPublic);
-    }
-    // eslint-disable-next-line eqeqeq, no-restricted-globals
-    if (typeof self != 'object') { // if polyfill is used, (https://github.com/form-data/form-data/blob/master/lib/browser.js)
-      form = JSON.stringify(form); // We stringify as superagent will not do it.
+  create(data, { isPublic, urlParams } = {}, done) {
+    const imageName = data.filename || data.name || `image-${Date.now()}`;
+
+    if ((!Buffer && typeof File === 'undefined')
+      || (typeof data !== 'object')
+      || (!Buffer.isBuffer(data.buffer) && !(data instanceof File))
+    ) {
+      return Promise.reject(new Error.ImageUpload());
     }
+
     return this.query({
       type: 'post',
-      body: form,
+      body: {
+        isFile: true,
+        data: data.buffer || data,
+        filename: imageName,
+        isPublic,
+      },
       urlParams,
-      isJsonBody: false,
     }, done);
   }
 }