Merge pull request #10460 from backstage/freben/enterpriseInstanceUrl

handle trailing slashes on enterpriseInstanceUrl
This commit is contained in:
Fredrik Adelöw
2022-03-27 09:57:57 +02:00
committed by GitHub
2 changed files with 8 additions and 3 deletions
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-auth-backend': patch
---
Handle trailing slashes on GitHub `enterpriseInstanceUrl` settings
@@ -318,9 +318,9 @@ export const createGithubProvider = (
OAuthEnvironmentHandler.mapConfig(config, envConfig => {
const clientId = envConfig.getString('clientId');
const clientSecret = envConfig.getString('clientSecret');
const enterpriseInstanceUrl = envConfig.getOptionalString(
'enterpriseInstanceUrl',
);
const enterpriseInstanceUrl = envConfig
.getOptionalString('enterpriseInstanceUrl')
?.replace(/\/$/, '');
const customCallbackUrl = envConfig.getOptionalString('callbackUrl');
const authorizationUrl = enterpriseInstanceUrl
? `${enterpriseInstanceUrl}/login/oauth/authorize`