sysadminix/aerbim-ht-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix / AEB-68 account type doesn't displayed correctly

Browse Source
This commit is contained in:
Timofey
2025-10-29 09:56:32 +03:00
parent 6ac5acebba
commit efc9d5c579
9 changed files with 184 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/app/(auth)/login/page.tsx
View File

@@ -51,6 +51,7 @@ const LoginPage = () => {
login: values.login,
password: values.password,
redirect: false,
role: values.role,
})
if (result?.error) {

2
frontend/components/selectors/RoleSelector.tsx
View File

@@ -26,7 +26,7 @@ interface RoleSelectorProps {
const ROLES = [
{ id: 1, value: 'engineer', label: 'Инженер' },
{ id: 2, value: 'operator', label: 'Оператор' },
{ id: 3, value: 'administrator', label: 'Администратор' },
{ id: 3, value: 'admin', label: 'Администратор' },
]
const RoleSelector: React.FC<RoleSelectorProps> = ({

23
frontend/lib/auth.ts
View File

@@ -89,6 +89,7 @@ export const authOptions: NextAuthOptions = {
credentials: {
login: { label: 'Login', type: 'text' },
password: { label: 'Password', type: 'password' },
role: { label: 'Role', type: 'text' },
},
async authorize(credentials) {
try {
@@ -99,20 +100,22 @@ export const authOptions: NextAuthOptions = {
body: JSON.stringify({
login: credentials?.login,
password: credentials?.password,
role: credentials?.role,
}),
})
const raw = await res.text()
let data: {
error?: string;
user?: {
id: string | number;
email: string;
name: string;
};
access?: string;
refresh?: string;
[key: string]: unknown
let data: {
error?: string
user?: {
id: string | number
email: string
name: string
role: string
}
access?: string
refresh?: string
[key: string]: unknown
}
try {
data = JSON.parse(raw)

17
frontend/package-lock.json generated
View File

@@ -191,7 +191,8 @@
"version": "8.33.4",
"resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-8.33.4.tgz",
"integrity": "sha512-kXNFHRpjZkq61Ddr6FR7ScVMx6NCeorOqu6wTmQnTCndCTqNTJcS6p+OHloM9BVUNXvpJFNbKN+cHPPHGOc4Pg==",
"license": "Apache-2.0"
"license": "Apache-2.0",
"peer": true
},
"node_modules/@babylonjs/loaders": {
"version": "8.33.4",
@@ -1650,6 +1651,7 @@
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
"integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
"license": "MIT",
"peer": true,
"dependencies": {
"csstype": "^3.0.2"
}
@@ -1719,6 +1721,7 @@
"integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.46.1",
"@typescript-eslint/types": "8.46.1",
@@ -2236,6 +2239,7 @@
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -2786,7 +2790,8 @@
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/damerau-levenshtein": {
"version": "1.0.8",
@@ -3186,6 +3191,7 @@
"integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.8.0",
"@eslint-community/regexpp": "^4.12.1",
@@ -3359,6 +3365,7 @@
"integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@rtsao/scc": "^1.1.0",
"array-includes": "^3.1.9",
@@ -5648,6 +5655,7 @@
"resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
"integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
"license": "MIT",
"peer": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/preact"
@@ -5681,6 +5689,7 @@
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"prettier": "bin/prettier.cjs"
},
@@ -5837,6 +5846,7 @@
"resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
"integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -5846,6 +5856,7 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
"integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"scheduler": "^0.27.0"
},
@@ -6623,6 +6634,7 @@
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=12"
},
@@ -6772,6 +6784,7 @@
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"