ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-18 19:01:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

int

Browse Source
This commit is contained in:
Nouman Tahir 2021-06-29 14:06:55 +05:00
parent 6696669aeb
commit 9655fd383d
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/providers/hive/auth.js
View File

@ -3,7 +3,6 @@ import sha256 from 'crypto-js/sha256';
import Config from 'react-native-config';
import get from 'lodash/get';
import { getDigitPinCode, getUser } from './dhive';
import {
setUserData,
@ -64,8 +63,7 @@ export const login = async (username, password, isPinCodeOpen) => {
}
});
const signerPrivateKey = privateKeys.ownerKey || privateKeys.activeKey || privateKeys.postingKey
const signerPrivateKey = privateKeys.ownerKey || privateKeys.activeKey || privateKeys.postingKey;
const code = await makeHsCode(account.name, signerPrivateKey);
const scTokens = await getSCAccessToken(code);
@ -305,7 +303,7 @@ export const verifyPinCode = async (data) => {
}
if (result.length > 0) {
await refreshSCToken(userData, get(data, 'pinCode'));
await refreshSCToken(userData, get(data, 'pinCode'));
}
return true;
} catch (err) {
@ -373,7 +371,7 @@ export const getUpdatedUserData = (userData, data) => {
username: get(userData, 'username', ''),
authType: get(userData, 'authType', ''),
accessToken: encryptKey(data.accessToken, get(data, 'pinCode')),
masterKey:
get(userData, 'authType', '') === AUTH_TYPE.MASTER_KEY
? encryptKey(data.password, get(data, 'pinCode'))
@ -409,39 +407,38 @@ const isLoggedInUser = async (username) => {
* accessToken is required for all ecency api calls even for non hivesigner users.
*/
export const migrateToMasterKeyWithAccessToken = async (account, pinHash) => {
//get username, user local data from account;
const username = account.name;
const userData = account.local;
if(userData.accessToken){
if (userData.accessToken) {
//skipping migration as access token already preset;
return account;
}
//decrypt password from local data
const pinCode = getDigitPinCode(pinHash);
const password = decryptKey(userData.masterKey, pinCode)
const password = decryptKey(userData.masterKey, pinCode);
// Set private keys of user
const privateKeys = getPrivateKeys(username, password);
const signerPrivateKey = privateKeys.ownerKey || privateKeys.activeKey || privateKeys.postingKey
const signerPrivateKey = privateKeys.ownerKey || privateKeys.activeKey || privateKeys.postingKey;
const code = await makeHsCode(account.name, signerPrivateKey);
const scTokens = await getSCAccessToken(code);
await setSCAccount(scTokens);
const accessToken = scTokens.access_token;
//update data
const localData = {
...userData,
accessToken: encryptKey(accessToken, pinCode),
}
};
//update realm
await updateUserData(localData);
//return account with update local data
account.local = localData
account.local = localData;
return account;
}
};

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

@ -634,25 +634,23 @@ class ApplicationContainer extends Component {
_fetchUserDataFromDsteem = async (realmObject) => {
const { dispatch, intl, pinCode } = this.props;
try{
let accountData = await getUser(realmObject.username)
try {
let accountData = await getUser(realmObject.username);
accountData.local = realmObject;
//migration script for previously mast key based logged in user not having access token
if(realmObject.authType === AUTH_TYPE.MASTER_KEY && realmObject.accessToken === ''){
accountData = await migrateToMasterKeyWithAccessToken(accountData, pinCode)
if (realmObject.authType === AUTH_TYPE.MASTER_KEY && realmObject.accessToken === '') {
accountData = await migrateToMasterKeyWithAccessToken(accountData, pinCode);
}
dispatch(updateCurrentAccount(accountData));
this._connectNotificationServer(accountData.name);
}catch(err){
} catch (err) {
Alert.alert(
`${intl.formatMessage({ id: 'alert.fetch_error' })} \n${err.message.substr(0, 20)}`,
);
}
};
_getSettings = async () => {
@ -814,8 +812,8 @@ class ApplicationContainer extends Component {
[_currentAccount.local] = realmData;
//migreate account to use access token for master key auth type
if(realmData[0].authType === AUTH_TYPE.MASTER_KEY && realmData[0].accessToken){
_currentAccount = await migrateToMasterKeyWithAccessToken(_currentAccount, pinCode)
if (realmData[0].authType === AUTH_TYPE.MASTER_KEY && realmData[0].accessToken) {
_currentAccount = await migrateToMasterKeyWithAccessToken(_currentAccount, pinCode);
}
dispatch(updateCurrentAccount(_currentAccount));