diff --git a/app/actions/actionsTypes.js b/app/actions/actionsTypes.js
index 7e937e97a5d3b8738a8ef4920862f7fd95f45524..fa841ad85130fb2880d5adb050268a8b75b218df 100644
--- a/app/actions/actionsTypes.js
+++ b/app/actions/actionsTypes.js
@@ -17,6 +17,7 @@ export const LOGIN = createRequestTypes('LOGIN', [
'REGISTER_SUBMIT',
'REGISTER_REQUEST',
'REGISTER_SUCCESS',
+ 'REGISTER_INCOMPLETE',
'SET_USERNAME_SUBMIT',
'SET_USERNAME_REQUEST',
'SET_USERNAME_SUCCESS'
diff --git a/app/actions/login.js b/app/actions/login.js
index f8b12eeb06d4d2cc0b43a0f57b60760a5fa65f90..c603f42bda7a7fe335679c6b061b1e69a53597cd 100644
--- a/app/actions/login.js
+++ b/app/actions/login.js
@@ -32,6 +32,11 @@ export function registerSuccess(credentials) {
credentials
};
}
+export function registerIncomplete() {
+ return {
+ type: types.LOGIN.REGISTER_INCOMPLETE
+ };
+}
export function setUsernameSubmit(credentials) {
return {
diff --git a/app/containers/Routes.js b/app/containers/Routes.js
index 83268096c16dbfd4919bce399802199b7f6a8944..2255e30212312d5fc6e628a31e801e93b5b4681f 100644
--- a/app/containers/Routes.js
+++ b/app/containers/Routes.js
@@ -7,6 +7,7 @@ import { appInit } from '../actions';
import AuthRoutes from './routes/AuthRoutes';
import PublicRoutes from './routes/PublicRoutes';
import Loading from '../presentation/Loading';
+import * as NavigationService from './routes/NavigationService';
@connect(
state => ({
@@ -27,6 +28,10 @@ export default class Routes extends React.Component {
componentWillMount() {
this.props.appInit();
}
+
+ componentDidUpdate() {
+ NavigationService.setNavigator(this.navigator);
+ }
render() {
const { login, app } = this.props;
@@ -35,9 +40,9 @@ export default class Routes extends React.Component {
}
if ((login.token && !login.failure && !login.isRegistering) || app.ready) {
- return (<AuthRoutes />);
+ return (<AuthRoutes ref={nav => this.navigator = nav} />);
}
- return (<PublicRoutes />);
+ return (<PublicRoutes ref={nav => this.navigator = nav} />);
}
}
diff --git a/app/containers/routes/NavigationService.js b/app/containers/routes/NavigationService.js
new file mode 100644
index 0000000000000000000000000000000000000000..0be7f410b3841f3cd3a5cdac8969277fcae6fe7f
--- /dev/null
+++ b/app/containers/routes/NavigationService.js
@@ -0,0 +1,23 @@
+import { NavigationActions } from 'react-navigation';
+
+const config = {};
+
+export function setNavigator(nav) {
+ if (nav) {
+ config.navigator = nav;
+ }
+}
+
+export function navigate(routeName, params) {
+ if (config.navigator && routeName) {
+ const action = NavigationActions.navigate({ routeName, params });
+ config.navigator.dispatch(action);
+ }
+}
+
+export function goBack() {
+ if (config.navigator) {
+ const action = NavigationActions.back({});
+ config.navigator.dispatch(action);
+ }
+}
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 81bc55f40955dd28df2e6f1ddf96c292a6ab6c26..60aec3413dbbbd57df511e5d0ba8dd10a58d2a84 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -122,6 +122,17 @@ const RocketChat = {
});
},
+ me({ server, token, userId }) {
+ return fetch(`${ server }/api/v1/me`, {
+ method: 'get',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-Auth-Token': token,
+ 'X-User-Id': userId
+ }
+ }).then(response => response.json());
+ },
+
register({ credentials }) {
return new Promise((resolve, reject) => {
Meteor.call('registerUser', credentials, (err, userId) => {
diff --git a/app/reducers/login.js b/app/reducers/login.js
index 4964ccba31843fe78909bc219bd29477dc440c43..b6bacffc4aeecf64d54c1d76ae8bda643faa6818 100644
--- a/app/reducers/login.js
+++ b/app/reducers/login.js
@@ -74,6 +74,11 @@ export default function login(state = initialState, action) {
isFetching: false,
isRegistering: false
};
+ case types.LOGIN.REGISTER_INCOMPLETE:
+ return {
+ ...state,
+ isRegistering: true
+ };
case types.FORGOT_PASSWORD.INIT:
return initialState;
case types.FORGOT_PASSWORD.REQUEST:
diff --git a/app/sagas/login.js b/app/sagas/login.js
index c16e9f1b47cbc917510da713fc87b3882b329d40..302b560420659fc8d2bbdd09ac2f5ca4b94af6f8 100644
--- a/app/sagas/login.js
+++ b/app/sagas/login.js
@@ -5,6 +5,7 @@ import {
loginRequest,
loginSubmit,
registerRequest,
+ registerIncomplete,
loginSuccess,
loginFailure,
setToken,
@@ -16,6 +17,7 @@ import {
forgotPasswordFailure
} from '../actions/login';
import RocketChat from '../lib/rocketchat';
+import * as NavigationService from '../containers/routes/NavigationService';
const TOKEN_KEY = 'reactnativemeteor_usertoken';
const getUser = state => state.login;
@@ -24,6 +26,7 @@ const loginCall = args => (args.resume ? RocketChat.login(args) : RocketChat.log
const registerCall = args => RocketChat.register(args);
const setUsernameCall = args => RocketChat.setUsername(args);
const logoutCall = args => RocketChat.logout(args);
+const meCall = args => RocketChat.me(args);
const forgotPasswordCall = args => RocketChat.forgotPassword(args);
const getToken = function* getToken() {
@@ -43,35 +46,17 @@ const getToken = function* getToken() {
};
const handleLoginWhenServerChanges = function* handleLoginWhenServerChanges() {
- // do {
try {
yield take(types.METEOR.SUCCESS);
yield call(getToken);
- // const { navigator } = yield select(state => state);
const user = yield select(getUser);
if (user.token) {
yield put(loginRequest({ resume: user.token }));
- // console.log('AEEEEEEEEOOOOO');
- // // wait for a response
- // const { error } = yield race({
- // success: take(types.LOGIN.SUCCESS),
- // error: take(types.LOGIN.FAILURE)
- // });
- // console.log('AEEEEEEEEOOOOO', error);
- // if (!error) {
- // navigator.resetTo({
- // screen: 'Rooms'
- // });
- // }
}
- // navigator.resetTo({
- // screen: 'Rooms'
- // });
} catch (e) {
console.log(e);
}
- // } while (true);
};
const saveToken = function* saveToken() {
@@ -82,8 +67,20 @@ const saveToken = function* saveToken() {
const handleLoginRequest = function* handleLoginRequest({ credentials }) {
try {
- const response = yield call(loginCall, credentials);
- yield put(loginSuccess(response));
+ const server = yield select(getServer);
+ const user = yield call(loginCall, credentials);
+
+ // GET /me from REST API
+ const me = yield call(meCall, { server, token: user.token, userId: user.id });
+
+ // if user has username
+ if (me.username) {
+ user.username = me.username;
+ } else {
+ yield put(registerIncomplete());
+ }
+
+ yield put(loginSuccess(user));
} catch (err) {
if (err.error === 403) {
yield put(logout());
@@ -98,13 +95,7 @@ const handleLoginSubmit = function* handleLoginSubmit({ credentials }) {
};
const handleRegisterSubmit = function* handleRegisterSubmit({ credentials }) {
- // put a login request
yield put(registerRequest(credentials));
- // wait for a response
- // yield race({
- // success: take(types.LOGIN.REGISTER_SUCCESS),
- // error: take(types.LOGIN.FAILURE)
- // });
};
const handleRegisterRequest = function* handleRegisterRequest({ credentials }) {
@@ -141,6 +132,10 @@ const handleLogout = function* handleLogout() {
yield call(logoutCall, { server });
};
+const handleRegisterIncomplete = function* handleRegisterIncomplete() {
+ yield call(NavigationService.navigate, 'Register');
+};
+
const handleForgotPasswordRequest = function* handleForgotPasswordRequest({ email }) {
try {
yield call(forgotPasswordCall, email);
@@ -158,6 +153,7 @@ const root = function* root() {
yield takeLatest(types.LOGIN.REGISTER_REQUEST, handleRegisterRequest);
yield takeLatest(types.LOGIN.REGISTER_SUBMIT, handleRegisterSubmit);
yield takeLatest(types.LOGIN.REGISTER_SUCCESS, handleRegisterSuccess);
+ yield takeLatest(types.LOGIN.REGISTER_INCOMPLETE, handleRegisterIncomplete);
yield takeLatest(types.LOGIN.SET_USERNAME_SUBMIT, handleSetUsernameSubmit);
yield takeLatest(types.LOGIN.SET_USERNAME_REQUEST, handleSetUsernameRequest);
yield takeLatest(types.LOGOUT, handleLogout);