mg-library 1.0.776 → 1.0.777
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/constants.js +4 -3
- package/login.js +12 -10
- package/package.json +1 -1
package/constants.js
CHANGED
|
@@ -10,9 +10,10 @@ export const SCREEN_LOGIN = 'Login';
|
|
|
10
10
|
export const SCREEN_HOME = 'Home';
|
|
11
11
|
|
|
12
12
|
export const ACCESS_TOKEN = 'accessToken';
|
|
13
|
-
|
|
14
|
-
export const
|
|
15
|
-
export const
|
|
13
|
+
|
|
14
|
+
export const AUTH_SERVER = '@auth:server';
|
|
15
|
+
export const AUTH_USERNAME = '@auth:userName';
|
|
16
|
+
export const AUTH_PASSWORD = '@auth:password';
|
|
16
17
|
|
|
17
18
|
export const CAMERA_FACING_BACK = 'back';
|
|
18
19
|
export const CAMERA_FACING_FRONT = 'front';
|
package/login.js
CHANGED
|
@@ -17,15 +17,9 @@ export function onPressLogin(dispatch, actions, app, apiUrl, language, data) {
|
|
|
17
17
|
let appSession = response.data;
|
|
18
18
|
dispatch(actions.login(appSession));
|
|
19
19
|
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.ACCESS_TOKEN, appSession.accessToken);
|
|
20
|
-
|
|
21
|
-
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.
|
|
22
|
-
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.
|
|
23
|
-
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.PASSWORD, requestData.password);
|
|
24
|
-
|
|
25
|
-
console.log(appSession.server);
|
|
26
|
-
console.log(requestData.userName);
|
|
27
|
-
console.log(requestData.password);
|
|
28
|
-
|
|
20
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_SERVER, appSession.server);
|
|
21
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_USERNAME, requestData.userName);
|
|
22
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_PASSWORD, requestData.password);
|
|
29
23
|
dispatch(actions.apiSuccess());
|
|
30
24
|
})
|
|
31
25
|
.catch(error => {
|
|
@@ -61,7 +55,10 @@ export function onPressLogout(dispatch, actions, app, apiUrl) {
|
|
|
61
55
|
dispatch(actions.apiRequest());
|
|
62
56
|
axios.post(apiUrl + '/Logout', requestData, mgFunctionsLib.getRequestHeader())
|
|
63
57
|
.then(response => {
|
|
64
|
-
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.ACCESS_TOKEN, '');
|
|
58
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.ACCESS_TOKEN, '');
|
|
59
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_SERVER, '');
|
|
60
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_USERNAME, '');
|
|
61
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_PASSWORD, '');
|
|
65
62
|
dispatch(actions.disconnectFromServer());
|
|
66
63
|
dispatch(actions.apiSuccess());
|
|
67
64
|
})
|
|
@@ -91,6 +88,11 @@ export function onAutoLogin(dispatch, actions, app, apiUrl, language, setAppStat
|
|
|
91
88
|
.then(response => {
|
|
92
89
|
let appSession = response.data;
|
|
93
90
|
if (!mgFunctionsLib.isEmpty(appSession)) {
|
|
91
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_SERVER, appSession.server);
|
|
92
|
+
if(appSession.userName!=undefined)
|
|
93
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_USERNAME, appSession.userName);
|
|
94
|
+
if(appSession.password!=undefined)
|
|
95
|
+
mgFunctionsLib.writeToLocalStorage(mgConstantsLib.AUTH_PASSWORD, appSession.password);
|
|
94
96
|
dispatch(actions.login(appSession));
|
|
95
97
|
}
|
|
96
98
|
setNavigator(undefined);
|