Skip to content
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.

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

Fix /api/auth/login endpoint #453

Closed
wants to merge 13 commits into from
Closed
3 changes: 1 addition & 2 deletions .github/workflows/cve-scanning-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
paths:
- 'package.json'
- 'package-lock.json'
- 'allow-list.json'
- '.github/workflows/cve-scanning-node.yml'

jobs:
Expand All @@ -23,4 +22,4 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm ci --prod
- run: npx --yes auditjs ossi --whitelist allow-list.json
- run: npx --yes auditjs ossi
26 changes: 13 additions & 13 deletions .github/workflows/license-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: License Validation

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
validate:
Expand All @@ -16,14 +16,14 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install node-license-validator
run: npm i -g node-license-validator
- name: Validate Server
run: |
npm install --prod
node-license-validator . --allow-licenses MIT Apache-2.0 BSD BSD-3-Clause ISC BSD-2-Clause Unlicense CC0-1.0 0BSD MIT/X11 MPL --allow-packages spdx-exceptions spdx-license-ids underscore precond password-hash
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install node-license-validator
run: npm i -g node-license-validator
- name: Validate Server
run: |
npm install --prod
node-license-validator . --allow-licenses MIT Apache-2.0 BSD BSD-3-Clause ISC BSD-2-Clause Unlicense CC0-1.0 0BSD MIT/X11 MPL --allow-packages spdx-exceptions spdx-license-ids underscore precond
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"passport": "^0.7.0",
"passport-activedirectory": "^1.0.4",
"passport-local": "^1.0.0",
"bcrypt": "^5.1.1",
"perfect-scrollbar": "^1.5.5",
"prop-types": "15.8.1",
"react": "^16.13.1",
Expand Down
2 changes: 1 addition & 1 deletion src/db/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports.createUser = async (username, password, email, gitAccount, admin
user=${username},
gitAccount=${gitAccount}
email=${email},
admin=${admin}`,
admin=${admin}`
);

const data = {
Expand Down
1 change: 1 addition & 0 deletions src/service/passport/local.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const configure = async () => {
if (!passwordCorrect) {
return cb(null, false);
}

return cb(null, user);
})
.catch((err) => {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/components/Sidebar/Sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function Sidebar(props) {
<NavLink
to={prop.layout + prop.path}
className={activePro + classes.item}
activeClassName='active'
activeclassname='active'
key={key}
style={{ textDecoration: 'none' }}
>
Expand Down
Loading