mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 61c6ce72c8 into d2dd1796a8

Browse source
This commit is contained in:
Damien Dudognon 2025-03-05 16:04:36 +00:00 committed by GitHub
parent d2dd1796a8 61c6ce72c8
commit bde1b5bf11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/nodes-base/credentials/BitwardenApi.credentials.ts
View file

@ -51,5 +51,26 @@ export class BitwardenApi implements ICredentialType {
},
},
},
{
displayName: 'Region',
name: 'region',
type: 'options',
default: 'bitwarden.com',
options: [
{
name: 'United States',
value: 'bitwarden.com',
},
{
name: 'European Union',
value: 'bitwarden.eu',
},
],
displayOptions: {
show: {
environment: ['cloudHosted'],
},
},
},
];
}

8
packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
View file

@ -13,10 +13,10 @@ import { NodeApiError } from 'n8n-workflow';
* Return the access token URL based on the user's environment.
*/
async function getTokenUrl(this: IExecuteFunctions | ILoadOptionsFunctions) {
const { environment, domain } = await this.getCredentials('bitwardenApi');
const { environment, domain, region } = await this.getCredentials('bitwardenApi');
return environment === 'cloudHosted'
? 'https://identity.bitwarden.com/connect/token'
? `https://identity.${region}/connect/token`
: `${domain}/identity/connect/token`;
}
@ -24,9 +24,9 @@ async function getTokenUrl(this: IExecuteFunctions | ILoadOptionsFunctions) {
* Return the base API URL based on the user's environment.
*/
async function getBaseUrl(this: IExecuteFunctions | ILoadOptionsFunctions) {
const { environment, domain } = await this.getCredentials('bitwardenApi');
const { environment, domain, region } = await this.getCredentials('bitwardenApi');
return environment === 'cloudHosted' ? 'https://api.bitwarden.com' : `${domain}/api`;
return environment === 'cloudHosted' ? `https://api.${region}` : `${domain}/api`;
}
/**