Add 2 environments variables to set the EU servers URLs

[stache3000]

Add 2 environments variables to set the EU servers URLs (api.bitwarden.eu & identiy.bitwarden.eu)

[purejava]

Thanks for your contribution @stache3000.

What are these URLs? Is there some documentation available for these?

[stache3000]

Thanks for your contribution @stache3000.

What are these URLs? Is there some documentation available for these?

Yes, you can consult the Bitwarden API docs here : https://bitwarden.com/help/public-api/
the URLs :
https://api.bitwarden.eu
https://identity.bitwarden.eu

Regards,

[purejava]

Yes, you can consult the Bitwarden API docs here : https://bitwarden.com/help/public-api/
the URLs :
https://api.bitwarden.eu
https://identity.bitwarden.eu

Fine. You are right, we could make this configurable, eg. allow to choose between .com and .eu.
Nevertheless, your PR needs some adjustements. I'll comment your changes inline.

[purejava]

The two endpoints are currently already defined by apiUrl and identityUrl.

To make these configurable, you should:

• read these form the env, instead of creating new ones from the env
• check them with isEnvVarValid
• in case they are not valid, fall back to https://api.bitwarden.com and https://identity.bitwarden.com
• best way to do this is to use an enum with the possible 4 URL values for api and identity, com and eu for each

[purejava]

You are introducing the two new variables, but after reading them from the env, you do nothing with them / they do not have any effect on the application.

[stache3000]

They are an effects on the application.
if these news vars are valide , we set "this.apiUrl" & "this.identityUrl" with these new values (.eu) ,
so "this.bitwardenSettings" use these in following try/catch to create the "BitwardenClient".
If these news vars are invalide , we do nothing (fall back to .com)

Many others solutions exist, i have no preferences.
Without new vars (to remove envApiUrl & envIdentityUrl) we can also do this :

if (isEnvVarValid(System.getenv("BITWARDEN_API_URL")) && isEnvVarValid(System.getenv("BITWARDEN_IDENTITY_URL"))) {
    this.apiUrl = System.getenv("BITWARDEN_API_URL");
    this.identityUrl = System.getenv("BITWARDEN_IDENTITY_URL");
}

[purejava]

Ok, I overlooked, that this.apiUrl and this.identityUrl get replaced.

The final request remains: as these 4 URLs are fixed values, there is no need to check either of the two received env URLs whether it's empty or not. Better check them against the 4 possible values contained in an enum.

[purejava]

That's, what I mean:

public class BitwardenAccess implements KeychainAccessProvider {

    private static final Logger LOG = LoggerFactory.getLogger(BitwardenAccess.class);

    private final BitwardenSettings bitwardenSettings = new BitwardenSettings();
    private BitwardenClient bitwardenClient;
    private final String accessToken;
    private UUID organizationId = null;
    private final String stateFile;
    private boolean isSupported = false;
    private final String boID;
    private final String apiUrl;
    private final String identityUrl;
    private final String APP_NAME = "Cryptomator";

    public BitwardenAccess() {
        this.accessToken = System.getenv("BITWARDEN_ACCESS_TOKEN");
        this.boID = System.getenv("BITWARDEN_ORGANIZATION_ID");
        this.stateFile = System.getenv("BITWARDEN_STATE_FILE");

        var envApiUrl = System.getenv("BITWARDEN_API_URL");
        var envIdentityUrl = System.getenv("BITWARDEN_IDENTITY_URL");

        var endpoint = resolveEndpoint(envApiUrl, envIdentityUrl);

        this.apiUrl = endpoint.apiUrl;
        this.identityUrl = endpoint.identityUrl;

        if (isEnvVarValid(accessToken) && isEnvVarValid(boID)) {
            try {
                this.organizationId = UUID.fromString(boID);
                this.bitwardenSettings.setApiUrl(apiUrl);
                this.bitwardenSettings.setIdentityUrl(identityUrl);
                this.bitwardenClient = new BitwardenClient(bitwardenSettings);
                this.bitwardenClient.auth().loginAccessToken(accessToken, stateFile);
                this.isSupported = true;

            } catch (BitwardenClientException | IllegalArgumentException e) {
                LOG.error(e.toString(), e.getCause());
            }
        }
    }

    private BitwardenEndpoint resolveEndpoint(String apiUrlEnv, String identityUrlEnv) {
        if (isEnvVarValid(apiUrlEnv) && isEnvVarValid(identityUrlEnv)) {
            for (BitwardenEndpoint endpoint : BitwardenEndpoint.values()) {
                if (endpoint.apiUrl.equals(apiUrlEnv) && endpoint.identityUrl.equals(identityUrlEnv)) {
                    return endpoint;
                }
            }
            LOG.warn("Provided API/Identity URLs are invalid. Falling back to default (US).");
        } else {
            LOG.info("API/Identity URLs not set. Falling back to default (US).");
        }
        return BitwardenEndpoint.US;
    }

    private boolean isEnvVarValid(String var) {
        return var != null && !var.isEmpty() && !var.isBlank();
    }

    enum BitwardenEndpoint {
        US("https://api.bitwarden.com", "https://identity.bitwarden.com"),
        EU("https://api.bitwarden.eu", "https://identity.bitwarden.eu");

        private final String apiUrl;
        private final String identityUrl;

        BitwardenEndpoint(String apiUrl, String identityUrl) {
            this.apiUrl = apiUrl;
            this.identityUrl = identityUrl;
        }
    }
}

[stache3000]

i'm ok with this implementation.

[purejava]

Fine. Could you take over the code into your PR?

[purejava]

Thanks for bringing this up and your PR @stache3000.

Your contribution is published with release 1.0.1.