Merge branch 'feature/multiple-accounts' into feature/new-feature-pre…

…sentation

app/actions/actionTypes/auth.js

@@ -5,3 +5,4 @@ export const LOGIN_OAUTH_REQUEST = 'auth/LOGIN_OAUTH_REQUEST';
 export const LOGOUT_REQUEST = 'auth/LOGOUT_REQUEST';
 export const ACCEPT_OAUTH = 'auth/ACCEPT_OAUTH';
 export const DENY_OAUTH = 'auth/DENY_OAUTH';
+export const SWITCH_ACCOUNT = 'auth/SWITCH_ACCOUNT';

app/actions/auth.js

@@ -20,8 +20,11 @@ export const loginOAuthRequest = (host: string): AuthAction => ({
   host,
 });
 
-export const logoutRequest = (): AuthAction => ({
+export const logoutRequest = (payload: {
+  dontForget: boolean
+} = { dontForget: false }): AuthAction => ({
   type: actionTypes.LOGOUT_REQUEST,
+  payload,
 });
 
 export const acceptOAuth = (code: string): AuthAction => ({
@@ -32,3 +35,11 @@ export const acceptOAuth = (code: string): AuthAction => ({
 export const denyOAuth = (): AuthAction => ({
   type: actionTypes.DENY_OAUTH,
 });
+
+export const switchAccount = (payload: {|
+    host: string,
+    username: string,
+|}) => ({
+  type: actionTypes.SWITCH_ACCOUNT,
+  payload,
+});

app/containers/Header/Header.jsx

@@ -17,11 +17,13 @@ import type {
 import type {
   Connector,
 } from 'react-redux';
+import Tag from '@atlaskit/tag';
 import type {
   User,
   Dispatch,
 } from 'types';
 
+import Lozenge from '@atlaskit/lozenge';
 
 import DropdownMenu, {
   DropdownItemGroup,
@@ -43,6 +45,10 @@ import {
   refreshWhite,
 } from 'data/svg';
 import config from 'config';
+import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
+import EditorAddIcon from '@atlaskit/icon/glyph/editor/add';
+
+import { transformValidHost } from '../../sagas/auth';
 
 import {
   HeaderContainer,
@@ -63,6 +69,10 @@ import {
 
 type Props = {
   userData: User,
+  accounts: Array<{|
+    host: string,
+    username: string,
+  |}>,
   host: string,
   updateAvailable: string,
   updateFetching: boolean,
@@ -72,6 +82,7 @@ type Props = {
 
 const Header: StatelessFunctionalComponent<Props> = ({
   userData,
+  accounts,
   host,
   updateAvailable,
   updateFetching,
@@ -88,9 +99,40 @@ const Header: StatelessFunctionalComponent<Props> = ({
         <ProfileName>
           {userData.displayName}
         </ProfileName>
-        <ProfileTeam>
-          {host}
-        </ProfileTeam>
+        <DropdownMenu
+          triggerType="default"
+          position="right top"
+          trigger={
+            <ProfileTeam>
+              {host} <ChevronDownIcon />
+            </ProfileTeam>
+          }
+        >
+          {accounts.map((ac) => {
+            const isActive = transformValidHost(ac.host).host === host &&
+              (ac.username === userData.emailAddress ||
+                ac.username === userData.key ||
+                ac.username === userData.name);
+            return (
+              <DropdownItem
+                key={`${ac.host}:${ac.username}`}
+                onClick={() => dispatch(authActions.switchAccount(ac))}
+                isDisabled={isActive}
+                elemAfter={isActive && <Lozenge appearance="success">Active</Lozenge>}
+              >
+                <Tag text={ac.host} color="teal" />
+                {ac.username}
+              </DropdownItem>
+            );
+          })}
+          <DropdownItem
+            onClick={() => dispatch(authActions.logoutRequest({ dontForget: true }))}
+          >
+            <span style={{ display: 'inline-flex', alignItems: 'center' }}>
+              <EditorAddIcon /> Add account
+            </span>
+          </DropdownItem>
+        </DropdownMenu>
       </ProfileInfo>
     </ProfileContainer>
 
@@ -168,6 +210,7 @@ function mapStateToProps(state) {
   return {
     userData: getUserData(state),
     host: getUiState('host')(state),
+    accounts: getUiState('accounts')(state),
     updateAvailable: getUiState('updateAvailable')(state),
     updateFetching: getUiState('updateFetching')(state),
     issuesFetching: getResourceStatus(

app/containers/Header/styled/index.jsx

@@ -25,8 +25,11 @@ export const ProfileName = styled.span`
   font-size: 16px;
 `;
 
-export const ProfileTeam = styled.span`
-  // cursor: pointer;
+export const ProfileTeam = styled.div`
+  display: flex;
+  line-height: 24px;
+  aling-items: flex-center;
+  cursor: pointer;
 `;
 
 export const DropdownSeparator = styled.div`

app/reducers/ui.js

@@ -14,6 +14,7 @@ import {
 const initialState: UiState = {
   initializeInProcess: false,
   authorized: false,
+  accounts: [],
   authFormStep: 1,
   loginError: null,
   loginRequestInProcess: false,
@@ -59,6 +60,7 @@ const initialState: UiState = {
     confirmDeleteWorklog: false,
     settings: false,
     worklog: false,
+    accounts: false,
   },
 
   flags: [],

app/sagas/auth.js

@@ -22,13 +22,15 @@ import {
 
 import {
   setToStorage,
+  getFromStorage,
   removeFromStorage,
 } from './storage';
 import {
   initialConfigureApp,
 } from './initializeApp';
 import {
   throwError,
+  notify,
 } from './ui';
 import createIpcChannel from './ipc';
 
@@ -99,6 +101,26 @@ export function* chronosBackendAuth({
   }
 }
 
+function storeInKeytar(payload, host) {
+  ipcRenderer.sendSync(
+    'store-credentials',
+    {
+      ...payload,
+      host: host.hostname,
+    },
+  );
+}
+
+function* saveAccount(payload: { host: string, username: string }): Generator<*, void, *> {
+  const { host } = payload;
+  let accounts = yield call(getFromStorage, 'accounts');
+  if (!accounts) accounts = [];
+  if (!accounts.find(ac => ac.host === host)) {
+    accounts.push(payload);
+    yield call(setToStorage, 'accounts', accounts);
+  }
+}
+
 export function* basicAuthLoginForm(): Generator<*, void, *> {
   while (true) {
     try {
@@ -141,30 +163,27 @@ export function* basicAuthLoginForm(): Generator<*, void, *> {
       */
       yield call(
         setToStorage,
-        'jira_credentials',
+        'last_used_account',
         {
           username: payload.username,
           host: payload.host,
         },
       );
       yield call(
-        initialConfigureApp,
+        saveAccount,
         {
-          host: host.hostname,
-          protocol,
+          username: payload.username,
+          host: payload.host,
         },
       );
       yield call(
-        (): void => {
-          ipcRenderer.sendSync(
-            'store-credentials',
-            {
-              ...payload,
-              host: host.hostname,
-            },
-          );
+        initialConfigureApp,
+        {
+          host: host.hostname,
+          protocol,
         },
       );
+      yield call(storeInKeytar, payload, host);
       yield put(uiActions.setUiState('loginRequestInProcess', false));
       trackMixpanel('Jira login');
       incrementMixpanel('Jira login', 1);
@@ -259,7 +278,7 @@ export function* oAuthLoginForm(): Generator<*, *, *> {
 
 export function* logoutFlow(): Generator<*, *, *> {
   while (true) {
-    yield take(actionTypes.LOGOUT_REQUEST);
+    const { payload: { dontForget } } = yield take(actionTypes.LOGOUT_REQUEST);
     try {
       const { getGlobal } = remote;
       const { running, uploading } = getGlobal('sharedObj');
@@ -272,9 +291,9 @@ export function* logoutFlow(): Generator<*, *, *> {
         // eslint-disable-next-line no-alert
         window.alert('Currently app in process of saving worklog, wait few seconds please');
       }
-      if (!running && !uploading) {
+      if (!running && !uploading && !dontForget) {
         yield call(removeFromStorage, 'desktop_tracker_jwt');
-        yield call(removeFromStorage, 'jira_credentials');
+        yield call(removeFromStorage, 'last_used_account');
       }
       yield put({
         type: actionTypes.__CLEAR_ALL_REDUCERS__,
@@ -312,6 +331,69 @@ function getOauthChannelListener(channel, type) {
   };
 }
 
+export function* switchAccountFlow(): Generator<*, *, *> {
+  while (true) {
+    const { payload } = yield take(actionTypes.SWITCH_ACCOUNT);
+    try {
+      const { getGlobal } = remote;
+      const { running, uploading } = getGlobal('sharedObj');
+
+      if (running) {
+        // eslint-disable-next-line no-alert
+        window.alert('Tracking in progress, save worklog before logout!');
+      }
+      if (uploading) {
+        // eslint-disable-next-line no-alert
+        window.alert('Currently app in process of saving worklog, wait few seconds please');
+      }
+      if (!running && !uploading) {
+        const host = yield call(transformValidHost, payload.host);
+        const {
+          credentials,
+          error,
+        } = ipcRenderer.sendSync(
+          'get-credentials',
+          {
+            username: payload.username,
+            host: host.hostname,
+          },
+        );
+        if (error) {
+          Raven.captureMessage('keytar error!', {
+            level: 'error',
+            extra: {
+              error: error.err,
+            },
+          });
+          yield call(
+            throwError,
+            error.err,
+          );
+          if (error.platform === 'linux') {
+            yield fork(
+              notify,
+              {
+                type: 'libSecretError',
+                autoDelete: false,
+              },
+            );
+          }
+        } else {
+          yield put({
+            type: actionTypes.__CLEAR_ALL_REDUCERS__,
+          });
+          yield put(uiActions.setUiState('initializeInProcess', true));
+          yield put(authActions.loginRequest({ ...payload, password: credentials.password }));
+        }
+      }
+      trackMixpanel('SwitchAccounts');
+      incrementMixpanel('SwitchAccounts', 1);
+    } catch (err) {
+      yield call(throwError, err);
+    }
+  }
+}
+
 export function* createIpcAuthListeners(): Generator<*, *, *> {
   const oAuthAcceptedChannel = yield call(createIpcChannel, 'oauth-accepted');
   const oAuthDeniedChannel = yield call(createIpcChannel, 'oauth-denied');

app/sagas/index.js

@@ -31,6 +31,7 @@ export default function* rootSaga(): Generator<*, void, *> {
     fork(authSagas.basicAuthLoginForm),
     fork(authSagas.oAuthLoginForm),
     fork(authSagas.logoutFlow),
+    fork(authSagas.switchAccountFlow),
 
     // projects
     fork(projectSagas.watchFetchProjectStatusesRequest),

app/sagas/initializeApp.js

@@ -109,6 +109,10 @@ export function* initialConfigureApp({
   yield call(initializeMixpanel);
   yield call(identifyInSentryAndMixpanel, host, userData);
 
+  let accounts = yield call(getFromStorage, 'accounts');
+  if (!accounts) accounts = [];
+  yield put(uiActions.setUiState('accounts', accounts));
+
   const issuesSourceId: Id | null = yield call(getFromStorage, 'issuesSourceId');
   const issuesSourceType = yield call(getFromStorage, 'issuesSourceType');
   const issuesSprintId: Id | null = yield call(getFromStorage, 'issuesSprintId');
@@ -153,6 +157,7 @@ export function* initialConfigureApp({
       refetchFilterIssuesMarker: false,
     },
   }));
+  yield put(uiActions.setUiState('initializeInProcess', false));
   /*
   const isPaidChronosUser = yield select(getIsPaidUser);
 
@@ -166,7 +171,7 @@ export function* initialConfigureApp({
 function* getInitializeAppData(): Generator<*, *, *> {
   const basicAuthCredentials = yield call(
     getFromStorage,
-    'jira_credentials',
+    'last_used_account',
   );
   const basicAuthDataExist =
     basicAuthCredentials !== null &&

app/styles/index.jsx

@@ -1,7 +1,6 @@
 // @flow
 import styled from 'styled-components2';
 
-
 export const AppWrapper = styled.div`
   height: 100%;
   overflow: hidden;

app/types/auth.js

@@ -17,6 +17,9 @@ export type AuthAction =
   |} |
   {|
     type: typeof actionTypes.LOGOUT_REQUEST,
+    payload: {
+      dontForget: boolean,
+    }
   |} |
   {|
     type: typeof actionTypes.ACCEPT_OAUTH,

app/types/profile.js

@@ -22,6 +22,7 @@ export type User = {
     items: Array<any>,
   },
   key: string,
+  name: string,
   locale?: string,
   self: string,
   timeZone: string,