Accountcenter merge #4795
Accountcenter merge #4795
Conversation
feat(desktop): user merge: feat(desktop): google unbinding feat: add delete-user-log table fix:fix proxy oauth login fix:fix merge workorder feat:add email bind fix:fix hunger problem
Whoa! Easy there, Partner!This PR is too big. Please break it up into smaller PRs. |
🤖 Generated by lychee actionSummary
Full action output |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4795 +/- ##
=======================================
Coverage 65.45% 65.45%
=======================================
Files 8 8
Lines 660 660
=======================================
Hits 432 432
Misses 180 180
Partials 48 48 ☔ View full report in Codecov by Sentry. |
xudaotutou
force-pushed
the
accountcenter-merge
branch
from
29d0d5a to
ec7ca8c
Compare
xudaotutou
force-pushed
the
accountcenter-merge
branch
from
ec7ca8c to
36b0fb1
Compare
frontend/desktop/src/components/account/AccountCenter/BindingModifyButton.tsx
Outdated
Show resolved
Hide resolved
frontend/desktop/src/components/account/AccountCenter/DeleteAccountModal.tsx
Outdated
Show resolved
Hide resolved
| return setPagestatus(PageStatus.REMAIN_OTHER_REGION_RESOURCE); | ||
| } else if (message === RESOURCE_STATUS.INSUFFICENT_BALANCE) { | ||
| return setPagestatus(PageStatus.INSUFFICIENT_BALANCE); | ||
| } else if (message === RESOURCE_STATUS.REMAIN_WORKSACE_OWNER) { |
There was a problem hiding this comment.
写个映射吧
const RESOURCE_STATUS_PAGE_MAP = {
[RESOURCE_STATUS.REMAIN_APP]: PageStatus.REMAIN_APP,
[RESOURCE_STATUS.REMAIN_DATABASE]: PageStatus.REMAIN_DATABASE,
[RESOURCE_STATUS.REMAIN_OBJECT_STORAGE]: PageStatus.REMAIN_OBJECT_STORAGE,
[RESOURCE_STATUS.REMAIN_TEMPLATE]: PageStatus.REMAIN_TEMPLATE,
[RESOURCE_STATUS.REMAIN_OTHER_REGION_RESOURCE]: PageStatus.REMAIN_OTHER_REGION_RESOURCE,
[RESOURCE_STATUS.INSUFFICENT_BALANCE]: PageStatus.INSUFFICIENT_BALANCE,
[RESOURCE_STATUS.REMAIN_WORKSACE_OWNER]: PageStatus.REMAIN_WORKSPACE
};
frontend/desktop/src/components/account/AccountCenter/SmsModify/SmsBind.tsx
Outdated
Show resolved
Hide resolved
frontend/desktop/src/components/account/AccountCenter/SmsModify/SmsChange.tsx
Outdated
Show resolved
Hide resolved
frontend/desktop/src/components/account/AccountCenter/SmsModify/SmsUnbind.tsx
Outdated
Show resolved
Hide resolved
| import { jsonRes } from '../response'; | ||
| import { RESPONSE_MESSAGE } from '@/types/response/utils'; | ||
|
|
||
| export const ErrorHandler = |
There was a problem hiding this comment.
这个后续是不是可以改到中间件，不然每次都要写，这个方法应该通用的吧
| if (!enableGoogle()) { | ||
| throw new Error('google svc is not defined'); | ||
| } | ||
| await filterAccessToken(req, res, async ({ userUid }) => { |
No description provided.