@como/como-client 0.9.2 → 0.9.4

package/lib/services/auth.service.js

@@ -401,19 +401,19 @@ exports.logOut = function (service) {
     }));
 };
 
-exports.socialLogin = function (service) {
+exports.refreshToken = function (service) {
     return function () {
-        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(socialId, provider, idToken) {
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(uid, token, locationId, source) {
             var params, headers, _ref24, data;
 
             return _regenerator2.default.wrap(function _callee12$(_context12) {
                 while (1) {
                     switch (_context12.prev = _context12.next) {
                         case 0:
-                            params = { socialId: socialId, provider: provider, idToken: idToken };
+                            params = { uid: uid, refreshToken: token, locationId: locationId, source: source };
                             headers = getHashHeader(params);
                             _context12.next = 4;
-                            return service.post('/auth/v1/auth/socialLogin', params, { headers: headers });
+                            return service.post('/auth/v2/auth/refresh-token', params, { headers: headers });
 
                         case 4:
                             _ref24 = _context12.sent;
@@ -428,41 +428,8 @@ exports.socialLogin = function (service) {
             }, _callee12, undefined);
         }));
 
-        return function (_x39, _x40, _x41) {
+        return function (_x39, _x40, _x41, _x42) {
             return _ref23.apply(this, arguments);
         };
     }();
-};
-
-exports.refreshToken = function (service) {
-    return function () {
-        var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(uid, token, locationId, source) {
-            var params, headers, _ref26, data;
-
-            return _regenerator2.default.wrap(function _callee13$(_context13) {
-                while (1) {
-                    switch (_context13.prev = _context13.next) {
-                        case 0:
-                            params = { uid: uid, refreshToken: token, locationId: locationId, source: source };
-                            headers = getHashHeader(params);
-                            _context13.next = 4;
-                            return service.post('/auth/v2/auth/refresh-token', params, { headers: headers });
-
-                        case 4:
-                            _ref26 = _context13.sent;
-                            data = _ref26.data;
-                            return _context13.abrupt("return", data);
-
-                        case 7:
-                        case "end":
-                            return _context13.stop();
-                    }
-                }
-            }, _callee13, undefined);
-        }));
-
-        return function (_x42, _x43, _x44, _x45) {
-            return _ref25.apply(this, arguments);
-        };
-    }();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@como/como-client",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Client module for Como's loaylty API",
   "main": "src/como.js",
   "scripts": {

package/src/como.js

@@ -27,8 +27,7 @@ class Como {
         const { refresher, expiresIn } = this.comoData;
         if (!refresher) {
             console.log('No refresh for %o', this.comoData);
-        }
-        else if (expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment())) {
+        } else if (expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment())) {
             await refresher();
         }
     }
@@ -70,7 +69,9 @@ class Como {
      */
     async init(environment, credentials, refreshCallback, enableSignon = true) {
         const isExists = (x => !ramda.isNil(x) && !ramda.isEmpty(x));
-        const { id: environmentId, locationId, installationId, source, binaryVersion, phoenixVersion } = environment;
+        const {
+            id: environmentId, locationId, installationId, source, binaryVersion, phoenixVersion,
+        } = environment;
         if (!isExists(environmentId) || !isExists(locationId) || !isExists(installationId)) {
             throw new Error(`missing parameters: ${environment}`);
         }
@@ -105,18 +106,20 @@ class Como {
 
         const { accessToken, refreshToken, expiresIn } = credentials;
         let credExist = isExists(accessToken) && isExists(refreshToken);
-        let isExpired = credExist && expiresIn && moment(expiresIn).isBefore(moment());
+        const isExpired = credExist && expiresIn && moment(expiresIn).isBefore(moment());
         let refreshFailed = false;
         if (isExpired) {
             try {
-                const data = await this.comoData.initApi.refreshToken(installationId, refreshToken ? refreshToken : 'none', locationId, source);
+                const data = await this.comoData.initApi.refreshToken(installationId, refreshToken || 'none', locationId, source);
                 this.comoData.config = data.config;
                 console.log(`signOn with isExpired true result:${JSON.stringify(data)}`);
                 updateCredentials(data, true);
             } catch (e) {
                 console.error(`Failed to refresh token, installationId:${installationId}, refreshToken:${this.comoData.refreshToken}, locationId:${locationId}, source:${source}`);
-                //refresh failed - need to revoke and signOn again
-                initService.logError({ method: 'refreshToken', installationId, locationId, source, refreshToken, error: e.message });
+                // refresh failed - need to revoke and signOn again
+                initService.logError({
+                    method: 'refreshToken', installationId, locationId, source, refreshToken, error: e.message,
+                });
                 refreshFailed = true;
             }
         }
@@ -132,12 +135,13 @@ class Como {
                 } catch (e) {
                     console.error(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source},interval:${interval}, error:${e}`);
                     interval += 1000;
-                    initService.logError({ method: 'signOn no accessToken', accessToken, isExpired, refreshFailed, credExist, installationId, locationId, source, refreshToken, interval, error: e.message });
+                    initService.logError({
+                        method: 'signOn no accessToken', accessToken, isExpired, refreshFailed, credExist, installationId, locationId, source, refreshToken, interval, error: e.message,
+                    });
                     await new Promise(r => setTimeout(r, interval));
                 }
             }
-        }
-        else if (!isExpired) {
+        } else if (!isExpired) {
             let signOnSuccessfully = false;
             while (!signOnSuccessfully && interval < 3000) {
                 try {
@@ -146,7 +150,7 @@ class Como {
                     this.comoData.config = data.config;
                     console.log(`signOn with result " ${JSON.stringify(data)}`);
                     if (data && data.accessToken) {
-                        console.log(`signOn- updating credentials`);
+                        console.log('signOn- updating credentials');
                         updateCredentials(data, true);
                     }
                     if (data && data.config && data.config.recaptchaSiteKey) {
@@ -156,7 +160,9 @@ class Como {
                 } catch (e) {
                     console.error(`Failed signOn with accessToken, installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}, error:${e.message}`);
                     interval += 1000;
-                    initService.logError({ method: 'signOn with credentials', accessToken, isExpired, refreshFailed, credExist, installationId, locationId, source, refreshToken, interval, error: e.message });
+                    initService.logError({
+                        method: 'signOn with credentials', accessToken, isExpired, refreshFailed, credExist, installationId, locationId, source, refreshToken, interval, error: e.message,
+                    });
                     await new Promise(r => setTimeout(r, interval));
                 }
             }
@@ -385,39 +391,18 @@ class Como {
             return data;
         } catch (error) {
             if (error.response && error.response.data) {
-                const { code, message } = error.response.data;
-                throw new Error(code || message);
+                const { code, message, retryAfter } = error.response.data;
+                const loginError = new Error(code || message);
+                // When a request lands inside its OTP backoff the server states how long
+                // to wait. Only code and message used to survive this rethrow, which left
+                // the app inventing a countdown of its own.
+                if (typeof retryAfter === 'number') { loginError.retryAfter = retryAfter; }
+                throw loginError;
             }
             throw error;
         }
     }
 
-    /**
-     * Social login via Firebase SSO (Google/Facebook/Apple).
-     * @param {Object} params
-     * @param {string} params.socialId - Firebase user UID
-     * @param {string} params.provider - Social provider (google/facebook/apple)
-     * @param {string} params.idToken - Firebase ID token
-     * @returns {Promise<Object>} { success, accessToken, refreshToken, consent } or { success: false, userExists: false }
-     */
-    async socialLogin({ socialId, provider, idToken }) {
-        const { api } = this.comoData;
-        try {
-            const data = await api.socialLogin(socialId, provider, idToken);
-            return data;
-        } catch (error) {
-            if (error.response && error.response.data) {
-                const { code, message } = error.response.data;
-                throw new Error(code || message);
-            }
-            throw error;
-        }
-    }
-
-    async socialLoginCheck({ socialId, provider, idToken }) {
-        return this.socialLogin({ socialId, provider, idToken });
-    }
-
     /**
      *
      * @param {Object} identifier key-value identifiers
@@ -434,11 +419,14 @@ class Como {
             this.comoData.consent = consent;
         } catch (error) {
             if (error.response && error.response.data) {
-                const { code: errCode, message } = error.response.data;
-                if (message && message === 'Invalid verification Code') {
-                    throw new Error(message);
-                }
-                throw new Error(errCode || message);
+                const { code: errCode, message, retryAfter } = error.response.data;
+                // The wrong-code case keeps reporting the message rather than the code,
+                // since callers match on that string.
+                const verifyError = (message && message === 'Invalid verification Code')
+                    ? new Error(message)
+                    : new Error(errCode || message);
+                if (typeof retryAfter === 'number') { verifyError.retryAfter = retryAfter; }
+                throw verifyError;
             }
             throw error;
         }
@@ -482,10 +470,8 @@ class Como {
         } = this.comoData;
         try {
             return api.clientUpdateMembership(env.services_root, locationId, pushEnable, locationEnable);
-        }
-        catch (e) {
+        } catch (e) {
             console.log(`clientUpdateMembership failed, token:${token}, locationId:${locationId}, error: ${e}`);
-
         }
     }
 
@@ -508,7 +494,7 @@ class Como {
                 resource.id,
                 ('Namespace' in resource) ? resource.Namespace : `location_${this.comoData.locationId}`,
                 resource.Version,
-                this.comoData.locationId
+                this.comoData.locationId,
             );
 
             this.comoData.mainResources[resourceId] = responseJson;
@@ -863,7 +849,7 @@ class Como {
     getFriendReferralInviteLink(referral) {
         const { env_params: env, locationId } = this.comoData;
         const cpBaseUrl = env.cp_base_url.replace('{location_id}', locationId);
-        return `${cpBaseUrl}/auth/register?onboardingflow=register&ReferralCode=${referral}`;
+        return `${cpBaseUrl}/auth/signin?onboardingflow=register&ReferralCode=${referral}`;
     }
 
     /**
@@ -1072,7 +1058,7 @@ class Como {
      */
     async getPurchaseHistory(limit, offset) {
         const {
-            locationId, api, membership
+            locationId, api, membership,
         } = this.comoData;
         return api.getPurchaseHistory(locationId, membership.Key, limit, offset);
     }