Dev login and memory

Author: Rmannn

electron.js

@@ -25,7 +25,6 @@ function createWindow() {
             nodeIntegration: true
         }
     });
-    
 
     const startUrl =
         process.env.ELECTRON_START_URL ||
@@ -43,7 +42,7 @@ function createWindow() {
     win.on('closed', () => {
         windows.delete(win);
     });
-    
+
     windows.add(win);
 }
 

src/client.tsx

@@ -21,10 +21,14 @@ export default class Client extends React.Component {
         this.history = createHistory();
 
         const credentials = getCredentials();
-        this.store = createReduxStore(
-            this.history,
-            credentials ? Map().setIn(['data', 'credentials'], fromJS(credentials)) : undefined
-        );
+
+        let state: Map<String, any> = Map();
+        if (credentials) {
+            state = state.setIn(['data', 'credentials'], fromJS(credentials.credentials));
+            state = state.setIn(['data', 'auth'], fromJS(credentials.auth));
+        }
+
+        this.store = createReduxStore(this.history, state);
     }
 
     render() {

src/index.tsx

@@ -8,4 +8,4 @@ ReactDOM.render(<Client />, document.getElementById('root'));
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.
 // Learn more about service workers: http://bit.ly/CRA-PWA
-serviceWorker.unregister();
+serviceWorker.register();

src/modules/List/component.tsx

@@ -120,6 +120,12 @@ class ListView extends React.Component<ListViewProps> {
         }
     }
 
+    componentDidMount() {
+        if (this.props.data.length === 0) {
+            this.props.list({});
+        }
+    }
+
     private applyFilters(data: any[]) {
         if (!this.state.search) {
             return data;
@@ -153,11 +159,6 @@ class ListView extends React.Component<ListViewProps> {
                 <div className={classes.root}>
                     <Grid container spacing={3} justify="center">
                         <Grid item xs={12}>
-                            {error && (
-                                <Typography variant="body1" color="error">
-                                    {error.message}
-                                </Typography>
-                            )}
                             {data && (
                                 <Paper>
                                     <Table className={classes.table}>
@@ -171,7 +172,7 @@ class ListView extends React.Component<ListViewProps> {
                                             </TableRow>
                                         </TableHead>
                                         <TableBody>
-                                            {filteredData.length === 0 && (
+                                            {filteredData.length === 0 && !error && (
                                                 <TableRow>
                                                     <TableCell colSpan={5}>
                                                         <Typography align="center" color="primary">
@@ -180,6 +181,15 @@ class ListView extends React.Component<ListViewProps> {
                                                     </TableCell>
                                                 </TableRow>
                                             )}
+                                            {error && (
+                                                <TableRow>
+                                                    <TableCell colSpan={5}>
+                                                        <Typography align="center" color="error">
+                                                            {error.message}
+                                                        </Typography>
+                                                    </TableCell>
+                                                </TableRow>
+                                            )}
                                             {filteredData
                                                 .slice(page * countPerPage, page * countPerPage + countPerPage)
                                                 .map((file: any) => {

src/modules/List/saga.ts

@@ -23,12 +23,14 @@ function* listSaga(action: any) {
 
 export default function* saga() {
     yield takeLatest((action: any) => action.type === 'LOAD_DATA' && action.meta === 'list', listSaga);
-    yield takeLatest(
+
+    /*yield takeLatest(
         (action: any) => action.type === 'SET_STATE' && action.meta === 'auth' && !action.error,
         function*() {
             yield put(loadData({}, 'list'));
         }
-    );
+    );*/
+
     yield takeLatest(selectFile, function*(action) {
         // get all files from state
         let files: Map<String, any> = yield select(s => selectDataAtPath(s, ['selectedFiles'], Map<String, any>()));

src/modules/Login/saga.ts

@@ -4,7 +4,7 @@ import { setState, deleteState } from '../Data';
 import { stopSubmit } from 'redux-form/immutable';
 import { ValidationError } from 'joi';
 import { push } from 'connected-react-router';
-import { setCredentials } from './storage';
+import { setCredentials, clearCredentials } from './storage';
 import { login } from './actions';
 import { login as loginApi } from '../../api';
 
@@ -14,7 +14,7 @@ function* loginSaga(action: any) {
         yield put(setState(action.payload.credentials, 'credentials'));
         yield put(loadDataDone(data, action.meta));
         yield put(setState(data, 'auth'));
-        setCredentials({ ...action.payload.credentials });
+        setCredentials({ credentials: action.payload.credentials, auth: data });
         if (action.payload.redirectAfter) {
             yield put(push(action.payload.redirectAfter));
         }
@@ -45,7 +45,7 @@ function* loginSaga(action: any) {
 
 function* logoutSaga() {
     if (typeof window !== 'undefined') {
-        window.localStorage.removeItem('credentials');
+        clearCredentials();
     }
     yield all([put(resetData()), put(deleteState('auth')), put(deleteState('credentials'))]);
 }
@@ -56,8 +56,12 @@ export default function* saga() {
     // init
     const location = yield select(state => state.get('router').location);
     const credentials = yield select(state => state.getIn(['data', 'credentials']));
-    if (credentials && !/^\/login/g.test(location.pathname)) {
-        yield put(login({ credentials: credentials.toJS() }));
+    const auth = yield select(state => state.getIn(['data', 'auth']));
+
+    if (credentials && auth && !/^\/list/g.test(location.pathname)) {
+        yield put(push('/list'));
+    } else if ((!credentials || !auth) && !/^\/login/g.test(location.pathname)) {
+        yield put(push('/login'));
     }
 
     yield takeLatest((action: any) => action.type === 'LOGOUT', logoutSaga);

src/modules/Login/storage.ts

@@ -1,18 +1,26 @@
 export function getCredentials() {
     try {
-        const credentials = window.localStorage.getItem('credentials');
+        const credentials = window.localStorage.getItem('simples3:credentials');
         if (credentials) {
             return JSON.parse(credentials);
         }
     } catch (e) {
-        return null;
+        console.log('Storage', e);
     }
 }
 
 export function setCredentials(credentials: any) {
     try {
-        window.localStorage.setItem('credentials', JSON.stringify(credentials));
+        window.localStorage.setItem('simples3:credentials', JSON.stringify(credentials));
     } catch (e) {
-        return null;
+        console.log('Storage', e);
+    }
+}
+
+export function clearCredentials() {
+    try {
+        window.localStorage.removeItem('simples3:credentials');
+    } catch (e) {
+        console.log('Storage', e);
     }
 }