Push in local changes for presentation

Author: timjam

RosterRN_WS.code-workspace

@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}

app/config/routes.js

@@ -11,6 +11,7 @@ const AuthStack = createStackNavigator({
   SignUp: Register,
 }, {
   headerMode: 'screen',
+  initialRouteName: 'LogIn',
 });
 
 const AppContainer = createAppContainer(createSwitchNavigator(

app/screens/Register.js

@@ -1,3 +1,4 @@
+/* eslint-disable consistent-return */
 import React, { Component } from 'react';
 import { PropTypes } from 'prop-types';
 import { Card, Input, Button } from 'react-native-elements';
@@ -6,6 +7,7 @@ import connectAlert from './../components/Alert/connectAlert';
 import deviceStorage from './../services/deviceStorage';
 import Container from '../components/Container';
 import connection from './../config/connection';
+import postJSONContent from './../services/connectionService';
 
 class Register extends Component {
   constructor(props) {
@@ -32,28 +34,23 @@ class Register extends Component {
     }
 
     // Move validation to custom input out from this submit function
+    // so that the input is validated while it is written
     const emailReg = new RegExp('^\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,3})+$', 'g');
     if (!emailReg.test(email)) {
       return this.props.alertWithType('error', 'Error', 'Email not valid');
     }
 
     try {
       const URL = `${connection.SERVER_URL}:4500/user/signup`;
-      console.log(URL);
-      const response = await fetch(URL, {
-        method: 'POST',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          email,
-          password,
-        }),
-      });
-      console.log(response);
-      // deviceStorage.saveItem('id_token', response.data.jwt);
-      // this.props.navigation.navigate('App');6
+      const response = await fetch(URL, postJSONContent({
+        username: email,
+        password,
+      }));
+      const data = await response.json();
+      // deviceStorage.saveItem('id_token', data.jwt);
+      // Route back to sign-in screen for now. Later on succesful
+      // registration sign user automatically in.
+      this.props.navigation.navigate('LogIn');
     } catch (error) {
       console.log(error);
       return this.props.alertWithType('error', 'Error', `Something went wrong: ${error}`);

app/screens/SignIn.js

@@ -1,3 +1,4 @@
+/* eslint-disable consistent-return */
 import React, { Component } from 'react';
 import { Text } from 'react-native';
 import { PropTypes } from 'prop-types';
@@ -7,13 +8,14 @@ import Container from './../components/Container';
 import connectAlert from './../components/Alert/connectAlert';
 import deviceStorage from './../services/deviceStorage';
 import { LinkText } from './../components/Text';
+import postJSONContent from './../services/connectionService';
 
 class SignIn extends Component {
   constructor(props) {
     super(props);
 
     this.state = {
-      emailOrUsername: '',
+      username: '',
       password: '',
       loading: false,
     };
@@ -22,10 +24,10 @@ class SignIn extends Component {
   goToSignUp = () => {
     this.props.navigation.navigate('SignUp');
   }
-  signIn = () => {
-    const { emailOrUsername, password, loading } = this.state;
+  signIn = async () => {
+    const { username, password, loading } = this.state;
 
-    if (emailOrUsername.length === 0) {
+    if (username.length === 0) {
       return this.props.alertWithType('error', 'Error', 'Email or username is required');
     }
 
@@ -36,8 +38,19 @@ class SignIn extends Component {
     // TODO: Get the token from back end
     this.setState({ loading: !loading });
     // return this.props.alertWithType('warn', 'Warning', 'Sign in not implemented yet');
-    deviceStorage.saveItem('userToken', 'jwttoken123');
-    this.props.navigation.navigate('App');
+    try {
+      const URL = `${connection.SERVER_URL}:4500/user/signup`;
+      const response = await fetch(URL, postJSONContent({
+        username,
+        password,
+      }));
+      const data = await response.json();
+      deviceStorage.saveItem('userToken', data.jwt);
+      this.props.navigation.navigate('App');
+    } catch (error) {
+      // TODO: Get errortype from server. Adjust error message accordingly
+      return this.props.alertWithType('Error', 'errortype', 'Could not sign in');
+    }
   }
 
   /*
@@ -54,8 +67,8 @@ class SignIn extends Component {
             label="Email or Username"
             placeholder="Enter email or username"
             keyboardType="email-address"
-            onChangeText={(emailOrUsername) => this.setState({ emailOrUsername })}
-            value={this.state.emailOrUsername}
+            onChangeText={(username) => this.setState({ username })}
+            value={this.state.username}
             leftIcon={
               <Icon
                 name="envelope"

app/services/connectionService.js

@@ -0,0 +1,12 @@
+const postJSONContent = (args) => {
+  return {
+    method: 'POST',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({ ...args }),
+  };
+};
+
+export default postJSONContent;