ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-11-24 08:55:14 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed comment requirements

Browse Source
This commit is contained in:
Mustafa Buyukcelebi 2019-01-10 12:17:49 +03:00
parent 8b3da1b85f
commit 8050765b93
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/constants/authType.js
View File

@ -1,7 +1,13 @@
const STEEM_CONNECT = 'steemConnect';
const MASTER_KEY = 'masterKey';
const ACTIVE_KEY = 'activeKey';
const MEMO_KEY = 'memoKey';
const POSTING_KEY = 'postingKey';
export default {
STEEM_CONNECT,
MASTER_KEY,
ACTIVE_KEY,
MEMO_KEY,
POSTING_KEY,
};

28
src/providers/steem/auth.js
View File

@ -18,6 +18,9 @@ import { encryptKey, decryptKey } from '../../utils/crypto';
import steemConnect from './steemConnectAPI';
import { getSCAccessToken } from '../esteem/esteem';
// Constants
import AUTH_TYPE from '../../constants/authType';
export const login = async (username, password) => {
let loginFlag = false;
let avatar = '';
@ -47,7 +50,7 @@ export const login = async (username, password) => {
Object.keys(publicKeys).map((pubKey) => {
if (publicKeys[pubKey] === privateKeys[pubKey].createPublic().toString()) {
loginFlag = true;
if (privateKeys.isMasterKey) authType = 'masterKey';
if (privateKeys.isMasterKey) authType = AUTH_TYPE.MASTER_KEY;
else authType = pubKey;
}
});
@ -107,7 +110,7 @@ export const loginWithSC2 = async (code) => {
const userData = {
username: account.account.name,
avatar,
authType: 'steemConnect',
authType: AUTH_TYPE.STEEM_CONNECT,
masterKey: '',
postingKey: '',
activeKey: '',
@ -121,7 +124,6 @@ export const loginWithSC2 = async (code) => {
setUserData(userData)
.then(async () => {
account.account.username = account.account.name;
updateCurrentUsername(account.account.name);
const authData = {
isLoggedIn: true,
@ -157,11 +159,11 @@ export const updatePinCode = async (data) => {
try {
await setPinCode(data.pinCode);
const users = await getUserData();
if (users.length > 0) {
if (users && users.length > 0) {
users.forEach(async (userData) => {
if (userData.authType === 'masterKey') {
if (userData.authType === AUTH_TYPE.MASTER_KEY) {
data.password = decryptKey(userData.masterKey, data.oldPinCode);
} else if (userData.authType === 'steemConnect') {
} else if (userData.authType === AUTH_TYPE.STEEM_CONNECT) {
data.accessToken = decryptKey(userData.accessToken, data.oldPinCode);
}
const updatedUserData = getUpdatedUserData(userData, data);
@ -184,7 +186,7 @@ export const verifyPinCode = async (data) => {
// This is migration for new pin structure, it will remove v2.2
if (!pinHash) {
try {
if (userData.authType === 'steemConnect') {
if (userData.authType === AUTH_TYPE.STEEM_CONNECT) {
decryptKey(userData.accessToken, data.pinCode);
} else {
decryptKey(userData.masterKey, data.pinCode);
@ -200,7 +202,7 @@ export const verifyPinCode = async (data) => {
}
if (result.length > 0) {
if (userData.authType === 'steemConnect') {
if (userData.authType === AUTH_TYPE.STEEM_CONNECT) {
await refreshSCToken(userData, data.pinCode);
}
}
@ -261,23 +263,23 @@ export const getUpdatedUserData = (userData, data) => {
username: userData.username,
authType: userData.authType,
accessToken:
userData.authType === 'steemConnect'
userData.authType === AUTH_TYPE.STEEM_CONNECT
? encryptKey(data.accessToken, data.pinCode)
: '',
masterKey:
userData.authType === 'masterKey'
userData.authType === AUTH_TYPE.MASTER_KEY
? encryptKey(data.password, data.pinCode)
: '',
postingKey:
userData.authType === 'masterKey' || userData.authType === 'postingKey'
userData.authType === AUTH_TYPE.MASTER_KEY || userData.authType === AUTH_TYPE.POSTING_KEY
? encryptKey(privateKeys.postingKey.toString(), data.pinCode)
: '',
activeKey:
userData.authType === 'masterKey' || userData.authType === 'activeKey'
userData.authType === AUTH_TYPE.MASTER_KEY || userData.authType === AUTH_TYPE.ACTIVE_KEY
? encryptKey(privateKeys.activeKey.toString(), data.pinCode)
: '',
memoKey:
userData.authType === 'masterKey' || userData.authType === 'memoKey'
userData.authType === AUTH_TYPE.MASTER_KEY || userData.authType === AUTH_TYPE.MEMO_KEY
? encryptKey(privateKeys.memoKey.toString(), data.pinCode)
: '',
};

22
src/screens/application/container/applicationContainer.js
View File

@ -10,6 +10,7 @@ import { NavigationActions } from 'react-navigation';
import en from 'react-intl/locale-data/en';
import tr from 'react-intl/locale-data/tr';
import ru from 'react-intl/locale-data/ru';
import AUTH_TYPE from '../../../constants/authType';
// Services
import {
@ -115,13 +116,13 @@ class ApplicationContainer extends Component {
&& !accountData.memoKey
) {
realmData.splice(index, 1);
if (realmData.length <= 0) {
if (realmData.length === 0) {
dispatch(login(false));
dispatch(logoutDone());
removePinCode();
setAuthStatus({ isLoggedIn: false });
setExistUser(false);
if (accountData.authType === 'steemConnect') {
if (accountData.authType === AUTH_TYPE.STEEM_CONNECT) {
removeSCAccount(accountData.username);
}
}
@ -138,7 +139,7 @@ class ApplicationContainer extends Component {
if (realmData.length > 0) {
const realmObject = realmData.filter(data => data.username === currentUsername);
if (realmObject.length <= 0) {
if (realmObject.length === 0) {
realmObject[0] = realmData[realmData.length - 1];
await switchAccount(realmObject[0].username);
}
@ -219,13 +220,13 @@ class ApplicationContainer extends Component {
_logout = () => {
const {
otherAccounts, currentAccountUsername, currentAccountAuthType, dispatch,
otherAccounts, currentAccount, dispatch,
} = this.props;
removeUserData(currentAccountUsername)
removeUserData(currentAccount.name)
.then(() => {
const _otherAccounts = otherAccounts.filter(
user => user.username !== currentAccountUsername,
user => user.username !== currentAccount.name,
);
if (_otherAccounts.length > 0) {
@ -238,12 +239,12 @@ class ApplicationContainer extends Component {
removePinCode();
setAuthStatus({ isLoggedIn: false });
setExistUser(false);
if (currentAccountAuthType === 'steemConnect') {
removeSCAccount(currentAccountUsername);
if (currentAccount.local === AUTH_TYPE.STEEM_CONNECT) {
removeSCAccount(currentAccount.name);
}
}
dispatch(removeOtherAccount(currentAccountUsername));
dispatch(removeOtherAccount(currentAccount.name));
dispatch(logoutDone());
})
.catch(() => {});
@ -288,10 +289,9 @@ const mapStateToProps = state => ({
// Account
unreadActivityCount: state.account.currentAccount.unread_activity_count,
currentAccountUsername: state.account.currentAccount.name,
currentAccount: state.account.currentAccount,
otherAccounts: state.account.otherAccounts,
pinCode: state.account.pin,
currentAccountAuthType: state.account.currentAccount.local,
});
export default connect(mapStateToProps)(ApplicationContainer);