paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/backstage/backstage into master-code-14

Browse Source
This commit is contained in:
parmar-abhinav
2024-07-26 13:40:24 +05:30
parent d21d3079fc 4e2d3f330a
commit 8a2e30022f
18 changed files with 120 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/breezy-jeans-tie.md
+18
View File
@@ -0,0 +1,18 @@
---
'@backstage/plugin-auth-backend-module-cloudflare-access-provider': patch
'@backstage/plugin-auth-backend-module-vmware-cloud-provider': patch
'@backstage/plugin-auth-backend-module-atlassian-provider': patch
'@backstage/plugin-auth-backend-module-bitbucket-provider': patch
'@backstage/plugin-auth-backend-module-microsoft-provider': patch
'@backstage/plugin-auth-backend-module-onelogin-provider': patch
'@backstage/plugin-auth-backend-module-aws-alb-provider': patch
'@backstage/plugin-auth-backend-module-gcp-iap-provider': patch
'@backstage/plugin-auth-backend-module-github-provider': patch
'@backstage/plugin-auth-backend-module-gitlab-provider': patch
'@backstage/plugin-auth-backend-module-google-provider': patch
'@backstage/plugin-auth-backend-module-oauth2-provider': patch
'@backstage/plugin-auth-backend-module-oidc-provider': patch
'@backstage/plugin-auth-backend-module-okta-provider': patch
---
Add `signIn` to authentication provider configuration schema
.github/workflows/scorecard.yml
+1 -1
View File
@@ -67,6 +67,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
with:
sarif_file: results.sarif
.github/workflows/sync_snyk-monitor.yml
+1 -1
View File
@@ -58,6 +58,6 @@ jobs:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
NODE_OPTIONS: --max-old-space-size=7168
- name: Upload Snyk report
uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
with:
sarif_file: snyk.sarif
.github/workflows/verify_codeql.yml
+3 -3
View File
@@ -55,7 +55,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/init@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/autobuild@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
@@ -80,4 +80,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
uses: github/codeql-action/analyze@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
plugins/auth-backend-module-atlassian-provider/config.d.ts
Vendored
+7
View File
@@ -28,6 +28,13 @@ export interface Config {
audience?: string;
callbackUrl?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'usernameMatchingUserEntityName' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-aws-alb-provider/config.d.ts
Vendored
+6
View File
@@ -21,6 +21,12 @@ export interface Config {
awsalb?: {
issuer?: string;
region: string;
signIn?: {
resolvers: Array<
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-bitbucket-provider/config.d.ts
Vendored
+7
View File
@@ -26,6 +26,13 @@ export interface Config {
*/
clientSecret: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'userIdMatchingUserEntityAnnotation' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
Vendored
+6
View File
@@ -27,6 +27,12 @@ export interface Config {
token: string;
subject: string;
}>;
signIn?: {
resolvers: Array<
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
/**
* The backstage token expiration.
plugins/auth-backend-module-gcp-iap-provider/config.d.ts
Vendored
+9
View File
@@ -32,6 +32,15 @@ export interface Config {
* The name of the header to read the JWT token from, defaults to `'x-goog-iap-jwt-assertion'`.
*/
jwtHeader?: string;
signIn?: {
resolvers: Array<
| { resolver: 'emailMatchingUserEntityAnnotation' }
| { resolver: 'idMatchingUserEntityAnnotation' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-github-provider/config.d.ts
Vendored
+7
View File
@@ -28,6 +28,13 @@ export interface Config {
callbackUrl?: string;
enterpriseInstanceUrl?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'usernameMatchingUserEntityName' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-gitlab-provider/config.d.ts
Vendored
+7
View File
@@ -28,6 +28,13 @@ export interface Config {
audience?: string;
callbackUrl?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'usernameMatchingUserEntityName' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-google-provider/config.d.ts
Vendored
+7
View File
@@ -27,6 +27,13 @@ export interface Config {
clientSecret: string;
callbackUrl?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'emailMatchingUserEntityAnnotation' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-microsoft-provider/config.d.ts
Vendored
+7
View File
@@ -29,6 +29,13 @@ export interface Config {
domainHint?: string;
callbackUrl?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'emailMatchingUserEntityAnnotation' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-oauth2-provider/config.d.ts
Vendored
+7
View File
@@ -32,6 +32,13 @@ export interface Config {
additionalScopes?: string | string[];
disableRefresh?: boolean;
includeBasicAuth?: boolean;
signIn?: {
resolvers: Array<
| { resolver: 'usernameMatchingUserEntityName' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-oidc-provider/config.d.ts
Vendored
+6
View File
@@ -31,6 +31,12 @@ export interface Config {
tokenSignedResponseAlg?: string;
additionalScopes?: string | string[];
prompt?: string;
signIn?: {
resolvers: Array<
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-okta-provider/config.d.ts
Vendored
+7
View File
@@ -30,6 +30,13 @@ export interface Config {
idp?: string;
callbackUrl?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'emailMatchingUserEntityAnnotation' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-onelogin-provider/config.d.ts
Vendored
+7
View File
@@ -27,6 +27,13 @@ export interface Config {
clientSecret: string;
issuer: string;
callbackUrl?: string;
signIn?: {
resolvers: Array<
| { resolver: 'usernameMatchingUserEntityName' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};
plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
Vendored
+7
View File
@@ -25,6 +25,13 @@ export interface Config {
scope?: string;
consoleEndpoint?: string;
additionalScopes?: string | string[];
signIn?: {
resolvers: Array<
| { resolver: 'profileEmailMatchingUserEntityEmail' }
| { resolver: 'emailLocalPartMatchingUserEntityName' }
| { resolver: 'emailMatchingUserEntityProfileEmail' }
>;
};
};
};
};