General Bug Fixes/Additons

frontend/lib/_electron/captchaWindowManager.js

@@ -61,8 +61,8 @@ class CaptchaWindowManager {
   /**
    * Check harvested captcha tokens to see if they're expired or not
    */
-  static checkTokens() {
-    if (this._tokens.length > 0) {
+  checkTokens() {
+    if (this._tokens && this._tokens.length > 0) {
       this._tokens.forEach((token) => {
         token.setTimestamp(110 - moment().diff(moment(token.timestamp, 'seconds')));
         if (this.isTokenExpired(token)) {
@@ -72,6 +72,7 @@ class CaptchaWindowManager {
     } else {
       // don't run the interval check if no tokens are present
       clearInterval(this._checkTokens);
+      this._checkTokens = null;
     }
   }
 
@@ -159,6 +160,9 @@ class CaptchaWindowManager {
 
   _onRequestHarvestToken(ev, token, host, sitekey) {
     this._tokens.push(new Token(token, moment(), host, sitekey));
+    if (this._checkTokens === null) {
+      this._checkTokens = setInterval(this.checkTokens, 1000);
+    }
   }
 
   /**

frontend/lib/_electron/windowManager.js

@@ -196,6 +196,8 @@ class WindowManager {
       } else if (this._captchas.size > 0) {
         this._captchas.forEach((captchaWindowManager) => {
           if (win.id === captchaWindowManager._captchaWindow.id) {
+            // deregister the interval from the captcha window
+            WindowManager.handleCloseCaptcha(this._captchas.get(win.id));
             this._captchas.delete(win.id);
           } else if (win.id === captchaWindowManager._youtubeWindow.id) {
             captchaWindowManager._youtubeWindow = null;
@@ -205,6 +207,12 @@ class WindowManager {
     };
   }
 
+  static handleCloseCaptcha(win) {
+    win._tokens = [];
+    clearInterval(win._checkTokens);
+    win._checkTokens = null;
+  }
+
   /**
    * Function to handle the transition between main -> auth window
    */

frontend/lib/common/classes/tokenContainer.js

@@ -0,0 +1,9 @@
+class TokenContainer {
+  constructor(token, timestamp, host, sitekey) {
+    this._token = token;
+    this._timestamp = timestamp;
+    this._host = host;
+    this._sitekey = sitekey;
+  }
+}
+module.exports = TokenContainer;

frontend/src/__tests__/constants/getAllSizes.test.jsx

@@ -143,10 +143,7 @@ describe('getAllSizes', () => {
   });
 
   it('should return correct category', () => {
-    expect(getCategory('Clothing')).toEqual(expectedSizes[0]);
-    expect(getCategory('US Men\'s')).toEqual(expectedSizes[1]);
-    expect(getCategory('UK Men\'s')).toEqual(expectedSizes[2]);
-    expect(getCategory('EU Men\'s')).toEqual(expectedSizes[3]);
+    expectedSizes.forEach(category => expect(getCategory(category.label)).toEqual(category));
   });
 
   it('should lookup the correct sizes', () => {

frontend/src/__tests__/navbar/navbar.test.jsx

@@ -50,8 +50,8 @@ describe('<Navbar />', () => {
     delete global.window.Bridge;
   });
 
-  describe('when window Bridge is defined', () => {
-    it('should return name and version correctly', () => {
+  describe('should render name and version correctly', () => {
+    test('when window Bridge is defined', () => {
       Bridge = {
         getAppData: jest.fn(() => ({ name: 'Nebula Orion', version: '1.0.0' })),
       };
@@ -63,10 +63,7 @@ describe('<Navbar />', () => {
       expect(appName).toEqual('Nebula Orion');
       expect(version).toEqual('1.0.0');
     });
-  });
-
-  describe('when window Bridge is undefined', () => {
-    it('should return name and version correctly', () => {
+    test('when window Bridge is undefined', () => {
       const wrapper = renderShallowWithProps();
       const appName = wrapper.find('.appName').text();
       const version = wrapper.find('.appVersion').text();

frontend/src/__tests__/server/createProxies.test.jsx

@@ -45,7 +45,7 @@ describe('<CreateProxies />', () => {
     const destroyButton = getByTestId(wrapper, 'CreateProxies.destroyProxiesButton');
     const generateButton = getByTestId(wrapper, 'CreateProxies.generateProxiesButton');
     expect(numProxiesInput).toHaveLength(1);
-    expect(numProxiesInput.prop('value')).toBe('');
+    expect(numProxiesInput.prop('value')).toBe(0);
     expect(locationSelect).toHaveLength(1);
     expect(locationSelect.prop('value')).toBe(null);
     expect(usernameInput).toHaveLength(1);

frontend/src/__tests__/state/reducers/server/serverListReducer.test.js

@@ -9,31 +9,27 @@ describe('server list reducer', () => {
     expect(actual).toEqual(initialServerStates.serverList);
   });
 
-  it.skip('should handle connect action', () => {
-    const newServerInfo = {
-      id: 2,
+  it('should handle connect action', () => {
+    const initial = [{
+      id: 1,
       type: { id: 1, value: 'test_type', label: 'test_type_label' },
       size: { id: 1, value: 'test_size', label: 'test_size_label' },
       location: { id: 1, value: 'test_loc', label: 'test_loc_label' },
-      charges: 0,
+      charges: '0',
       status: 'Initializing...',
-    };
+    }];
 
-    const expected = {
-      servers: [
-        newServerInfo,
-      ],
-      coreServer: {
-        type: { id: 1, value: 'test_type', label: 'test_type_label' },
-        size: { id: 1, value: 'test_size', label: 'test_size_label' },
-        location: { id: 1, value: 'test_loc', label: 'test_loc_label' },
-        errors: {},
-      },
-      path: 'testing...',
-    };
+    const expected = [{
+      id: 1,
+      type: { id: 1, value: 'test_type', label: 'test_type_label' },
+      size: { id: 1, value: 'test_size', label: 'test_size_label' },
+      location: { id: 1, value: 'test_loc', label: 'test_loc_label' },
+      charges: '0',
+      status: 'Connected',
+    }];
     const actual = serverListReducer(
-      initialServerStates.serverList,
-      { type: SERVER_ACTIONS.CONNECT, serverInfo: expected },
+      initial,
+      { type: SERVER_ACTIONS.CONNECT, action: null },
     );
     expect(actual).toEqual(expected);
   });

frontend/src/server/createProxies.jsx

@@ -30,7 +30,7 @@ export class CreateProxiesPrimitive extends Component {
               <div className="col col--no-gutter">
                 <p className="proxy-options__label">Number</p>
                 <NumberFormat
-                  value={serverInfo.proxyOptions.numProxies || ''}
+                  value={serverInfo.proxyOptions.numProxies}
                   format="##"
                   placeholder="00"
                   className="proxy-options__input proxy-options__input--bordered proxy-options__input--number"

frontend/src/settings/settings.jsx

@@ -33,6 +33,7 @@ export class SettingsPrimitive extends Component {
     if (window.Bridge) {
       window.Bridge.closeAllCaptchaWindows();
     } else {
+      // TODO - error handling
       console.error('Unable to close all windows');
     }
   }

frontend/src/state/reducers/server/serverReducer.js

@@ -24,7 +24,7 @@ export function serverReducer(state = initialServerStates.serverInfo, action) {
         };
         break;
       case SERVER_FIELDS.EDIT_PROXY_NUMBER:
-        const intValue = parseInt(action.value, 10);
+        const intValue = action.value === '' ? 0 : parseInt(action.value, 10);
         change = {
           numProxies: Number.isNaN(intValue) ?
             initialServerStates.proxyOptions.numProxies :
@@ -89,7 +89,7 @@ export function serverListReducer(state = initialServerStates.serverList, action
   switch (action.type) {
     case SERVER_ACTIONS.CONNECT:
       const server = nextState.find(s => s.id);
-      server.status = 'connected';
+      server.status = 'Connected';
       break;
     case SERVER_ACTIONS.CREATE:
       // perform a deep copy of given profile

frontend/src/state/reducers/tasks/taskListReducer.js

@@ -94,7 +94,6 @@ export default function taskListReducer(state = initialTaskStates.list, action)
       // Check if current task has been setup properly
       if (updateTask.edits) {
         // Set it up properly
-        console.log(updateTask.edits.product, updateTask.product);
         updateTask.profile = updateTask.edits.profile || updateTask.profile;
         updateTask.product = updateTask.edits.product || updateTask.product;
         updateTask.site = updateTask.edits.site || updateTask.site;

frontend/src/state/reducers/tasks/taskReducer.js

@@ -96,25 +96,38 @@ export function taskReducer(state = initialTaskStates.task, action) {
       // If we are editing an existing task, only perform the change on valid edit fields
       switch (action.field) {
         case TASK_FIELDS.EDIT_PRODUCT: {
-          if (action.value) {
-            change = {
-              edits: {
-                ...state.edits,
-                errors: Object.assign({}, state.edits.errors, action.errors),
-                product: {
-                  raw: action.value,
-                },
-              },
-            };
-          } else {
-            change = {
-              edits: {
-                ...state.edits,
-                errors: Object.assign({}, state.edits.errors, action.errors),
-                product: initialTaskStates.edit.product,
+          change = {
+            ...state.edits,
+            edits: {
+              errors: Object.assign({}, state.edits.errors, action.errors),
+              product: {
+                raw: action.value,
               },
-            };
+            },
+          };
+          if (!action.value || !action.value.startsWith('http')) {
+            break;
+          }
+          const URL = parseURL(action.value);
+          if (!URL || !URL.path) {
+            break;
+          }
+          const site = getAllSites().filter(s => s.value.split('/')[2] === URL.host);
+          if (site.length === 0) {
+            break;
           }
+          change = {
+            ...change,
+            edits: {
+              ...change.edits,
+              site: {
+                url: site[0].value,
+                name: site[0].label,
+              },
+              username: null,
+              password: null,
+            },
+          };
           break;
         }
         case TASK_FIELDS.EDIT_SITE: {

frontend/src/utils/definitions/server/proxyOptions.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 
 export const initialProxyOptionsState = {
-  numProxies: '',
+  numProxies: 0,
   location: null,
   username: '',
   password: '',