Skip to content

feat: reupload cloud backup after email & phone change success #4512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanbinrui merged 1 commit into from
Sep 28, 2021
Merged

feat: reupload cloud backup after email & phone change success #4512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 80 additions & 15 deletions packages/dashboard/src/pages/Settings/components/dialogs/SettingEmailDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,21 @@ import { Box, Typography } from '@material-ui/core'
import { makeStyles } from '@masknet/theme'
import { UserContext } from '../../hooks/UserContext'
import { useDashboardI18N } from '../../../../locales'
import { sendCode, useLanguage, verifyCode } from '../../api'
import {
fetchBackupValue,
fetchDownloadLink,
fetchUploadLink,
sendCode,
uploadBackupValue,
useLanguage,
verifyCode,
VerifyCodeRequest,
} from '../../api'
import { emailRegexp } from '../../regexp'
import { CountdownButton, MaskTextField, useSnackbar } from '@masknet/theme'
import { Locale, Scenario, AccountType } from '../../type'
import { decryptBackup, encryptBackup } from '@masknet/backup-format'
import { encode } from '@msgpack/msgpack'

const useStyles = makeStyles()({
container: {
Expand All @@ -34,6 +45,12 @@ export default function SettingEmailDialog({ open, onClose }: SettingEmailDialog
const [invalidEmail, setInvalidEmail] = useState(false)
const [invalidCode, setInvalidCode] = useState(false)

// cloud backup
const [backupInfo, setBackupInfo] = useState({
url: '',
abstract: '',
})

const sendButton = useRef<HTMLButtonElement>(null)

const handleClose = () => {
Expand All @@ -47,34 +64,82 @@ export default function SettingEmailDialog({ open, onClose }: SettingEmailDialog
validCheck()
}
} else {
const result = await verifyCode({
const params = {
account: email,
type: AccountType.email,
code,
}).catch((err) => {
}

if (step === 0) {
return checkCloudBackup(params)
} else if (backupInfo.abstract) {
return uploadCloudBackup(params)
}

const result = await verifyCode(params).catch((err) => {
if (err.status === 400) {
// incorrect code
setInvalidCode(true)
}
})

if (result) {
if (step === 0) {
// original email verified
setEmail('')
setCode('')
setStep(1)
} else {
const msg = user.email ? t.settings_alert_email_updated() : t.settings_alert_email_set()
snackbar.enqueueSnackbar(msg, { variant: 'success' })

updateUser({ email })
onClose()
}
onSuccess()
}
}
}

const originalEmailVerified = () => {
setEmail('')
setCode('')
setStep(1)
}

const onSuccess = () => {
const msg = user.email ? t.settings_alert_email_updated() : t.settings_alert_email_set()
snackbar.enqueueSnackbar(msg, { variant: 'success' })

updateUser({ email })
onClose()
}

const checkCloudBackup = async (params: VerifyCodeRequest) => {
const res = await fetchDownloadLink(params).catch((error) => {
if (error.status === 400) {
setInvalidCode(true)
} else if (error.status === 404) {
// no cloud backup file
originalEmailVerified()
}
})

if (res) {
originalEmailVerified()
setBackupInfo({
url: res.downloadURL,
abstract: res.abstract,
})
}
}

const uploadCloudBackup = async (params: VerifyCodeRequest) => {
if (!user.email || !user.backupPassword) return

const encrypted = await fetchBackupValue(backupInfo.url)
const decrypted = await decryptBackup(encode(user.email + user.backupPassword), encrypted)
const data = await encryptBackup(encode(email + user.backupPassword), decrypted)
const uploadUrl = await fetchUploadLink({ ...params, abstract: backupInfo.abstract }).catch((error) => {
if (error.status === 400) {
setInvalidCode(true)
}
})

if (uploadUrl) {
await uploadBackupValue(uploadUrl, data)
onSuccess()
}
}

const validCheck = () => {
if (!email) return setInvalidEmail(true)

Expand Down
99 changes: 81 additions & 18 deletions packages/dashboard/src/pages/Settings/components/dialogs/SettingPhoneNumberDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,21 @@ import { Box, Typography } from '@material-ui/core'
import { makeStyles } from '@masknet/theme'
import { UserContext } from '../../hooks/UserContext'
import { useDashboardI18N } from '../../../../locales'
import { sendCode, useLanguage, verifyCode } from '../../api'
import { phoneRegexp } from '../../regexp'
import { CountdownButton, MaskTextField, useSnackbar } from '@masknet/theme'
import { Scenario, Locale, AccountType } from '../../type'
import {
fetchBackupValue,
fetchDownloadLink,
fetchUploadLink,
sendCode,
uploadBackupValue,
useLanguage,
verifyCode,
VerifyCodeRequest,
} from '../../api'
import { decryptBackup, encryptBackup } from '@masknet/backup-format'
import { encode } from '@msgpack/msgpack'

const useStyles = makeStyles()({
container: {
Expand Down Expand Up @@ -35,6 +46,12 @@ export default function SettingPhoneNumberDialog({ open, onClose }: SettingPhone
const [invalidPhone, setInvalidPhone] = useState(false)
const [invalidCode, setInvalidCode] = useState(false)

// cloud backup
const [backupInfo, setBackupInfo] = useState({
url: '',
abstract: '',
})

const sendButton = useRef<HTMLButtonElement>(null)

const handleCountryCodeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
Expand All @@ -54,34 +71,80 @@ export default function SettingPhoneNumberDialog({ open, onClose }: SettingPhone
validCheck()
}
} else {
const result = await verifyCode({
const params = {
account: countryCode + phone,
type: AccountType.phone,
code,
}).catch((err) => {
}

if (step === 0) {
return checkCloudBackup(params)
} else if (backupInfo.abstract) {
return uploadCloudBackup(params)
}

const result = await verifyCode(params).catch((err) => {
if (err.status === 400) {
// incorrect code
setInvalidCode(true)
}
})

if (result) {
if (step === 0) {
// original email verified
setCountryCode('+1')
setPhone('')
setCode('')
setStep(1)
} else {
const msg = user.phone
? t.settings_alert_phone_number_updated()
: t.settings_alert_phone_number_set()
snackbar.enqueueSnackbar(msg, { variant: 'success' })

updateUser({ phone: `${countryCode} ${phone}` })
onClose()
}
onSuccess()
}
}
}

const originalPhoneVerified = () => {
setCountryCode('+1')
setPhone('')
setCode('')
setStep(1)
}

const onSuccess = () => {
const msg = user.phone ? t.settings_alert_phone_number_updated() : t.settings_alert_phone_number_set()
snackbar.enqueueSnackbar(msg, { variant: 'success' })

updateUser({ phone: `${countryCode} ${phone}` })
onClose()
}

const checkCloudBackup = async (params: VerifyCodeRequest) => {
const res = await fetchDownloadLink(params).catch((error) => {
if (error.status === 400) {
setInvalidCode(true)
} else if (error.status === 404) {
// no cloud backup file
originalPhoneVerified()
}
})

if (res) {
originalPhoneVerified()
setBackupInfo({
url: res.downloadURL,
abstract: res.abstract,
})
}
}

const uploadCloudBackup = async (params: VerifyCodeRequest) => {
if (!user.phone || !user.backupPassword) return

const encrypted = await fetchBackupValue(backupInfo.url)
const decrypted = await decryptBackup(encode(user.phone.replace(' ', '') + user.backupPassword), encrypted)
const data = await encryptBackup(encode(countryCode + phone + user.backupPassword), decrypted)
const uploadUrl = await fetchUploadLink({ ...params, abstract: backupInfo.abstract }).catch((error) => {
if (error.status === 400) {
setInvalidCode(true)
}
})

if (uploadUrl) {
await uploadBackupValue(uploadUrl, data)
onSuccess()
}
}

Expand Down