@nuskin/ns-shop 5.21.8 → 5.21.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.21.8",
+  "version": "5.21.10",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,11 +26,10 @@
     "@nuskin/ns-common-lib": "1.4.1",
     "@nuskin/ns-feature-flags": "1.4.2",
     "@nuskin/ns-loyalty-web": "1.5.5",
-    "@nuskin/ns-product-lib": "1.4.1",
+    "@nuskin/ns-product-lib": "2.0.1",
     "@nuskin/nuskinjquery": "2.3.1",
     "axios": "0.21.1",
     "decimal.js": "10.2.1",
-    "firebase": "9.9.4",
     "jp-conversion": "0.0.7",
     "lodash": "4.17.20"
   },
@@ -38,7 +37,7 @@
     "@nuskin/ns-account": "4.27.3",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "@nuskin/ns-product": "3.36.2",
-    "@nuskin/ns-util": "3.102.2",
+    "@nuskin/ns-util": "3.107.0",
     "axios-mock-adapter": "1.18.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/firebase/assessmentService.js

@@ -1,5 +1,5 @@
-import {FirebaseUtil, RunConfigService, ConfigService} from '@nuskin/ns-util';
 import {UserService} from '@nuskin/ns-account';
+import {ConfigService} from '@nuskin/ns-util';
 import axios from 'axios';
 
 
@@ -9,91 +9,20 @@ const headers = {
 }
 
 const AssessmentService = function() {
-
-    const NOT_LOGGED_IN = {notLoggedIn: true};
-    const FAILED_ASSESSMENT_ADD = {error: "Failed to add assessment"};
-    const FAILED_ASSESSMENT_DELETE = {error: "Failed to delete assessment"};
-
-    let user;
-    let fbLoggedIn = false;
-
     // ==================================
     // PUBLIC FUNCTIONS
     // ==================================
 
     return {
-        initialize,
-        initializeWithEid,
-        getAssessments,
-        getAssessmentsV2,
-        addAssessment,
-        deleteAssessment
+        getAssessmentsV2
     };
 
-    function initialize(username, password) {
-        FirebaseUtil.init(RunConfigService.getEnvironmentCode());
-        FirebaseUtil.getSignInToken(username, password)
-            .then(authorizeFireBase)
-            .catch(err => console.error(err));
-    }
-
-    function initializeWithEid() {
-        _refreshConfig();
-
-        return new Promise(function(resolve, reject) {
-            if (!fbLoggedIn) {
-                if (!user) {
-                    reject({error: true, reason: 'Not logged in'})
-                }
-
-                FirebaseUtil.init(RunConfigService.getEnvironmentCode());
-                FirebaseUtil.getSignInTokenWithEid(user.eid)
-                    .then((data) => {
-                        authorizeFireBase(data)
-                            .then((data) => {
-                                resolve(data);
-                            })
-                            .catch((data) => {
-                                reject(data);
-                            });
-                    })
-                    .catch(err => {
-                        reject({error: true, reason: err});
-                    });
-            } else {
-                resolve();
-            }
-        });
-    }
-
-    function authorizeFireBase(_data) {
-        let data = _data;
-
-        return new Promise(function(resolve, reject) {
-            let fb = FirebaseUtil.getFB(),
-                unsubscribe;
-
-            fb.auth().signInWithCustomToken(data.token)
-                .catch(err => {
-                    console.error(err);
-                    reject({error: true, reason: err})
-                });
-            unsubscribe = fb.auth().onAuthStateChanged((user) => {
-                if (user) {
-                    fbLoggedIn = true;
-                    unsubscribe();
-                    resolve(data);
-                }
-            });
-        });
-    }
-
     async function getAssessmentsV2(success, failure) {
         const URL = `${ConfigService.getMarketConfig(false, undefined, true).awsUrl}/ns-share-api/v1/connect/user/`;
         const res = {
             assessments: []
         };
-        _refreshConfig();
+        const user = UserService.getUser();
         if (!user) {
             failure({ noAssessments: true });
             return;
@@ -118,99 +47,6 @@ const AssessmentService = function() {
             }
         }
     }
-
-    function getAssessments(successCallback, failureCallback = () => {}) {
-        const result = {};
-        _refreshConfig();
-        if (user) {
-            FirebaseUtil.init(RunConfigService.getEnvironmentCode());
-            FirebaseUtil.getFB().database().ref('/agelocMe/' + user.id).once('value', function (snapshot) {
-                let data = snapshot.exportVal();
-                if (data) {
-                    result.assessments = Object.keys(data).map((key) => {
-                        data[key].id = key;
-                        return data[key];
-                    });
-                } else {
-                    result.assessments = [];
-                }
-                successCallback(result);
-            }, function () {
-                failureCallback({
-                    noAssessments: true
-                });
-            });
-        } else {
-            failureCallback({noAssessments: true});
-        }
-    }
-
-    function addAssessment(assessment, successCallback, failureCallback) {
-        _refreshConfig();
-        if (fbLoggedIn) {
-            _addAssessment(assessment, successCallback, failureCallback);
-        } else {
-            if (user) {
-                initializeWithEid()
-                    .then(() => {
-                        _addAssessment(assessment, successCallback, failureCallback);
-                    })
-                    .catch((result) => {
-                        console.error(result);
-                        failureCallback(FAILED_ASSESSMENT_ADD);
-                    });
-            } else {
-                failureCallback(NOT_LOGGED_IN);
-            }
-        }
-    }
-
-    function deleteAssessment(assessmentId, successCallback, failureCallback) {
-        _refreshConfig();
-        if (fbLoggedIn) {
-            _deleteAssessment(assessmentId, successCallback, failureCallback);
-        } else {
-            if (user) {
-                initializeWithEid()
-                    .then(() => {
-                        _deleteAssessment(assessmentId, successCallback, failureCallback);
-                    })
-                    .catch((result) => {
-                        console.error(result);
-                        failureCallback(FAILED_ASSESSMENT_DELETE);
-                    });
-            } else {
-                failureCallback(NOT_LOGGED_IN);
-            }
-        }
-    }
-
-    // ==================================
-    // PRIVATE FUNCTIONS
-    // ==================================
-
-    function _refreshConfig() {
-        user = UserService.getUser();
-    }
-
-    function _addAssessment(assessment, successCallback, failureCallback) {
-        _refreshConfig();
-        FirebaseUtil.getFB().database().ref('/agelocMe/' + user.id).push(assessment).then((result) => {
-            successCallback({fbKey: result.key});
-        }).catch(() => {
-            failureCallback(FAILED_ASSESSMENT_ADD);
-        });
-    }
-
-    function _deleteAssessment(assessmentId, successCallback, failureCallback) {
-        _refreshConfig();
-        FirebaseUtil.getFB().database().ref('/agelocMe/' + user.id + '/' + assessmentId).remove().then(() => {
-            successCallback();
-        }).catch((err) => {
-            console.error('Error deleting assessment.', err);
-            failureCallback(FAILED_ASSESSMENT_DELETE);
-        });
-    }
 }();
 
 export default AssessmentService;