vergnet/application-amicale
5
5
Fork 5
Code Issues Pull requests Releases Wiki Activity

Recover credentials on startup for increased performance and added login/profile button on home

Browse source
This commit is contained in:
Arnaud Vergnet 2020-04-04 16:09:04 +02:00
parent 1ede8f4e9a
commit 17016b6452
6 changed files with 85 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
App.js
View file

@ -14,6 +14,7 @@ import {initExpoToken} from "./utils/Notifications";
import {Provider as PaperProvider} from 'react-native-paper';
import AprilFoolsManager from "./managers/AprilFoolsManager";
import Update from "./constants/Update";
import ConnectionManager from "./managers/ConnectionManager";
type Props = {};
@ -91,6 +92,10 @@ export default class App extends React.Component<Props, State> {
await AsyncStorageManager.getInstance().loadPreferences();
ThemeManager.getInstance().setUpdateThemeCallback(this.onUpdateTheme);
await initExpoToken();
try {
await ConnectionManager.getInstance().recoverLogin();
} catch (e) {}
this.onLoadFinished();
}

30
components/Amicale/AuthenticatedScreen.js
View file

@ -24,7 +24,7 @@ class AuthenticatedScreen extends React.Component<Props, State> {
loading: true,
};
currentUserToken: string;
currentUserToken: string | null;
connectionManager: ConnectionManager;
errorCode: number;
data: Object;
@ -35,8 +35,6 @@ class AuthenticatedScreen extends React.Component<Props, State> {
this.colors = props.theme.colors;
this.connectionManager = ConnectionManager.getInstance();
this.props.navigation.addListener('focus', this.onScreenFocus.bind(this));
this.fetchData();
}
onScreenFocus() {
@ -47,26 +45,24 @@ class AuthenticatedScreen extends React.Component<Props, State> {
fetchData = () => {
if (!this.state.loading)
this.setState({loading: true});
this.connectionManager.isLoggedIn()
.then(() => {
this.connectionManager.authenticatedRequest(this.props.link)
.then((data) => {
this.onFinishedLoading(data, -1);
})
.catch((error) => {
this.onFinishedLoading(undefined, error);
});
})
.catch((error) => {
this.onFinishedLoading(undefined, ERROR_TYPE.BAD_CREDENTIALS);
});
if (this.connectionManager.isLoggedIn()) {
this.connectionManager.authenticatedRequest(this.props.link)
.then((data) => {
this.onFinishedLoading(data, -1);
})
.catch((error) => {
this.onFinishedLoading(undefined, error);
});
} else {
this.onFinishedLoading(undefined, ERROR_TYPE.BAD_CREDENTIALS);
}
};
onFinishedLoading(data: Object, error: number) {
this.data = data;
this.currentUserToken = data !== undefined
? this.connectionManager.getToken()
: '';
: null;
this.errorCode = error;
this.setState({loading: false});
}

5
components/Sidebar/Sidebar.js
View file

@ -154,13 +154,12 @@ class SideBar extends React.PureComponent<Props, State> {
];
this.getRenderItem = this.getRenderItem.bind(this);
this.colors = props.theme.colors;
ConnectionManager.getInstance().setLoginCallback((value) => this.onLoginStateChange(value));
ConnectionManager.getInstance().addLoginStateListener((value) => this.onLoginStateChange(value));
this.state = {
active: 'Home',
isLoggedIn: false,
isLoggedIn: ConnectionManager.getInstance().isLoggedIn(),
dialogVisible: false,
};
ConnectionManager.getInstance().isLoggedIn().then(data => undefined).catch(error => undefined);
}
showDisconnectDialog = () => this.setState({ dialogVisible: true });

81
managers/ConnectionManager.js
View file

@ -16,10 +16,17 @@ export default class ConnectionManager {
static instance: ConnectionManager | null = null;
#email: string;
#token: string;
#token: string | null;
loginCallback: Function;
listeners: Array<Function>;
constructor() {
this.#token = null;
this.listeners = [];
}
/**
* Get this class instance or create one if none is found
* @returns {ConnectionManager}
@ -35,20 +42,24 @@ export default class ConnectionManager {
}
onLoginStateChange(newState: boolean) {
this.loginCallback(newState);
for (let i = 0; i < this.listeners.length; i++) {
if (this.listeners[i] !== undefined)
this.listeners[i](newState);
}
}
setLoginCallback(callback: Function) {
this.loginCallback = callback;
addLoginStateListener(listener: Function) {
this.listeners.push(listener);
}
async recoverLogin() {
return new Promise((resolve, reject) => {
if (this.#token !== undefined)
if (this.#token !== null)
resolve(this.#token);
else {
SecureStore.getItemAsync('token')
.then((token) => {
this.#token = token;
if (token !== null) {
this.onLoginStateChange(true);
resolve(token);
@ -62,16 +73,8 @@ export default class ConnectionManager {
});
}
async isLoggedIn() {
return new Promise((resolve, reject) => {
this.recoverLogin()
.then(() => {
resolve(true);
})
.catch(() => {
reject(false);
})
});
isLoggedIn() {
return this.#token !== null;
}
async saveLogin(email: string, token: string) {
@ -93,6 +96,7 @@ export default class ConnectionManager {
return new Promise((resolve, reject) => {
SecureStore.deleteItemAsync('token')
.then(() => {
this.#token = null;
this.onLoginStateChange(false);
resolve(true);
})
@ -166,32 +170,29 @@ export default class ConnectionManager {
async authenticatedRequest(url: string) {
return new Promise((resolve, reject) => {
this.recoverLogin()
.then(token => {
fetch(url, {
method: 'POST',
headers: new Headers({
'Accept': 'application/json',
'Content-Type': 'application/json',
}),
body: JSON.stringify({token: token})
}).then(async (response) => response.json())
.then((data) => {
if (this.isRequestResponseValid(data)) {
if (data.state)
resolve(data.data);
else
reject(ERROR_TYPE.BAD_CREDENTIALS);
} else
reject(ERROR_TYPE.CONNECTION_ERROR);
})
.catch(() => {
if (this.#token !== null) {
fetch(url, {
method: 'POST',
headers: new Headers({
'Accept': 'application/json',
'Content-Type': 'application/json',
}),
body: JSON.stringify({token: this.#token})
}).then(async (response) => response.json())
.then((data) => {
if (this.isRequestResponseValid(data)) {
if (data.state)
resolve(data.data);
else
reject(ERROR_TYPE.BAD_CREDENTIALS);
} else
reject(ERROR_TYPE.CONNECTION_ERROR);
});
})
.catch(() => {
reject(ERROR_TYPE.NO_TOKEN);
});
})
.catch(() => {
reject(ERROR_TYPE.CONNECTION_ERROR);
});
} else
reject(ERROR_TYPE.NO_TOKEN);
});
}
}

4
screens/Amicale/LoginScreen.js
View file

@ -32,8 +32,8 @@ const emailRegex = /^.+@.+\..+$/;
class LoginScreen extends React.Component<Props, State> {
state = {
email: '',
password: '',
email: 'vergnet@etud.insa-toulouse.fr',
password: '3D514ùdsqg',
isEmailValidated: false,
isPasswordValidated: false,
loading: false,

22
screens/HomeScreen.js
View file

@ -12,6 +12,8 @@ import PreviewEventDashboardItem from "../components/Home/PreviewEventDashboardI
import {stringToDate} from "../utils/Planning";
import {openBrowser} from "../utils/WebBrowser";
import ActionsDashBoardItem from "../components/Home/ActionsDashboardItem";
import HeaderButton from "../components/Custom/HeaderButton";
import ConnectionManager from "../managers/ConnectionManager";
// import DATA from "../dashboard_data.json";
@ -33,6 +35,7 @@ type Props = {
type State = {
imageModalVisible: boolean,
imageList: Array<Object>,
isLoggedIn: boolean,
}
/**
@ -52,10 +55,12 @@ class HomeScreen extends React.Component<Props, State> {
state = {
imageModalVisible: false,
imageList: [],
isLoggedIn: ConnectionManager.getInstance().isLoggedIn(),
};
constructor(props) {
super(props);
ConnectionManager.getInstance().addLoginStateListener((value) => this.setState({isLoggedIn: value}));
this.onProxiwashClick = this.onProxiwashClick.bind(this);
this.onTutorInsaClick = this.onTutorInsaClick.bind(this);
this.onMenuClick = this.onMenuClick.bind(this);
@ -76,6 +81,23 @@ class HomeScreen extends React.Component<Props, State> {
return date.toLocaleString();
}
componentDidMount() {
this.props.navigation.setOptions({
headerRight: this.getHeaderButton,
});
}
getHeaderButton = () => {
const screen = this.state.isLoggedIn
? "ProfileScreen"
: "LoginScreen";
const icon = this.state.isLoggedIn
? "account"
: "login";
const onPress = () => this.props.navigation.navigate(screen);
return <HeaderButton icon={icon} onPress={onPress}/>;
};
onProxiwashClick() {
this.props.navigation.navigate('Proxiwash');
}