admin/hspguard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: prettier integration

Browse Source
This commit is contained in:
Amir Adal
2025-05-29 17:17:38 +02:00
parent 83c26bb94a
commit 725cc74102
19 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/.prettierignore Normal file
View File

@ -0,0 +1,5 @@
# Ignore artifacts:
build
coverage
node_modules
public

1
web/.prettierrc Normal file
View File

@ -0,0 +1 @@
{}

16
web/README.md
View File

@ -24,31 +24,31 @@ export default tseslint.config({
languageOptions: {
// other options...
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
project: ["./tsconfig.node.json", "./tsconfig.app.json"],
tsconfigRootDir: import.meta.dirname,
},
},
})
});
```
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
```js
// eslint.config.js
import reactX from 'eslint-plugin-react-x'
import reactDom from 'eslint-plugin-react-dom'
import reactX from "eslint-plugin-react-x";
import reactDom from "eslint-plugin-react-dom";
export default tseslint.config({
plugins: {
// Add the react-x and react-dom plugins
'react-x': reactX,
'react-dom': reactDom,
"react-x": reactX,
"react-dom": reactDom,
},
rules: {
// other rules...
// Enable its recommended typescript rules
...reactX.configs['recommended-typescript'].rules,
...reactX.configs["recommended-typescript"].rules,
...reactDom.configs.recommended.rules,
},
})
});
```

24
web/eslint.config.js
View File

@ -1,28 +1,28 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'
import js from "@eslint/js";
import globals from "globals";
import reactHooks from "eslint-plugin-react-hooks";
import reactRefresh from "eslint-plugin-react-refresh";
import tseslint from "typescript-eslint";
export default tseslint.config(
{ ignores: ['dist'] },
{ ignores: ["dist"] },
{
extends: [js.configs.recommended, ...tseslint.configs.recommended],
files: ['**/*.{ts,tsx}'],
files: ["**/*.{ts,tsx}"],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
},
plugins: {
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
"react-hooks": reactHooks,
"react-refresh": reactRefresh,
},
rules: {
...reactHooks.configs.recommended.rules,
'react-refresh/only-export-components': [
'warn',
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
},
},
)
);

2
web/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />

17
web/package-lock.json generated
View File

@ -34,6 +34,7 @@
"eslint-plugin-react-refresh": "^0.4.19",
"globals": "^16.0.0",
"path": "^0.12.7",
"prettier": "3.5.3",
"sass": "^1.89.0",
"typescript": "~5.8.3",
"typescript-eslint": "^8.30.1",
@ -4262,6 +4263,22 @@
"node": ">= 0.8.0"
}
},
"node_modules/prettier": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
"integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
"dev": true,
"license": "MIT",
"bin": {
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",

1
web/package.json
View File

@ -36,6 +36,7 @@
"eslint-plugin-react-refresh": "^0.4.19",
"globals": "^16.0.0",
"path": "^0.12.7",
"prettier": "3.5.3",
"sass": "^1.89.0",
"typescript": "~5.8.3",
"typescript-eslint": "^8.30.1",

2
web/src/api/code.ts
View File

@ -13,7 +13,7 @@ export const codeApi = async (accessToken: string, nonce: string) => {
"Content-Type": "application/json",
Authorization: `Bearer ${accessToken}`,
},
}
},
);
if (response.status !== 200 && response.status !== 201)

6
web/src/api/index.ts
View File

@ -28,7 +28,7 @@ const processRefreshQueue = async (token: string | null) => {
const refreshToken = async (
accountId: string,
refreshToken: string
refreshToken: string,
): Promise<{ access: string; refresh: string }> => {
const db = useDbStore.getState().db;
const loadAccounts = useAuth.getState().loadAccounts;
@ -79,7 +79,7 @@ axios.interceptors.request.use(
try {
const { access } = await refreshToken(
account!.accountId,
account!.refresh
account!.refresh,
);
token = access;
} catch (err) {
@ -97,7 +97,7 @@ axios.interceptors.request.use(
request.headers["Authorization"] = `Bearer ${token}`;
return request;
},
(error) => Promise.reject(error)
(error) => Promise.reject(error),
);
export const handleApiError = async (response: AxiosResponse) => {

2
web/src/api/refresh.ts
View File

@ -15,7 +15,7 @@ export const refreshTokenApi = async (refreshToken: string) => {
"Content-Type": "application/json",
Authorization: `Bearer ${refreshToken}`,
},
}
},
);
if (response.status !== 200 && response.status !== 201)

2
web/src/context/oauth/provider.tsx
View File

@ -29,7 +29,7 @@ export const OAuthProvider: FC<IOAuthProvider> = ({ children }) => {
window.location.replace(`${redirectURI}?${params.toString()}`);
}
},
[active, nonce, redirectURI, state]
[active, nonce, redirectURI, state],
);
return (

2
web/src/feature/AccountList/index.tsx
View File

@ -14,7 +14,7 @@ const AccountList: FC = () => {
(account: LocalAccount) => {
updateActiveAccount(account);
},
[updateActiveAccount]
[updateActiveAccount],
);
return (

2
web/src/layout/AuthLayout.tsx
View File

@ -73,7 +73,7 @@ const AuthLayout = () => {
if (!active) {
console.log(
"setting search params:",
Object.fromEntries(searchParams.entries())
Object.fromEntries(searchParams.entries()),
);
setActive(true);
setClientID(searchParams.get("client_id") ?? "");

2
web/src/main.tsx
View File

@ -9,5 +9,5 @@ const root = document.getElementById("root")!;
createRoot(root).render(
<OAuthProvider>
<App />
</OAuthProvider>
</OAuthProvider>,
);

4
web/src/pages/Login/index.tsx
View File

@ -67,13 +67,13 @@ export default function LoginPage() {
console.log(err);
setError(
"Failed to create account. " +
(err.message ?? "Unexpected error happened")
(err.message ?? "Unexpected error happened"),
);
} finally {
setLoading(false);
}
},
[repo, reset, updateActiveAccount]
[repo, reset, updateActiveAccount],
);
return (

6
web/src/pages/Register/index.tsx
View File

@ -56,11 +56,11 @@ export default function RegisterPage() {
setError(
`Failed to create an account. ${
text[0].toUpperCase() + text.slice(1)
}`
}`,
);
} else {
setSuccess(
"Account has been created. You can now log into your new account"
"Account has been created. You can now log into your new account",
);
reset();
}
@ -71,7 +71,7 @@ export default function RegisterPage() {
setLoading(false);
}
},
[reset]
[reset],
);
return (

16
web/src/repository/account.ts
View File

@ -61,7 +61,7 @@ export const encryptToken = async (token: string) => {
const cipherText = await crypto.subtle.encrypt(
{ name: "AES-GCM", iv },
deviceKey,
encoder.encode(token)
encoder.encode(token),
);
return {
@ -84,7 +84,7 @@ export const decryptToken = async (encrypted: {
iv: new Uint8Array(encrypted.iv),
},
deviceKey,
new Uint8Array(encrypted.data)
new Uint8Array(encrypted.data),
);
return decoder.decode(decrypted);
@ -92,7 +92,7 @@ export const decryptToken = async (encrypted: {
export const saveAccount = async (
db: IDBPDatabase,
req: CreateAccountRequest
req: CreateAccountRequest,
): Promise<LocalAccount> => {
const access = await encryptToken(req.access);
const refresh = await encryptToken(req.refresh);
@ -141,7 +141,7 @@ export const getAllAccounts = async (db: IDBPDatabase) => {
} catch (err) {
console.warn(`Failed to decrypt account ${account.label}:`, err);
}
})
}),
)
).filter((acc) => acc !== undefined);
@ -186,7 +186,7 @@ export const getAccountRaw = async (db: IDBPDatabase, accountId: string) => {
export const updateAccountTokens = async (
db: IDBPDatabase,
req: UpdateAccountTokensRequest
req: UpdateAccountTokensRequest,
) => {
const account = await getAccountRaw(db, req.accountId);
@ -204,7 +204,7 @@ export const updateAccountTokens = async (
export const updateAccountInfo = async (
db: IDBPDatabase,
req: UpdateAccountInfoRequest
req: UpdateAccountInfoRequest,
) => {
const account = await getAccountRaw(db, req.accountId);
await db?.put?.("accounts", {
@ -229,7 +229,7 @@ export const useAccountRepo = () => {
return saveAccount(db, req);
},
[db]
[db],
);
const loadAll = useCallback(async () => {
@ -244,7 +244,7 @@ export const useAccountRepo = () => {
return getAccount(db, accountId);
},
[db]
[db],
);
return { save, loadAll, getOne };

4
web/src/util/deviceId.ts
View File

@ -37,7 +37,7 @@ export const deriveDeviceKey = async (deviceKeyId: string) => {
encoder.encode(deviceKeyId),
{ name: "PBKDF2" },
false,
["deriveKey"]
["deriveKey"],
);
return crypto.subtle.deriveKey(
{
@ -49,6 +49,6 @@ export const deriveDeviceKey = async (deviceKeyId: string) => {
baseKey,
{ name: "AES-GCM", length: 256 },
false,
["encrypt", "decrypt"]
["encrypt", "decrypt"],
);
};

4
web/src/util/token.ts
View File

@ -5,14 +5,14 @@ export type EncryptedToken = {
export const encryptToken = async (
token: string,
key: CryptoKey
key: CryptoKey,
): Promise<EncryptedToken> => {
const encoder = new TextEncoder();
const iv = crypto.getRandomValues(new Uint8Array(12));
const cipherText = await crypto.subtle.encrypt(
{ name: "AES-GCM", iv },
key,
encoder.encode(token)
encoder.encode(token),
);
return { cipherText, iv };
};