Merge pull request #519 from immobiliare/next

immobiliare · Sep 22, 2023 · 4ddfd6a · 4ddfd6a
2 parents 3f04a18 + c63e31d
commit 4ddfd6a
Show file tree

Hide file tree

Showing 15 changed files with 2,577 additions and 1,149 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 *dist*
+**/*.test.ts
diff --git a/.eslintrc b/.eslintrc
@@ -23,6 +23,10 @@
         "@typescript-eslint/no-var-requires": "off",
         "prefer-rest-params": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
-        "@typescript-eslint/ban-ts-comment": "warn"
+        "@typescript-eslint/ban-ts-comment": "warn",
+        "@typescript-eslint/no-unused-vars": [
+            "error",
+            { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
+        ]
     }
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,12 +7,14 @@ version: 2
 updates:
     - package-ecosystem: 'npm' # See documentation for possible values
       directory: '/' # Location of package manifests
+      target-branch: next
       schedule:
           interval: 'daily'
       open-pull-requests-limit: 10
 
     - package-ecosystem: 'github-actions'
       directory: '/'
+      target-branch: next
       schedule:
           interval: 'daily'
       open-pull-requests-limit: 10
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v3.0.2-alpha.0...v4.0.0-alpha.0) (2023-09-22)
+
+### Bug Fixes
+
+-   removed parentheses being rendered after LoginForm component ([1604b78](https://github.com/immobiliare/backstage-plugin-ldap-auth/commit/1604b78d51e2e556fd8c513fbd62b85bc018b5aa))
+
+### Features
+
+-   upgrade auth packages ([75f673e](https://github.com/immobiliare/backstage-plugin-ldap-auth/commit/75f673ee408cc51b610dc6dd11862a2731490372))
+
+### BREAKING CHANGES
+
+-   This upgrade breaks the types with all Backstage versions minor of 1.18
+
 ## [3.0.2-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v3.0.1...v3.0.2-alpha.0) (2023-04-18)
 
 **Note:** Version bump only for package root

diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
     "useNx": true,
     "npmClient": "yarn",
-    "version": "7.2.0"
+    "version": "4.0.0-alpha.0"
 }
diff --git a/package.json b/package.json
@@ -9,9 +9,9 @@
         "@commitlint/config-conventional": "^17.1.0",
         "@typescript-eslint/eslint-plugin": "^6.6.0",
         "@typescript-eslint/parser": "^6.1.0",
-        "eslint": "^8.23.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-prettier": "^4.2.1",
+        "eslint": "^8.49.0",
+        "eslint-config-prettier": "^9.0.0",
+        "eslint-plugin-prettier": "^5.0.0",
         "husky": "^8.0.1",
         "is-ci": "^3.0.1",
         "lerna": "^7.2.0",

diff --git a/packages/ldap-auth-backend/CHANGELOG.md b/packages/ldap-auth-backend/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v3.0.2-alpha.0...v4.0.0-alpha.0) (2023-09-22)
+
+### Features
+
+-   upgrade auth packages ([75f673e](https://github.com/immobiliare/backstage-plugin-ldap-auth/commit/75f673ee408cc51b610dc6dd11862a2731490372))
+
+### BREAKING CHANGES
+
+-   This upgrade breaks the types with all Backstage versions minor of 1.18
+
 ## [3.0.2-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v3.0.1...v3.0.2-alpha.0) (2023-04-18)
 
 **Note:** Version bump only for package @immobiliarelabs/backstage-plugin-ldap-auth-backend

diff --git a/packages/ldap-auth-backend/package.json b/packages/ldap-auth-backend/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@immobiliarelabs/backstage-plugin-ldap-auth-backend",
     "description": "Backstage LDAP Authentication plugin, this packages adds backend authentication and token generation/validation/management; sibling of @immobiliarelabs/backstage-plugin-ldap-auth",
-    "version": "3.0.2-alpha.0",
+    "version": "4.0.0-alpha.0",
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
@@ -30,7 +30,8 @@
     "dependencies": {
         "@backstage/core-plugin-api": "^1.0.3",
         "@backstage/errors": "^1.1.0",
-        "@backstage/plugin-auth-backend": "^0.18.1",
+        "@backstage/plugin-auth-backend": "^0.19.0",
+        "@backstage/plugin-auth-node": "^0.3.0",
         "keyv": "^4.3.3",
         "ldap-authentication": "^3.0.3",
         "ldap-escape": "^2.0.6",

diff --git a/packages/ldap-auth-backend/src/auth.ts b/packages/ldap-auth-backend/src/auth.ts
@@ -5,11 +5,13 @@ import type {
 } from './types';
 
 import { ProfileInfo } from '@backstage/core-plugin-api';
+import { AuthHandler } from '@backstage/plugin-auth-backend';
+
 import {
-    AuthHandler,
     AuthResolverContext,
     SignInResolver,
-} from '@backstage/plugin-auth-backend';
+} from '@backstage/plugin-auth-node';
+
 import { parseJwtPayload } from './jwt';
 
 export function prepareBackstageIdentityResponse(

diff --git a/packages/ldap-auth-backend/src/provider.test.ts b/packages/ldap-auth-backend/src/provider.test.ts
@@ -1,4 +1,4 @@
-import { AuthResolverContext } from '@backstage/plugin-auth-backend';
+import { AuthResolverContext } from '@backstage/plugin-auth-node';
 import { ProviderLdapAuthProvider } from './provider';
 import { defaultCheckUserExists, defaultLDAPAuthentication } from './ldap';
 import { defaultAuthHandler, defaultSigninResolver } from './auth';

diff --git a/packages/ldap-auth-backend/src/provider.ts b/packages/ldap-auth-backend/src/provider.ts
@@ -8,11 +8,12 @@ import type {
     UserIdentityId,
 } from './types';
 
+import { createAuthProviderIntegration } from '@backstage/plugin-auth-backend';
+
 import {
     AuthProviderRouteHandlers,
     AuthResolverContext,
-    createAuthProviderIntegration,
-} from '@backstage/plugin-auth-backend';
+} from '@backstage/plugin-auth-node';
 
 import { AuthenticationError } from '@backstage/errors';
 import { AUTH_MISSING_CREDENTIALS, JWT_INVALID_TOKEN } from './errors';

diff --git a/packages/ldap-auth-backend/src/types.ts b/packages/ldap-auth-backend/src/types.ts
@@ -94,7 +94,7 @@ export type BackstageJWTPayload = {
 };
 
 import type { TokenValidator } from './jwt';
-import type { AuthResolverContext } from '@backstage/plugin-auth-backend';
+import type { AuthResolverContext } from '@backstage/plugin-auth-node';
 import type { AuthenticationOptions } from 'ldap-authentication';
 import { defaultAuthHandler, defaultSigninResolver } from './auth';
 import { defaultCheckUserExists, defaultLDAPAuthentication } from './ldap';

diff --git a/packages/ldap-auth/CHANGELOG.md b/packages/ldap-auth/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v3.0.2-alpha.0...v4.0.0-alpha.0) (2023-09-22)
+
+### Bug Fixes
+
+-   removed parentheses being rendered after LoginForm component ([1604b78](https://github.com/immobiliare/backstage-plugin-ldap-auth/commit/1604b78d51e2e556fd8c513fbd62b85bc018b5aa))
+
 ## [3.0.2-alpha.0](https://github.com/immobiliare/backstage-plugin-ldap-auth/compare/v3.0.1...v3.0.2-alpha.0) (2023-04-18)
 
 **Note:** Version bump only for package @immobiliarelabs/backstage-plugin-ldap-auth

diff --git a/packages/ldap-auth/package.json b/packages/ldap-auth/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@immobiliarelabs/backstage-plugin-ldap-auth",
     "description": "Backstage LDAP Authentication plugin, this packages adds frontend login page and token management sibling of @immobiliarelabs/backstage-plugin-ldap-auth-backend",
-    "version": "3.0.2-alpha.0",
+    "version": "4.0.0-alpha.0",
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",