Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dusken-client
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
EDB
dusken-client
Commits
2045a385
Commit
2045a385
authored
May 21, 2019
by
Nikolai R Kristiansen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
Fix redux v4 to v5 migration
Also logout users with inconsistent state
parent
6ac6bffc
Pipeline
#721
failed with stage
in 2 minutes and 25 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
7 deletions
+21
-7
src/Dusken.js
src/Dusken.js
+18
-5
src/utils.js
src/utils.js
+3
-2
No files found.
src/Dusken.js
View file @
2045a385
...
...
@@ -3,12 +3,20 @@ import { connect } from 'react-redux';
import
{
Root
}
from
'
native-base
'
;
import
DuskenNavigation
from
'
./navigation
'
;
import
{
userDataSuccess
}
from
'
./actions
'
;
import
{
logout
as
logoutAction
,
registerUserSuccess
as
registerUserSuccessAction
}
from
'
./actions
'
;
import
{
migrateReduxPersistFourToFive
}
from
'
./utils
'
;
const
DuskenContainer
=
({
setUserData
})
=>
{
const
DuskenContainer
=
({
registerUserSuccess
,
userToken
,
user
,
logout
})
=>
{
useEffect
(()
=>
{
migrateReduxPersistFourToFive
(
setUserData
);
async
function
inner
()
{
await
migrateReduxPersistFourToFive
(
registerUserSuccess
);
// logout authenticated users without token
if
(
user
&&
!
userToken
)
{
logout
();
}
}
inner
();
});
return
(
...
...
@@ -18,11 +26,16 @@ const DuskenContainer = ({ setUserData }) => {
);
};
const
mapStateToProps
=
(
state
)
=>
({
userToken
:
state
.
userToken
,
user
:
state
.
user
,
});
const
mapDispatchToProps
=
{
setUserData
:
userDataSuccess
,
registerUserSuccess
:
registerUserSuccessAction
,
logout
:
logoutAction
,
};
export
default
connect
(
null
,
mapStateToProps
,
mapDispatchToProps
)(
DuskenContainer
);
src/utils.js
View file @
2045a385
...
...
@@ -16,7 +16,7 @@ export function fetchWithTimeout(url, options, timeout = 10000) {
]);
}
export
async
function
migrateReduxPersistFourToFive
(
setUserData
)
{
export
async
function
migrateReduxPersistFourToFive
(
registerUserSuccess
)
{
const
authedKey
=
'
reduxPersist:isAuthenticated
'
;
const
userKey
=
'
reduxPersist:user
'
;
const
userTokenKey
=
'
reduxPersist:userToken
'
;
...
...
@@ -34,9 +34,10 @@ export async function migrateReduxPersistFourToFive(setUserData) {
return
;
}
const
userToken
=
await
AsyncStorage
.
getItem
(
userTokenKey
);
const
user
=
await
AsyncStorage
.
getItem
(
userKey
);
console
.
log
(
userKey
,
user
,
JSON
.
parse
(
user
));
setUserData
(
JSON
.
parse
(
user
)
);
registerUserSuccess
({
auth_token
:
userToken
,
...
JSON
.
parse
(
user
)
}
);
await
AsyncStorage
.
multiRemove
(
v4Keys
);
console
.
log
(
'
successfully migrated to new redux-persist
'
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment