Skip to content

Commit 4aab7c1

Browse files
antoniomusoantoniomuso
authored
Merge pull request #824 from immobiliare/next
Next
2 parents cbe5f23 + 536fe91 commit 4aab7c1

File tree

9 files changed

+134
-40
lines changed

9 files changed

+134
-40
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.3.1-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v4.3.0...v4.3.1-alpha.0) (2024-10-18)
7+
8+
### Bug Fixes
9+
10+
- password printed in console ([e58c353](https://github.com/immobiliare/backstage-plugin-ldap-auth/commit/e58c3539a784909284f56b91740720f95b43f61f))
11+
612
# [4.3.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v4.3.0-alpha.1...v4.3.0) (2024-07-23)
713

814
**Note:** Version bump only for package root

‎app-config.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
app:
2+
title: Backstage Example App
3+
baseUrl: http://localhost:3000
4+
#datadogRum:
5+
# clientToken: '123456789'
6+
# applicationId: qwerty
7+
# site: # datadoghq.eu default = datadoghq.com
8+
# env: # optional
9+
support:
10+
url: https://github.com/backstage/backstage/issues # Used by common ErrorPage
11+
items: # Used by common SupportButton component
12+
- title: Issues
13+
icon: github
14+
links:
15+
- url: https://github.com/backstage/backstage/issues
16+
title: GitHub Issues
17+
- title: Discord Chatroom
18+
icon: chat
19+
links:
20+
- url: https://discord.gg/MUpMjP2
21+
title: '#backstage'
22+
23+
backend:
24+
# Used for enabling authentication, secret is shared by all backend plugins
25+
# See https://backstage.io/docs/tutorials/backend-to-backend-auth for
26+
# information on the format
27+
# auth:
28+
# keys:
29+
# - secret: ${BACKEND_SECRET}
30+
baseUrl: http://localhost:7007
31+
listen:
32+
port: 7007
33+
database:
34+
client: better-sqlite3
35+
connection: ':memory:'
36+
cache:
37+
store: memory
38+
cors:
39+
origin: http://localhost:3000
40+
methods: [GET, HEAD, PATCH, POST, PUT, DELETE]
41+
credentials: true
42+
csp:
43+
connect-src: ["'self'", 'http:', 'https:']
44+
# Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference
45+
# Default Helmet Content-Security-Policy values can be removed by setting the key to false
46+
reading:
47+
allow:
48+
- host: example.com
49+
- host: '*.mozilla.org'
50+
- host: gitlab.com
51+
# workingDirectory: /tmp # Use this to configure a working directory for the scaffolder, defaults to the OS temp-dir
52+
53+
integrations:
54+
gitlab:
55+
- host: gitlab.com

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
33
"npmClient": "yarn",
4-
"version": "4.3.0"
4+
"version": "4.3.1-alpha.0"
55
}

‎packages/ldap-auth-backend/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.3.1-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v4.3.0...v4.3.1-alpha.0) (2024-10-18)
7+
8+
**Note:** Version bump only for package @immobiliarelabs/backstage-plugin-ldap-auth-backend
9+
610
# [4.3.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v4.3.0-alpha.1...v4.3.0) (2024-07-23)
711

812
**Note:** Version bump only for package @immobiliarelabs/backstage-plugin-ldap-auth-backend

‎packages/ldap-auth-backend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@immobiliarelabs/backstage-plugin-ldap-auth-backend",
33
"description": "Backstage LDAP Authentication plugin, this packages adds backend authentication and token generation/validation/management; sibling of @immobiliarelabs/backstage-plugin-ldap-auth",
4-
"version": "4.3.0",
4+
"version": "4.3.1-alpha.0",
55
"main": "dist/index.cjs.js",
66
"types": "dist/index.d.ts",
77
"license": "MIT",

