fix: fix typos

This commit is contained in:
Liyang Zhu
2022-06-06 20:07:23 +08:00
parent 2360dba7e4
commit 7e9039463c
2 changed files with 217 additions and 233 deletions
+31 -36
View File
@@ -1,12 +1,7 @@
import { createApi } from "@reduxjs/toolkit/query/react";
import { nanoid } from "@reduxjs/toolkit";
import baseQuery from "./base.query";
import {
setAuthData,
updateToken,
resetAuthData,
updateInitilize,
} from "../slices/auth.data";
import { setAuthData, updateToken, resetAuthData, updateInitialized } from "../slices/auth.data";
import BASE_URL, { KEY_DEVICE_KEY } from "../config";
const getDeviceId = () => {
let d = localStorage.getItem(KEY_DEVICE_KEY);
@@ -27,8 +22,8 @@ export const authApi = createApi({
body: {
credential: credentials,
device: getDeviceId(),
device_token: "test",
},
device_token: "test"
}
}),
transformResponse: (data) => {
const { avatar_updated_at } = data.user;
@@ -48,7 +43,7 @@ export const authApi = createApi({
} catch {
console.log("login error");
}
},
}
}),
// 更新token
renew: builder.mutation({
@@ -57,8 +52,8 @@ export const authApi = createApi({
method: "POST",
body: {
token,
refresh_token: refreshToken,
},
refresh_token: refreshToken
}
}),
async onQueryStarted(params, { dispatch, queryFulfilled }) {
try {
@@ -68,7 +63,7 @@ export const authApi = createApi({
dispatch(resetAuthData());
console.log("renew token error");
}
},
}
}),
// 更新 device token
updateDeviceToken: builder.mutation({
@@ -76,9 +71,9 @@ export const authApi = createApi({
url: "/token/device_token",
method: "PUT",
body: {
device_token,
},
}),
device_token
}
})
}),
// 获取openid
getOpenid: builder.mutation({
@@ -87,41 +82,41 @@ export const authApi = createApi({
method: "POST",
body: {
issuer,
redirect_uri,
},
}),
redirect_uri
}
})
}),
checkInviteTokenValid: builder.mutation({
query: (token) => ({
url: "user/check_invite_magic_token",
method: "POST",
body: { magic_token: token },
}),
body: { magic_token: token }
})
}),
updatePassword: builder.mutation({
query: ({ old_password, new_password }) => ({
url: "user/change_password",
method: "POST",
body: { old_password, new_password },
}),
body: { old_password, new_password }
})
}),
sendMagicLink: builder.mutation({
query: (email) => ({
url: "token/send_magic_link",
method: "POST",
body: { email },
}),
body: { email }
})
}),
getMetamaskNonce: builder.query({
query: (address) => ({
url: `/token/metamask/nonce?public_address=${address}`,
}),
url: `/token/metamask/nonce?public_address=${address}`
})
}),
getCredentials: builder.query({
query: () => ({
url: `/token/credentials`,
}),
url: `/token/credentials`
})
}),
logout: builder.query({
query: () => ({ url: `token/logout` }),
@@ -132,22 +127,22 @@ export const authApi = createApi({
} catch {
console.log("logout error");
}
},
}
}),
getInitialized: builder.query({
query: () => ({
url: `/admin/system/initialized`,
url: `/admin/system/initialized`
}),
async onQueryStarted(params, { dispatch, queryFulfilled }) {
try {
const { data: isInitized } = await queryFulfilled;
dispatch(updateInitilize(isInitized));
const { data: isInitialized } = await queryFulfilled;
dispatch(updateInitialized(isInitialized));
} catch {
console.log("api initialized error");
}
},
}),
}),
}
})
})
});
export const {
@@ -161,5 +156,5 @@ export const {
useLoginMutation,
useLazyLogoutQuery,
useCheckInviteTokenValidMutation,
useUpdatePasswordMutation,
useUpdatePasswordMutation
} = authApi;
+11 -22
View File
@@ -1,24 +1,18 @@
import { createSlice } from "@reduxjs/toolkit";
import {
KEY_PWA_INSTALLED,
KEY_REFRESH_TOKEN,
KEY_TOKEN,
KEY_UID,
KEY_EXPIRE,
} from "../config";
import { KEY_PWA_INSTALLED, KEY_REFRESH_TOKEN, KEY_TOKEN, KEY_UID, KEY_EXPIRE } from "../config";
const initialState = {
initialized: true,
uid: null,
token: localStorage.getItem(KEY_TOKEN),
expireTime: localStorage.getItem(KEY_EXPIRE) || new Date().getTime(),
refreshToken: localStorage.getItem(KEY_REFRESH_TOKEN),
refreshToken: localStorage.getItem(KEY_REFRESH_TOKEN)
};
const emptyState = {
initialized: true,
uid: null,
token: null,
expireTime: new Date().getTime(),
refreshToken: null,
refreshToken: null
};
const authDataSlice = createSlice({
name: "authData",
@@ -30,7 +24,7 @@ const authDataSlice = createSlice({
user: { uid },
token,
refresh_token,
expired_in = 0,
expired_in = 0
} = action.payload;
state.initialized = initialized;
state.uid = uid;
@@ -62,9 +56,9 @@ const authDataSlice = createSlice({
state.uid = uid;
console.log("set uid orginal");
},
updateInitilize(state, action) {
const isInitized = action.payload;
state.initialized = isInitized;
updateInitialized(state, action) {
const isInitialized = action.payload;
state.initialized = isInitialized;
},
updateToken(state, action) {
const { token, refresh_token, expired_in } = action.payload;
@@ -76,14 +70,9 @@ const authDataSlice = createSlice({
localStorage.setItem(KEY_EXPIRE, et);
localStorage.setItem(KEY_TOKEN, token);
localStorage.setItem(KEY_REFRESH_TOKEN, refresh_token);
},
},
}
}
});
export const {
updateInitilize,
setAuthData,
resetAuthData,
setUid,
updateToken,
} = authDataSlice.actions;
export const { updateInitialized, setAuthData, resetAuthData, setUid, updateToken } =
authDataSlice.actions;
export default authDataSlice.reducer;