Merge branch 'release/2.8.2'

web-pal · Oct 30, 2018 · b718410 · b718410
2 parents 048680c + 96b510b
commit b718410
Show file tree

Hide file tree

Showing 36 changed files with 650 additions and 323 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+<a name="2.8.2"></a>
+## [2.8.2](https://github.com/web-pal/chronos-timetracker/compare/v2.8.1...v2.8.2) (2018-10-30)
+Authentication bug fixes
+
+
+
 <a name="2.8.1"></a>
 ## [2.8.1](https://github.com/web-pal/chronos-timetracker/compare/v2.8.0...v2.8.1) (2018-10-28)
 

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Chronos",
   "productName": "Chronos",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Native app for time-tracking fully integrated with JIRA",
   "main": "./dist/main.prod.js",
   "author": {

diff --git a/app/renderer/actions/actionTypes/auth.js b/app/renderer/actions/actionTypes/auth.js
@@ -1,6 +1,7 @@
 // @flow
 
 export const AUTH_REQUEST = 'auth/AUTH_REQUEST';
+export const AUTH_SELF_HOST_REQUEST = 'auth/AUTH_SELF_HOST_REQUEST';
 export const LOGOUT_REQUEST = 'auth/LOGOUT_REQUEST';
 export const SWITCH_ACCOUNT = 'auth/SWITCH_ACCOUNT';
 export const ADD_AUTH_DEBUG_MESSAGE = 'auth/ADD_AUTH_DEBUG_MESSAGE';
diff --git a/app/renderer/actions/auth.js b/app/renderer/actions/auth.js
@@ -15,6 +15,14 @@ export const authRequest = (payload: {|
   payload,
 });
 
+export const authSelfHostRequest = (payload: {|
+  username: string,
+  password: string,
+|}): AuthAction => ({
+  type: actionTypes.AUTH_SELF_HOST_REQUEST,
+  payload,
+});
+
 export const logoutRequest = (payload: {
   dontForget: boolean
 } = { dontForget: false }): AuthAction => ({

diff --git a/app/renderer/api/profile.js b/app/renderer/api/profile.js
@@ -1,4 +1,7 @@
 // @flow
+import {
+  remote,
+} from 'electron';
 import config from 'config';
 import jira from 'utils/jiraClient';
 import {
@@ -190,3 +193,56 @@ export function getPermissions(
 ): Promise<*> {
   return jira.client.myPermissions.getMyPermissions(opts);
 }
+
+export function getAuthCookies(
+  payload: {
+    username: string,
+    password: string,
+    baseUrl: string,
+  },
+): Promise<*> {
+  const { username, password, baseUrl } = payload;
+  const url: string = `${baseUrl}/rest/auth/1/session`;
+  const request = remote.net.request({
+    url,
+    method: 'POST',
+  });
+  return new Promise((resolve, reject) => {
+    request.on('response', (response) => {
+      const status = response.statusCode;
+      response.on('data', (chunk) => {
+        try {
+          const json = JSON.parse(chunk);
+          if (status === 200) {
+            resolve(json);
+          } else {
+            reject(json);
+          }
+        } catch (e) {
+          reject(e);
+        }
+      });
+      response.on('error', (error) => {
+        reject(error);
+      });
+    });
+    request.on('error', (error) => {
+      reject(error);
+    });
+    request.setHeader(
+      'User-agent',
+      'request',
+    );
+    request.setHeader(
+      'Content-Type',
+      'application/json',
+    );
+    request.write(
+      JSON.stringify({
+        username,
+        password,
+      }),
+    );
+    request.end();
+  });
+}
diff --git a/app/renderer/authPreload.js b/app/renderer/authPreload.js
@@ -14,14 +14,14 @@ function hideNode(el, scope) {
   }
 }
 
-function back() {
+function back(error = null) {
   store.dispatch(
     uiActions.setUiState('authFormStep', 1, 'allRenderer'),
   );
   store.dispatch(
     uiActions.setUiState('authFormIsComplete', false, 'allRenderer'),
   );
-  store.dispatch(uiActions.setUiState('authError', null));
+  store.dispatch(uiActions.setUiState('authError', error, 'allRenderer'));
 }
 
 function initAtlassian(base, reset) {
@@ -59,35 +59,16 @@ function initGoogle(base) {
     ev.preventDefault();
     back();
   });
-}
-
-function initSelfHost(base) {
-  hideNode('#header', base);
-  hideNode('#footer', base);
-  hideNode('#login-form .checkbox', base);
-  document.body.style.minWidth = 'auto';
-  document.body.style.width = 'auto';
-  const panel = base.querySelector('.aui-page-panel');
-  if (panel) {
-    panel.style.marginTop = '35px';
-    panel.style.maxWidth = '345px';
-
-    const a = document.createElement('a');
-    a.innerHTML = 'Back to Jira';
-    panel.appendChild(a);
-    a.addEventListener('click', (ev) => {
-      ev.preventDefault();
-      back();
-    });
-  }
-
   store.dispatch(
     uiActions.setUiState('authFormIsComplete', true, 'allRenderer'),
   );
 }
 
 function init() {
-  if (global.location.host === 'id.atlassian.com') {
+  store.dispatch(
+    uiActions.setUiState('authFormIsComplete', false, 'allRenderer'),
+  );
+  if (global.location.host === 'id.atlassian.com' && global.location.pathname === '/login') {
     const base = document.getElementById('root');
     const reset = document.getElementById('resetPassword');
     if (base && reset) {
@@ -102,14 +83,10 @@ function init() {
     } else {
       setTimeout(init, 500);
     }
-  } else if (global.location.pathname.endsWith('/login.jsp')
-    || global.location.pathname.endsWith('/secure/ForgotLoginDetails.jspa')) {
-    const base = document.getElementById('page');
-    if (base) {
-      initSelfHost(base);
-    } else {
-      setTimeout(init, 500);
-    }
+  } else if (global.location.pathname === '/login') {
+    back('Something has gone wrong');
+  } else {
+    setTimeout(init, 500);
   }
 }
 

diff --git a/app/renderer/components/ReduxFormComponents/Input.jsx b/app/renderer/components/ReduxFormComponents/Input.jsx
@@ -1,12 +1,17 @@
 // @flow
-import React, { Component } from 'react';
+import React, {
+  Component,
+} from 'react';
+
 
 import type {
   FieldProps,
 } from 'redux-form';
 
 import {
+  FormGroup,
   StyledInput,
+  Error,
 } from './styled';
 
 type Props = {
@@ -15,27 +20,30 @@ type Props = {
   placeholder: string,
 } & FieldProps;
 
-
 class Input extends Component<Props> {
   input = null;
 
   render() {
     const {
+      meta,
       input,
       autoFocus,
       type,
       placeholder,
     } = this.props;
     return (
-      <StyledInput
-        {...input}
-        innerRef={(el) => {
-          this.input = el;
-        }}
-        type={type}
-        autoFocus={autoFocus}
-        placeholder={placeholder}
-      />
+      <FormGroup>
+        <StyledInput
+          {...input}
+          innerRef={(el) => {
+            this.input = el;
+          }}
+          type={type}
+          autoFocus={autoFocus}
+          placeholder={placeholder}
+        />
+        {meta.touched && meta.error && <Error>{meta.error}</Error>}
+      </FormGroup>
     );
   }
 }

diff --git a/app/renderer/components/ReduxFormComponents/UnderlineInput.jsx b/app/renderer/components/ReduxFormComponents/UnderlineInput.jsx
@@ -1,12 +1,16 @@
 // @flow
-import React, { Component } from 'react';
+import React, {
+  Component,
+} from 'react';
 
 import type {
   FieldProps,
 } from 'redux-form';
 
 import {
+  FormGroup,
   UnderlineStyledInput,
+  Error,
 } from './styled';
 
 type Props = {
@@ -15,27 +19,30 @@ type Props = {
   placeholder: string,
 } & FieldProps;
 
-
 class UnderlineInput extends Component<Props> {
   input = null;
 
   render() {
     const {
+      meta,
       input,
       autoFocus,
       type,
       placeholder,
     } = this.props;
     return (
-      <UnderlineStyledInput
-        {...input}
-        innerRef={(el) => {
-          this.input = el;
-        }}
-        type={type}
-        autoFocus={autoFocus}
-        placeholder={placeholder}
-      />
+      <FormGroup>
+        <UnderlineStyledInput
+          {...input}
+          innerRef={(el) => {
+            this.input = el;
+          }}
+          type={type}
+          autoFocus={autoFocus}
+          placeholder={placeholder}
+        />
+        {meta.touched && meta.error && <Error>{meta.error}</Error>}
+      </FormGroup>
     );
   }
 }

diff --git a/app/renderer/components/ReduxFormComponents/styled/index.jsx b/app/renderer/components/ReduxFormComponents/styled/index.jsx
@@ -1,47 +1,39 @@
 import styled from 'styled-components';
 
-
-export const UnderlineStyledInput = styled.input`
+const baseInput = styled.input`
   width: calc(100% - 10px);
   height: 40px;
   min-height: 40px;
+
+  color: #091E42;
   font-size: 14px;
   letter-spacing: 0;
-  color: #091E42;
+
+  &::-webkit-input-placeholder {
+    font-size: 14px;
+  }
+`;
+
+
+export const UnderlineStyledInput = styled(baseInput)`
   background: white;
   border: 0px;
   border-bottom: 2px solid #0052cc;
   border-radius: 0px;
   padding: 0px;
-  font-size: 14px;
   font-weight: 500;
-  margin-bottom: 40px;
-  &::-webkit-input-placeholder {
-    font-size: 14px;
-  }
+
   &:focus {
     border-color: hsla(216, 49%, 43%, 1);
   }
 `;
 
-export const StyledInput = styled.input`
-  width: calc(100% - 10px);
-  height: 40px;
-  min-height: 40px;
+export const StyledInput = styled(baseInput)`
   padding-left: 10px;
-  margin-bottom: 10px;
-
-  font-size: 14px;
-  letter-spacing: 0;
 
   background-color: #FAFBFC;
   border: 1px solid #F4F5F7;
   border-radius: 5px;
-  color: #091E42;
-
-  &::-webkit-input-placeholder {
-    font-size: 14px;
-  }
   &:hover {
     background-color: #F4F5F7;
     border-color: #F4F5F7;
@@ -55,3 +47,15 @@ export const StyledInput = styled.input`
     background: white;
   }
 `;
+
+export const FormGroup = styled.div`
+  width: 100%;
+  margin-bottom: 10px;
+`;
+
+export const Error = styled.div`
+  color: #DE350B;
+  align-self: left;
+  font-size: 12px;
+  margin-top: 5px;
+`;