‎packages/ldap-auth/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.3.1-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v4.3.0...v4.3.1-alpha.0) (2024-10-18)
7+
8+
### Bug Fixes
9+
10+
- password printed in console ([e58c353](https://github.com/immobiliare/backstage-plugin-ldap-auth/commit/e58c3539a784909284f56b91740720f95b43f61f))
11+
612
# [4.3.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v4.3.0-alpha.1...v4.3.0) (2024-07-23)
713

814
**Note:** Version bump only for package @immobiliarelabs/backstage-plugin-ldap-auth

‎packages/ldap-auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@immobiliarelabs/backstage-plugin-ldap-auth",
33
"description": "Backstage LDAP Authentication plugin, this packages adds frontend login page and token management sibling of @immobiliarelabs/backstage-plugin-ldap-auth-backend",
4-
"version": "4.3.0",
4+
"version": "4.3.1-alpha.0",
55
"main": "dist/index.esm.js",
66
"types": "dist/index.d.ts",
77
"license": "MIT",

‎packages/ldap-auth/src/components/LoginPage/Form.tsx‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -93,42 +93,47 @@ export const LoginForm = ({
9393
<Content>
9494
<Container maxWidth="sm">
9595
<Paper elevation={4} className={classes.paper}>
96-
<TextField
97-
required
98-
label={usernameLabel || 'LDAP Name'}
99-
onChange={(e) => setUsername(e.target.value)}
100-
value={username}
101-
id="username"
102-
error={uError}
103-
helperText={helperTextUsername}
104-
fullWidth
105-
size="small"
106-
margin="dense"
107-
/>
108-
<TextField
109-
required
110-
label="Password"
111-
onChange={(e) => setPassword(e.target.value)}
112-
value={password}
113-
id="password"
114-
type="password"
115-
error={pError}
116-
helperText={helperTextPassword}
117-
fullWidth
118-
size="small"
119-
margin="dense"
120-
/>
121-
<Button
122-
variant="contained"
123-
color="primary"
124-
size="large"
125-
fullWidth
126-
onClick={onClick}
127-
type="submit"
128-
style={{ marginTop: 16 }}
129-
>
130-
Login
131-
</Button>
96+
<form onSubmit={(e) => e.preventDefault()}>
97+
<TextField
98+
required
99+
label={usernameLabel || 'LDAP Name'}
100+
onChange={(e) => setUsername(e.target.value)}
101+
value={username}
102+
type="username"
103+
autoComplete="username"
104+
id="username"
105+
error={uError}
106+
helperText={helperTextUsername}
107+
fullWidth
108+
size="small"
109+
margin="dense"
110+
/>
111+
<TextField
112+
required
113+
label="Password"
114+
onChange={(e) => setPassword(e.target.value)}
115+
value={password}
116+
id="password"
117+
type="password"
118+
autoComplete="password"
119+
error={pError}
120+
helperText={helperTextPassword}
121+
fullWidth
122+
size="small"
123+
margin="dense"
124+
/>
125+
<Button
126+
variant="contained"
127+
color="primary"
128+
size="large"
129+
fullWidth
130+
onClick={onClick}
131+
type="submit"
132+
style={{ marginTop: 16 }}
133+
>
134+
Login
135+
</Button>
136+
</form>
132137
</Paper>
133138
</Container>
134139
</Content>

‎yarn.lock‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6477,6 +6477,13 @@ __metadata:
64776477
languageName: node
64786478
linkType: hard
64796479

6480+
"@remix-run/router@npm:1.20.0":
6481+
version: 1.20.0
6482+
resolution: "@remix-run/router@npm:1.20.0"
6483+
checksum: 10/e1d2420db94a1855b97f1784898d0ae389cf3b77129b8f419e51d4833b77ca2c92ac09e2cb558015324d64580a138fd6faa31e52fcc3ba90e3cc382a1a324d4a
6484+
languageName: node
6485+
linkType: hard
6486+
64806487
"@rollup/plugin-commonjs@npm:^25.0.0":
64816488
version: 25.0.8
64826489
resolution: "@rollup/plugin-commonjs@npm:25.0.8"
@@ -22832,7 +22839,7 @@ __metadata:
2283222839
languageName: node
2283322840
linkType: hard
2283422841

22835-
"react-router@npm:6.25.1, react-router@npm:^6.4.5":
22842+
"react-router@npm:6.25.1":
2283622843
version: 6.25.1
2283722844
resolution: "react-router@npm:6.25.1"
2283822845
dependencies:
@@ -22843,6 +22850,17 @@ __metadata:
2284322850
languageName: node
2284422851
linkType: hard
2284522852

22853+
"react-router@npm:^6.4.5":
22854+
version: 6.27.0
22855+
resolution: "react-router@npm:6.27.0"
22856+
dependencies:
22857+
"@remix-run/router": "npm:1.20.0"
22858+
peerDependencies:
22859+
react: ">=16.8"
22860+
checksum: 10/352e3af2075cdccf9d114b7e06d94a1b46a2147ba9d6e8643787a92464f5fd9ead950252a98d551f99f21860288bcf3a4f088cb5f46b28d1274a4e2ba24cc0f9
22861+
languageName: node
22862+
linkType: hard
22863+
2284622864
"react-side-effect@npm:^2.1.0":
2284722865
version: 2.1.2
2284822866
resolution: "react-side-effect@npm:2.1.2"

0 commit comments

Comments
 (0)