From 82eefed9b7f883782bfa9a2b0d1513c745df2d87 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Mon, 21 Aug 2023 15:02:48 +0200 Subject: [PATCH 01/15] Java wrapper for SDK --- .github/workflows/generate_schemas.yml | 11 +- .gitignore | 1 + .vscode/tasks.json | 13 +- languages/java/.gitignore | 2 + languages/java/pom.xml | 138 ++++++++ .../main/java/bit/sdk/BitwardenClient.java | 328 ++++++++++++++++++ .../main/java/bit/sdk/BitwardenLibrary.java | 13 + .../main/java/bit/sdk/ThrowingFunction.java | 7 + .../java/src/main/java/bit/sdk/Wrapper.java | 22 ++ support/scripts/schemas.ts | 19 +- 10 files changed, 550 insertions(+), 4 deletions(-) create mode 100644 languages/java/.gitignore create mode 100644 languages/java/pom.xml create mode 100644 languages/java/src/main/java/bit/sdk/BitwardenClient.java create mode 100644 languages/java/src/main/java/bit/sdk/BitwardenLibrary.java create mode 100644 languages/java/src/main/java/bit/sdk/ThrowingFunction.java create mode 100644 languages/java/src/main/java/bit/sdk/Wrapper.java diff --git a/.github/workflows/generate_schemas.yml b/.github/workflows/generate_schemas.yml index a391cfb83..85183580d 100644 --- a/.github/workflows/generate_schemas.yml +++ b/.github/workflows/generate_schemas.yml @@ -21,7 +21,7 @@ jobs: toolchain: stable - name: Set up Node - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 + uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 with: cache: "npm" cache-dependency-path: "package-lock.json" @@ -31,7 +31,7 @@ jobs: run: npm ci - name: Cache cargo registry - uses: Swatinem/rust-cache@e207df5d269b42b69c8bc5101da26f7d31feddb4 # v2.6.2 + uses: Swatinem/rust-cache@b8a6852b4f997182bdea832df3f9e153038b5191 # v2.6.0 - name: NPM Schemas run: npm run schemas @@ -63,3 +63,10 @@ jobs: name: sdk-schemas-json path: ${{ github.workspace }}/support/schemas/* if-no-files-found: error + + - name: Upload java schemas artifact + uses: actions/upload-artifact@ #TODO + with: + name: sdk-schemas-java + path: ${{ github.workspace }}/languages/java/src/main/java/bit/sdk/schema/* + if-no-files-found: error \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9e450f9ab..13b704738 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts languages/csharp/schemas.cs languages/js_webassembly/bitwarden_client/schemas.ts languages/python/BitwardenClient/schemas.py +languages/java/src/main/java/bit/sdk/schema \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 491d770c9..1b86d4a8f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -46,6 +46,17 @@ "options": { "cwd": "${workspaceFolder}/languages/python" } - } + }, + { + "label": "buildJava", + "type": "shell", + "command": "mvn", + "args": [ + "clean", + "install" + ], + "dependsOrder": "sequence", + "dependsOn": ["rust: bitwarden-c build"] + } ] } diff --git a/languages/java/.gitignore b/languages/java/.gitignore new file mode 100644 index 000000000..c5078494e --- /dev/null +++ b/languages/java/.gitignore @@ -0,0 +1,2 @@ +target +.idea diff --git a/languages/java/pom.xml b/languages/java/pom.xml new file mode 100644 index 000000000..5c08781d1 --- /dev/null +++ b/languages/java/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + bit.sdk + JavaWrapper + 1.0-SNAPSHOT + + + 11 + 11 + UTF-8 + + + + + com.fasterxml.jackson.core + jackson-core + 2.9.10 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.9.10 + + + net.java.dev.jna + jna-platform + 5.12.1 + + + + + + + maven-resources-plugin + 3.3.1 + + + copy-resources + validate + + copy-resources + + + ${project.build.outputDirectory} + + + ../../target/debug + + libbitwarden_c*.dylib + libbitwarden_c*.so + bitwarden_c*.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/java/src/main/java/bit/sdk/BitwardenClient.java b/languages/java/src/main/java/bit/sdk/BitwardenClient.java new file mode 100644 index 000000000..1bfdd0162 --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/BitwardenClient.java @@ -0,0 +1,328 @@ +package bit.sdk; + +import bit.sdk.schema.APIKeyLoginRequest; +import bit.sdk.schema.AccessTokenLoginRequest; +import bit.sdk.schema.ClientSettings; +import bit.sdk.schema.Command; +import bit.sdk.schema.Converter; +import bit.sdk.schema.FingerprintRequest; +import bit.sdk.schema.PasswordLoginRequest; +import bit.sdk.schema.ResponseForAPIKeyLoginResponse; +import bit.sdk.schema.ResponseForFingerprintResponse; +import bit.sdk.schema.ResponseForPasswordLoginResponse; +import bit.sdk.schema.ResponseForSecretIdentifiersResponse; +import bit.sdk.schema.ResponseForSecretResponse; +import bit.sdk.schema.ResponseForSecretsDeleteResponse; +import bit.sdk.schema.ResponseForSyncResponse; +import bit.sdk.schema.ResponseForUserAPIKeyResponse; +import bit.sdk.schema.SecretCreateRequest; +import bit.sdk.schema.SecretGetRequest; +import bit.sdk.schema.SecretIdentifiersRequest; +import bit.sdk.schema.SecretPutRequest; +import bit.sdk.schema.SecretVerificationRequest; +import bit.sdk.schema.SecretsCommand; +import bit.sdk.schema.SecretsDeleteRequest; +import bit.sdk.schema.SyncRequest; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.sun.jna.Native; +import com.sun.jna.Pointer; +import java.util.UUID; +import java.util.function.Function; + +public class BitwardenClient implements AutoCloseable { + + private static Function throwingFunctionWrapper(ThrowingFunction throwingFunction) { + + return i -> { + try { + return throwingFunction.accept(i); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + }; + } + + private Pointer client; + + private BitwardenLibrary library; + + private boolean isClientOpen; + + public BitwardenClient(ClientSettings clientSettings) throws JsonProcessingException { + System.setProperty("jna.library.path", System.getProperty("user.dir") + "/libs"); + library = Native.load("bitwarden_c", BitwardenLibrary.class); + client = library.init(Converter.ClientSettingsToJsonString(clientSettings)); + isClientOpen = true; + } + + public ResponseForPasswordLoginResponse passwordLogin(String email, String password) { + Command command = new Command(); + PasswordLoginRequest passwordLoginRequest = new PasswordLoginRequest(); + passwordLoginRequest.setEmail(email); + passwordLoginRequest.setPassword(password); + command.setPasswordLogin(passwordLoginRequest); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForPasswordLoginResponseFromJsonString)); + } + + public ResponseForAPIKeyLoginResponse apiKeyLogin(String clientId, String clientSecret, String password) { + Command command = new Command(); + APIKeyLoginRequest apiKeyLoginRequest = new APIKeyLoginRequest(); + apiKeyLoginRequest.setClientID(clientId); + apiKeyLoginRequest.setClientSecret(clientSecret); + apiKeyLoginRequest.setPassword(password); + command.setAPIKeyLogin(apiKeyLoginRequest); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForAPIKeyLoginResponseFromJsonString)); + } + + public ResponseForAPIKeyLoginResponse accessTokenLogin(String accessToken) { + Command command = new Command(); + AccessTokenLoginRequest accessTokenLoginRequest = new AccessTokenLoginRequest(); + accessTokenLoginRequest.setAccessToken(accessToken); + command.setAccessTokenLogin(accessTokenLoginRequest); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForAPIKeyLoginResponseFromJsonString)); + } + + public ResponseForUserAPIKeyResponse userApiKey(String password) { + Command command = new Command(); + SecretVerificationRequest secretVerificationRequest = new SecretVerificationRequest(); + secretVerificationRequest.setMasterPassword(password); + command.setGetUserAPIKey(secretVerificationRequest); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForUserAPIKeyResponseFromJsonString)); + } + + public ResponseForFingerprintResponse fingerprint(String fingerprintMaterial, String publicKey) { + Command command = new Command(); + FingerprintRequest fingerprintRequest = new FingerprintRequest(); + fingerprintRequest.setFingerprintMaterial(fingerprintMaterial); + fingerprintRequest.setPublicKey(publicKey); + command.setFingerprint(fingerprintRequest); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForFingerprintResponseFromJsonString)); + } + + public ResponseForSyncResponse sync(Boolean excludeSubdomains) { + Command command = new Command(); + SyncRequest syncRequest = new SyncRequest(); + syncRequest.setExcludeSubdomains(excludeSubdomains); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForSyncResponseFromJsonString)); + } + + public ResponseForSecretResponse getSecret(UUID id) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretGetRequest secretGetRequest = new SecretGetRequest(); + secretGetRequest.setID(id); + secretsCommand.setGet(secretGetRequest); + command.setSecrets(secretsCommand); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + } + + public ResponseForSecretResponse createSecret(String key, String value, String note, UUID organizationId, + UUID[] projectIds) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretCreateRequest secretCreateRequest = new SecretCreateRequest(); + secretCreateRequest.setKey(key); + secretCreateRequest.setValue(value); + secretCreateRequest.setNote(note); + secretCreateRequest.setOrganizationID(organizationId); + secretCreateRequest.setProjectIDS(projectIds); + secretsCommand.setCreate(secretCreateRequest); + command.setSecrets(secretsCommand); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + } + + public ResponseForSecretResponse updateSecret(UUID id, String key, String value, String note, UUID organizationId, + UUID[] projectIds) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretPutRequest secretPutRequest = new SecretPutRequest(); + secretPutRequest.setID(id); + secretPutRequest.setKey(key); + secretPutRequest.setValue(value); + secretPutRequest.setNote(note); + secretPutRequest.setOrganizationID(organizationId); + secretPutRequest.setProjectIDS(projectIds); + secretsCommand.setUpdate(secretPutRequest); + command.setSecrets(secretsCommand); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + } + + public ResponseForSecretsDeleteResponse deleteSecrets(UUID[] ids) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretsDeleteRequest secretsDeleteRequest = new SecretsDeleteRequest(); + secretsDeleteRequest.setIDS(ids); + secretsCommand.setDelete(secretsDeleteRequest); + command.setSecrets(secretsCommand); + return runCommand(command, throwingFunctionWrapper(Converter::ResponseForSecretsDeleteResponseFromJsonString)); + } + + public ResponseForSecretIdentifiersResponse listSecrets(UUID organizationId) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretIdentifiersRequest secretIdentifiersRequest = new SecretIdentifiersRequest(); + secretIdentifiersRequest.setOrganizationID(organizationId); + secretsCommand.setList(secretIdentifiersRequest); + command.setSecrets(secretsCommand); + return runCommand(command, + throwingFunctionWrapper(Converter::ResponseForSecretIdentifiersResponseFromJsonString)); + } + +// public ResponseForProjectResponse getProject(UUID id) { +// Command command = new Command(); +// ProjectsCommand projectsCommand = new ProjectsCommand(); +// ProjectGetRequest projectGetRequest = new ProjectGetRequest(); +// projectGetRequest.setID(id); +// projectsCommand.setGet(projectGetRequest); +// command.setProjects(projectsCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); +// } +// +// public ResponseForProjectResponse createProject(UUID organizationId, String name) { +// Command command = new Command(); +// ProjectsCommand projectsCommand = new ProjectsCommand(); +// ProjectCreateRequest projectCreateRequest = new ProjectCreateRequest(); +// projectCreateRequest.setOrganizationID(organizationId); +// projectCreateRequest.setName(name); +// projectsCommand.setCreate(projectCreateRequest); +// command.setProjects(projectsCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); +// } +// +// public ResponseForProjectResponse updateProject(UUID id, UUID organizationId, String name) { +// Command command = new Command(); +// ProjectsCommand projectsCommand = new ProjectsCommand(); +// ProjectPutRequest projectPutRequest = new ProjectPutRequest(); +// projectPutRequest.setID(id); +// projectPutRequest.setOrganizationID(organizationId); +// projectPutRequest.setName(name); +// projectsCommand.setUpdate(projectPutRequest); +// command.setProjects(projectsCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); +// } +// +// public ResponseForProjectsDeleteResponse deleteProjects(UUID[] ids) { +// Command command = new Command(); +// ProjectsCommand projectsCommand = new ProjectsCommand(); +// ProjectsDeleteRequest projectsDeleteRequest = new ProjectsDeleteRequest(); +// projectsDeleteRequest.setIDS(ids); +// projectsCommand.setDelete(projectsDeleteRequest); +// command.setProjects(projectsCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForProjectsDeleteResponseFromJsonString)); +// } +// +// public ResponseForProjectsResponse listProjects(UUID organizationId) { +// Command command = new Command(); +// ProjectsCommand projectsCommand = new ProjectsCommand(); +// ProjectsListRequest projectsListRequeste = new ProjectsListRequest(); +// projectsListRequeste.setOrganizationID(organizationId); +// projectsCommand.setList(projectsListRequeste); +// command.setProjects(projectsCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForProjectsResponseFromJsonString)); +// } +// +// public String mobileKdf(String email, String password, Kdf kdf) { +// Command command = new Command(); +// MobileCommand mobileCommand = new MobileCommand(); +// MobileKdfCommand mobileKdfCommand = new MobileKdfCommand(); +// PasswordHashRequest passwordHashRequest = new PasswordHashRequest(); +// passwordHashRequest.setEmail(email); +// passwordHashRequest.setPassword(password); +// passwordHashRequest.setKdfParams(kdf); +// mobileKdfCommand.setHashPassword(passwordHashRequest); +// mobileCommand.setKdf(mobileKdfCommand); +// command.setMobile(mobileCommand); +// return runCommand(command, s -> s); +// } +// +// public String mobileCrypto(String email, String password, Kdf kdf, String userKey, String privateKey, +// Map organizationalKeys) { +// Command command = new Command(); +// MobileCommand mobileCommand = new MobileCommand(); +// MobileCryptoCommand mobileCryptoCommand = new MobileCryptoCommand(); +// InitCryptoRequest initCryptoRequest = new InitCryptoRequest(); +// initCryptoRequest.setEmail(email); +// initCryptoRequest.setPassword(password); +// initCryptoRequest.setKdfParams(kdf); +// initCryptoRequest.setUserKey(userKey); +// initCryptoRequest.setPrivateKey(privateKey); +// initCryptoRequest.setOrganizationKeys(organizationalKeys); +// mobileCryptoCommand.setInitCrypto(initCryptoRequest); +// mobileCommand.setCrypto(mobileCryptoCommand); +// command.setMobile(mobileCommand); +// return runCommand(command, s -> s); +// } +// +// public ResponseForFolderEncryptResponse mobileFolderEncrypt(UUID id) { +// Command command = new Command(); +// MobileCommand mobileCommand = new MobileCommand(); +// MobileVaultCommand mobileVaultCommand = new MobileVaultCommand(); +// MobileFoldersCommand mobileFoldersCommand = new MobileFoldersCommand(); +// FolderEncryptRequest folderEncryptRequest = new FolderEncryptRequest(); +// FolderView folderView = new FolderView(); +// folderView.setID(id); +// folderEncryptRequest.setFolder(folderView); +// mobileFoldersCommand.setEncrypt(folderEncryptRequest); +// mobileVaultCommand.setFolders(mobileFoldersCommand); +// mobileCommand.setVault(mobileVaultCommand); +// command.setMobile(mobileCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForFolderEncryptResponseFromJsonString)); +// } +// +// public ResponseForFolderDecryptResponse mobileFolderDecrypt(UUID id) { +// Command command = new Command(); +// MobileCommand mobileCommand = new MobileCommand(); +// MobileVaultCommand mobileVaultCommand = new MobileVaultCommand(); +// MobileFoldersCommand mobileFoldersCommand = new MobileFoldersCommand(); +// FolderDecryptRequest folderDecryptRequest = new FolderDecryptRequest(); +// Folder folder = new Folder(); +// folder.setID(id); +// folderDecryptRequest.setFolder(folder); +// mobileFoldersCommand.setDecrypt(folderDecryptRequest); +// mobileVaultCommand.setFolders(mobileFoldersCommand); +// mobileCommand.setVault(mobileVaultCommand); +// command.setMobile(mobileCommand); +// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForFolderDecryptResponseFromJsonString)); +// } +// +// public ResponseForFolderDecryptListResponse mobileFolderDecryptList(UUID[] ids) { +// Command command = new Command(); +// MobileCommand mobileCommand = new MobileCommand(); +// MobileVaultCommand mobileVaultCommand = new MobileVaultCommand(); +// MobileFoldersCommand mobileFoldersCommand = new MobileFoldersCommand(); +// FolderDecryptListRequest folderDecryptListRequest = new FolderDecryptListRequest(); +// +// Folder[] folders = (Folder[]) Arrays.stream(ids) +// .map(id -> { +// Folder folder = new Folder(); +// folder.setID(id); +// return folder; +// }) +// .collect(Collectors.toList()).toArray(); +// folderDecryptListRequest.setFolders(folders); +// mobileFoldersCommand.setDecryptList(folderDecryptListRequest); +// mobileVaultCommand.setFolders(mobileFoldersCommand); +// mobileCommand.setVault(mobileVaultCommand); +// command.setMobile(mobileCommand); +// return runCommand(command, +// throwingFunctionWrapper(Converter::ResponseForFolderDecryptListResponseFromJsonString)); +// } + + private T runCommand(Command command, Function deserializer) { + String response = null; + try { + response = library.run_command(Converter.CommandToJsonString(command), client); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + return deserializer.apply(response); + } + + @Override + public void close() { + if (isClientOpen) { + library.free_mem(client); + isClientOpen = false; + } + } +} diff --git a/languages/java/src/main/java/bit/sdk/BitwardenLibrary.java b/languages/java/src/main/java/bit/sdk/BitwardenLibrary.java new file mode 100644 index 000000000..64647da5a --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/BitwardenLibrary.java @@ -0,0 +1,13 @@ +package bit.sdk; + +import com.sun.jna.Library; +import com.sun.jna.Pointer; + +public interface BitwardenLibrary extends Library { + + Pointer init(String clientSettings); + + void free_mem(Pointer client); + + String run_command(String command, Pointer client); +} diff --git a/languages/java/src/main/java/bit/sdk/ThrowingFunction.java b/languages/java/src/main/java/bit/sdk/ThrowingFunction.java new file mode 100644 index 000000000..41a2f68f0 --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/ThrowingFunction.java @@ -0,0 +1,7 @@ +package bit.sdk; + +@FunctionalInterface +public interface ThrowingFunction { + + R accept(T t) throws E; +} diff --git a/languages/java/src/main/java/bit/sdk/Wrapper.java b/languages/java/src/main/java/bit/sdk/Wrapper.java new file mode 100644 index 000000000..fee93f73c --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/Wrapper.java @@ -0,0 +1,22 @@ +package bit.sdk; + +import bit.sdk.schema.ClientSettings; +import bit.sdk.schema.DeviceType; +import bit.sdk.schema.ResponseForPasswordLoginResponse; +import com.fasterxml.jackson.core.JsonProcessingException; + +public class Wrapper { + + public static void main(String[] args) throws JsonProcessingException { + ClientSettings clientSettings = new ClientSettings(); + clientSettings.setAPIURL("https://api.bitwarden.com"); + clientSettings.setIdentityURL("https://identity.bitwarden.com"); + clientSettings.setDeviceType(DeviceType.SDK); + clientSettings.setUserAgent("Bitwarden SDK"); + BitwardenClient bitwardenClient = new BitwardenClient(clientSettings); + ResponseForPasswordLoginResponse passwordLoginResponse = bitwardenClient.passwordLogin( + "user@something.com", + "Pass"); + bitwardenClient.close(); + } +} diff --git a/support/scripts/schemas.ts b/support/scripts/schemas.ts index f5d5bce4e..413b6af1d 100644 --- a/support/scripts/schemas.ts +++ b/support/scripts/schemas.ts @@ -1,4 +1,4 @@ -import { quicktype, InputData, JSONSchemaInput, FetchingJSONSchemaStore } from "quicktype-core"; +import { quicktype, quicktypeMultiFile, InputData, JSONSchemaInput, FetchingJSONSchemaStore } from "quicktype-core"; import fs from "fs"; import path from "path"; @@ -62,6 +62,23 @@ async function main() { }); writeToFile("./languages/csharp/schemas.cs", csharp.lines); + + const java = await quicktypeMultiFile({ + inputData, + lang: "java", + rendererOptions: { + package: "bit.sdk.schema", + "java-version": "11", + }, + }); + + const javaDir = "./languages/java/src/main/java/bit/sdk/schema/"; + if (!fs.existsSync(javaDir)) { + fs.mkdirSync(javaDir); + } + java.forEach((file, path) => { + writeToFile(javaDir + path, file.lines); + }) } main(); From 36d6620bbd58832103eb82154db99b545fa7e935 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Tue, 22 Aug 2023 15:21:58 +0200 Subject: [PATCH 02/15] split projects and secrets from the main client --- crates/sdk-schemas/src/main.rs | 2 +- .../main/java/bit/sdk/BitwardenClient.java | 288 +----------------- .../src/main/java/bit/sdk/CommandRunner.java | 42 +++ .../java/src/main/java/bit/sdk/Projects.java | 83 +++++ .../java/src/main/java/bit/sdk/Secrets.java | 91 ++++++ .../java/src/main/java/bit/sdk/Wrapper.java | 44 ++- 6 files changed, 273 insertions(+), 277 deletions(-) create mode 100644 languages/java/src/main/java/bit/sdk/CommandRunner.java create mode 100644 languages/java/src/main/java/bit/sdk/Projects.java create mode 100644 languages/java/src/main/java/bit/sdk/Secrets.java diff --git a/crates/sdk-schemas/src/main.rs b/crates/sdk-schemas/src/main.rs index 51b881cf1..d532f1715 100644 --- a/crates/sdk-schemas/src/main.rs +++ b/crates/sdk-schemas/src/main.rs @@ -103,7 +103,7 @@ fn main() -> Result<()> { bitwarden::secrets_manager::secrets::SecretResponse, bitwarden::secrets_manager::secrets::SecretsDeleteResponse, bitwarden::secrets_manager::projects::ProjectResponse, - bitwarden::secrets_manager::projects::ProjectResponse, + bitwarden::secrets_manager::projects::ProjectsResponse, bitwarden::secrets_manager::projects::ProjectsDeleteResponse, }; diff --git a/languages/java/src/main/java/bit/sdk/BitwardenClient.java b/languages/java/src/main/java/bit/sdk/BitwardenClient.java index 1bfdd0162..bd859a49b 100644 --- a/languages/java/src/main/java/bit/sdk/BitwardenClient.java +++ b/languages/java/src/main/java/bit/sdk/BitwardenClient.java @@ -1,37 +1,18 @@ package bit.sdk; -import bit.sdk.schema.APIKeyLoginRequest; import bit.sdk.schema.AccessTokenLoginRequest; import bit.sdk.schema.ClientSettings; import bit.sdk.schema.Command; import bit.sdk.schema.Converter; -import bit.sdk.schema.FingerprintRequest; -import bit.sdk.schema.PasswordLoginRequest; import bit.sdk.schema.ResponseForAPIKeyLoginResponse; -import bit.sdk.schema.ResponseForFingerprintResponse; -import bit.sdk.schema.ResponseForPasswordLoginResponse; -import bit.sdk.schema.ResponseForSecretIdentifiersResponse; -import bit.sdk.schema.ResponseForSecretResponse; -import bit.sdk.schema.ResponseForSecretsDeleteResponse; -import bit.sdk.schema.ResponseForSyncResponse; -import bit.sdk.schema.ResponseForUserAPIKeyResponse; -import bit.sdk.schema.SecretCreateRequest; -import bit.sdk.schema.SecretGetRequest; -import bit.sdk.schema.SecretIdentifiersRequest; -import bit.sdk.schema.SecretPutRequest; -import bit.sdk.schema.SecretVerificationRequest; -import bit.sdk.schema.SecretsCommand; -import bit.sdk.schema.SecretsDeleteRequest; -import bit.sdk.schema.SyncRequest; import com.fasterxml.jackson.core.JsonProcessingException; import com.sun.jna.Native; import com.sun.jna.Pointer; -import java.util.UUID; import java.util.function.Function; public class BitwardenClient implements AutoCloseable { - private static Function throwingFunctionWrapper(ThrowingFunction throwingFunction) { + static Function throwingFunctionWrapper(ThrowingFunction throwingFunction) { return i -> { try { @@ -46,276 +27,39 @@ private static Function throwingFunctionWrapper(ThrowingFunction s); -// } -// -// public String mobileCrypto(String email, String password, Kdf kdf, String userKey, String privateKey, -// Map organizationalKeys) { -// Command command = new Command(); -// MobileCommand mobileCommand = new MobileCommand(); -// MobileCryptoCommand mobileCryptoCommand = new MobileCryptoCommand(); -// InitCryptoRequest initCryptoRequest = new InitCryptoRequest(); -// initCryptoRequest.setEmail(email); -// initCryptoRequest.setPassword(password); -// initCryptoRequest.setKdfParams(kdf); -// initCryptoRequest.setUserKey(userKey); -// initCryptoRequest.setPrivateKey(privateKey); -// initCryptoRequest.setOrganizationKeys(organizationalKeys); -// mobileCryptoCommand.setInitCrypto(initCryptoRequest); -// mobileCommand.setCrypto(mobileCryptoCommand); -// command.setMobile(mobileCommand); -// return runCommand(command, s -> s); -// } -// -// public ResponseForFolderEncryptResponse mobileFolderEncrypt(UUID id) { -// Command command = new Command(); -// MobileCommand mobileCommand = new MobileCommand(); -// MobileVaultCommand mobileVaultCommand = new MobileVaultCommand(); -// MobileFoldersCommand mobileFoldersCommand = new MobileFoldersCommand(); -// FolderEncryptRequest folderEncryptRequest = new FolderEncryptRequest(); -// FolderView folderView = new FolderView(); -// folderView.setID(id); -// folderEncryptRequest.setFolder(folderView); -// mobileFoldersCommand.setEncrypt(folderEncryptRequest); -// mobileVaultCommand.setFolders(mobileFoldersCommand); -// mobileCommand.setVault(mobileVaultCommand); -// command.setMobile(mobileCommand); -// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForFolderEncryptResponseFromJsonString)); -// } -// -// public ResponseForFolderDecryptResponse mobileFolderDecrypt(UUID id) { -// Command command = new Command(); -// MobileCommand mobileCommand = new MobileCommand(); -// MobileVaultCommand mobileVaultCommand = new MobileVaultCommand(); -// MobileFoldersCommand mobileFoldersCommand = new MobileFoldersCommand(); -// FolderDecryptRequest folderDecryptRequest = new FolderDecryptRequest(); -// Folder folder = new Folder(); -// folder.setID(id); -// folderDecryptRequest.setFolder(folder); -// mobileFoldersCommand.setDecrypt(folderDecryptRequest); -// mobileVaultCommand.setFolders(mobileFoldersCommand); -// mobileCommand.setVault(mobileVaultCommand); -// command.setMobile(mobileCommand); -// return runCommand(command, throwingFunctionWrapper(Converter::ResponseForFolderDecryptResponseFromJsonString)); -// } -// -// public ResponseForFolderDecryptListResponse mobileFolderDecryptList(UUID[] ids) { -// Command command = new Command(); -// MobileCommand mobileCommand = new MobileCommand(); -// MobileVaultCommand mobileVaultCommand = new MobileVaultCommand(); -// MobileFoldersCommand mobileFoldersCommand = new MobileFoldersCommand(); -// FolderDecryptListRequest folderDecryptListRequest = new FolderDecryptListRequest(); -// -// Folder[] folders = (Folder[]) Arrays.stream(ids) -// .map(id -> { -// Folder folder = new Folder(); -// folder.setID(id); -// return folder; -// }) -// .collect(Collectors.toList()).toArray(); -// folderDecryptListRequest.setFolders(folders); -// mobileFoldersCommand.setDecryptList(folderDecryptListRequest); -// mobileVaultCommand.setFolders(mobileFoldersCommand); -// mobileCommand.setVault(mobileVaultCommand); -// command.setMobile(mobileCommand); -// return runCommand(command, -// throwingFunctionWrapper(Converter::ResponseForFolderDecryptListResponseFromJsonString)); -// } - - private T runCommand(Command command, Function deserializer) { - String response = null; - try { - response = library.run_command(Converter.CommandToJsonString(command), client); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - return deserializer.apply(response); + public Secrets secrets() { + return secrets; } @Override diff --git a/languages/java/src/main/java/bit/sdk/CommandRunner.java b/languages/java/src/main/java/bit/sdk/CommandRunner.java new file mode 100644 index 000000000..f09b89eef --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/CommandRunner.java @@ -0,0 +1,42 @@ +package bit.sdk; + +import bit.sdk.schema.Command; +import bit.sdk.schema.Converter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.sun.jna.Pointer; +import java.io.IOException; +import java.util.function.Function; + +class CommandRunner { + + private BitwardenLibrary library; + + private Pointer client; + + CommandRunner(BitwardenLibrary library, Pointer client) { + this.library = library; + this.client = client; + } + + T runCommand(Command command, Function deserializer) { + String response = null; + try { + response = library.run_command(commandToString(command), client); + } catch (IOException e) { + throw new RuntimeException(e); + } + return deserializer.apply(response); + } + + private String commandToString(Command command) throws IOException { + // Removes null properties from the generated converter output to avoid command errors + String inputJson = Converter.CommandToJsonString(command); + + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + + Object inputObject = mapper.readValue(inputJson, Object.class); + return mapper.writeValueAsString(inputObject); + } +} diff --git a/languages/java/src/main/java/bit/sdk/Projects.java b/languages/java/src/main/java/bit/sdk/Projects.java new file mode 100644 index 000000000..218e6b625 --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/Projects.java @@ -0,0 +1,83 @@ +package bit.sdk; + +import static bit.sdk.BitwardenClient.throwingFunctionWrapper; + +import bit.sdk.schema.Command; +import bit.sdk.schema.Converter; +import bit.sdk.schema.ProjectCreateRequest; +import bit.sdk.schema.ProjectGetRequest; +import bit.sdk.schema.ProjectPutRequest; +import bit.sdk.schema.ProjectsCommand; +import bit.sdk.schema.ProjectsDeleteRequest; +import bit.sdk.schema.ProjectsListRequest; +import bit.sdk.schema.ResponseForProjectResponse; +import bit.sdk.schema.ResponseForProjectsDeleteResponse; +import bit.sdk.schema.ResponseForProjectsResponse; +import java.util.UUID; + +public class Projects { + + private CommandRunner commandRunner; + + Projects(CommandRunner commandRunner) { + this.commandRunner = commandRunner; + } + + public ResponseForProjectResponse get(UUID id) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectGetRequest projectGetRequest = new ProjectGetRequest(); + projectGetRequest.setID(id); + projectsCommand.setGet(projectGetRequest); + command.setProjects(projectsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + } + + public ResponseForProjectResponse create(UUID organizationId, String name) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectCreateRequest projectCreateRequest = new ProjectCreateRequest(); + projectCreateRequest.setOrganizationID(organizationId); + projectCreateRequest.setName(name); + projectsCommand.setCreate(projectCreateRequest); + command.setProjects(projectsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + } + + public ResponseForProjectResponse update(UUID id, UUID organizationId, String name) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectPutRequest projectPutRequest = new ProjectPutRequest(); + projectPutRequest.setID(id); + projectPutRequest.setOrganizationID(organizationId); + projectPutRequest.setName(name); + projectsCommand.setUpdate(projectPutRequest); + command.setProjects(projectsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + } + + public ResponseForProjectsDeleteResponse delete(UUID[] ids) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectsDeleteRequest projectsDeleteRequest = new ProjectsDeleteRequest(); + projectsDeleteRequest.setIDS(ids); + projectsCommand.setDelete(projectsDeleteRequest); + command.setProjects(projectsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForProjectsDeleteResponseFromJsonString)); + } + + public ResponseForProjectsResponse list(UUID organizationId) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectsListRequest projectsListRequest = new ProjectsListRequest(); + projectsListRequest.setOrganizationID(organizationId); + projectsCommand.setList(projectsListRequest); + command.setProjects(projectsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForProjectsResponseFromJsonString)); + } +} diff --git a/languages/java/src/main/java/bit/sdk/Secrets.java b/languages/java/src/main/java/bit/sdk/Secrets.java new file mode 100644 index 000000000..655452f66 --- /dev/null +++ b/languages/java/src/main/java/bit/sdk/Secrets.java @@ -0,0 +1,91 @@ +package bit.sdk; + +import static bit.sdk.BitwardenClient.throwingFunctionWrapper; + +import bit.sdk.schema.Command; +import bit.sdk.schema.Converter; +import bit.sdk.schema.ResponseForSecretIdentifiersResponse; +import bit.sdk.schema.ResponseForSecretResponse; +import bit.sdk.schema.ResponseForSecretsDeleteResponse; +import bit.sdk.schema.SecretCreateRequest; +import bit.sdk.schema.SecretGetRequest; +import bit.sdk.schema.SecretIdentifiersRequest; +import bit.sdk.schema.SecretPutRequest; +import bit.sdk.schema.SecretsCommand; +import bit.sdk.schema.SecretsDeleteRequest; +import java.util.UUID; + +public class Secrets { + + private CommandRunner commandRunner; + + Secrets(CommandRunner commandRunner) { + this.commandRunner = commandRunner; + } + + public ResponseForSecretResponse get(UUID id) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretGetRequest secretGetRequest = new SecretGetRequest(); + secretGetRequest.setID(id); + secretsCommand.setGet(secretGetRequest); + command.setSecrets(secretsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + } + + public ResponseForSecretResponse create(String key, String value, String note, UUID organizationId, + UUID[] projectIds) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretCreateRequest secretCreateRequest = new SecretCreateRequest(); + secretCreateRequest.setKey(key); + secretCreateRequest.setValue(value); + secretCreateRequest.setNote(note); + secretCreateRequest.setOrganizationID(organizationId); + secretCreateRequest.setProjectIDS(projectIds); + secretsCommand.setCreate(secretCreateRequest); + command.setSecrets(secretsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + } + + public ResponseForSecretResponse update(UUID id, String key, String value, String note, UUID organizationId, + UUID[] projectIds) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretPutRequest secretPutRequest = new SecretPutRequest(); + secretPutRequest.setID(id); + secretPutRequest.setKey(key); + secretPutRequest.setValue(value); + secretPutRequest.setNote(note); + secretPutRequest.setOrganizationID(organizationId); + secretPutRequest.setProjectIDS(projectIds); + secretsCommand.setUpdate(secretPutRequest); + command.setSecrets(secretsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + } + + public ResponseForSecretsDeleteResponse delete(UUID[] ids) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretsDeleteRequest secretsDeleteRequest = new SecretsDeleteRequest(); + secretsDeleteRequest.setIDS(ids); + secretsCommand.setDelete(secretsDeleteRequest); + command.setSecrets(secretsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForSecretsDeleteResponseFromJsonString)); + } + + public ResponseForSecretIdentifiersResponse list(UUID organizationId) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretIdentifiersRequest secretIdentifiersRequest = new SecretIdentifiersRequest(); + secretIdentifiersRequest.setOrganizationID(organizationId); + secretsCommand.setList(secretIdentifiersRequest); + command.setSecrets(secretsCommand); + return commandRunner.runCommand(command, + throwingFunctionWrapper(Converter::ResponseForSecretIdentifiersResponseFromJsonString)); + } +} diff --git a/languages/java/src/main/java/bit/sdk/Wrapper.java b/languages/java/src/main/java/bit/sdk/Wrapper.java index fee93f73c..f90020e7f 100644 --- a/languages/java/src/main/java/bit/sdk/Wrapper.java +++ b/languages/java/src/main/java/bit/sdk/Wrapper.java @@ -2,8 +2,15 @@ import bit.sdk.schema.ClientSettings; import bit.sdk.schema.DeviceType; -import bit.sdk.schema.ResponseForPasswordLoginResponse; +import bit.sdk.schema.ResponseForAPIKeyLoginResponse; +import bit.sdk.schema.ResponseForProjectResponse; +import bit.sdk.schema.ResponseForProjectsDeleteResponse; +import bit.sdk.schema.ResponseForProjectsResponse; +import bit.sdk.schema.ResponseForSecretIdentifiersResponse; +import bit.sdk.schema.ResponseForSecretResponse; +import bit.sdk.schema.ResponseForSecretsDeleteResponse; import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.UUID; public class Wrapper { @@ -13,10 +20,39 @@ public static void main(String[] args) throws JsonProcessingException { clientSettings.setIdentityURL("https://identity.bitwarden.com"); clientSettings.setDeviceType(DeviceType.SDK); clientSettings.setUserAgent("Bitwarden SDK"); + BitwardenClient bitwardenClient = new BitwardenClient(clientSettings); - ResponseForPasswordLoginResponse passwordLoginResponse = bitwardenClient.passwordLogin( - "user@something.com", - "Pass"); + ResponseForAPIKeyLoginResponse responseForAPIKeyLoginResponse = bitwardenClient.accessTokenLogin( + ""); + + UUID organizationId = UUID.fromString(""); + ResponseForProjectResponse responseForProjectResponse = bitwardenClient.projects().create(organizationId, + "NewTestProject"); + UUID projectId = responseForProjectResponse.getData().getID(); + ResponseForProjectsResponse responseForProjectsResponse = bitwardenClient.projects().list(organizationId); + responseForProjectResponse = bitwardenClient.projects().get(projectId); + responseForProjectResponse = bitwardenClient.projects().update(projectId, organizationId, "NewTestProject2"); + + String key = "key"; + String value = "value"; + String note = "note"; + ResponseForSecretResponse responseForSecretResponse = + bitwardenClient.secrets().create(key, value, note, organizationId, new UUID[]{projectId}); + UUID secretId = responseForSecretResponse.getData().getID(); + ResponseForSecretIdentifiersResponse responseForSecretIdentifiersResponse = + bitwardenClient.secrets().list(organizationId); + responseForSecretResponse = bitwardenClient.secrets().get(secretId); + key = "key2"; + value = "value2"; + note = "note2"; + responseForSecretResponse = bitwardenClient.secrets().update(secretId, key, value, note, organizationId, + new UUID[]{projectId}); + + ResponseForSecretsDeleteResponse responseForSecretsDeleteResponse = + bitwardenClient.secrets().delete(new UUID[]{secretId}); + ResponseForProjectsDeleteResponse responseForProjectsDeleteResponse = bitwardenClient.projects().delete( + new UUID[]{projectId}); + bitwardenClient.close(); } } From da72b7b1f746a10a7bd097a3ad3d60c587e19a5e Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Tue, 19 Sep 2023 11:45:28 +0200 Subject: [PATCH 03/15] switch to gradle --- .github/workflows/generate_schemas.yml | 4 +- languages/java/.gitignore | 3 + languages/java/build.gradle | 58 ++++ .../java/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + languages/java/gradlew | 249 ++++++++++++++++++ languages/java/gradlew.bat | 92 +++++++ languages/java/pom.xml | 138 ---------- languages/java/settings.gradle | 5 + .../main/java/bit/sdk/BitwardenClient.java | 1 - support/scripts/schemas.ts | 2 +- 11 files changed, 417 insertions(+), 142 deletions(-) create mode 100644 languages/java/build.gradle create mode 100644 languages/java/gradle/wrapper/gradle-wrapper.jar create mode 100644 languages/java/gradle/wrapper/gradle-wrapper.properties create mode 100755 languages/java/gradlew create mode 100644 languages/java/gradlew.bat delete mode 100644 languages/java/pom.xml create mode 100644 languages/java/settings.gradle diff --git a/.github/workflows/generate_schemas.yml b/.github/workflows/generate_schemas.yml index d2d05d27e..62754ba6f 100644 --- a/.github/workflows/generate_schemas.yml +++ b/.github/workflows/generate_schemas.yml @@ -21,7 +21,7 @@ jobs: toolchain: stable - name: Set up Node - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 + uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 with: cache: "npm" cache-dependency-path: "package-lock.json" @@ -31,7 +31,7 @@ jobs: run: npm ci - name: Cache cargo registry - uses: Swatinem/rust-cache@b8a6852b4f997182bdea832df3f9e153038b5191 # v2.6.0 + uses: Swatinem/rust-cache@e207df5d269b42b69c8bc5101da26f7d31feddb4 # v2.6.2 - name: NPM Schemas run: npm run schemas diff --git a/languages/java/.gitignore b/languages/java/.gitignore index c5078494e..eea31218b 100644 --- a/languages/java/.gitignore +++ b/languages/java/.gitignore @@ -1,2 +1,5 @@ target .idea +build +.gradle +src/main/resources diff --git a/languages/java/build.gradle b/languages/java/build.gradle new file mode 100644 index 000000000..426b9357b --- /dev/null +++ b/languages/java/build.gradle @@ -0,0 +1,58 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + api 'com.fasterxml.jackson.core:jackson-core:2.9.10' + api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10' + api 'net.java.dev.jna:jna-platform:5.12.1' +} + +group = 'bit.sdk' +version = '1.0-SNAPSHOT' +description = 'JavaWrapper' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc) { + options.encoding = 'UTF-8' +} + +tasks.register('copyNativeLib', Copy) { + delete 'src/main/resources/darwin-aarch64' + from '../../target/debug' + include '*libbitwarden_c*.dylib' + include '*libbitwarden_c*.so' + include '*bitwarden_c*.dll' + into 'src/main/resources/darwin-aarch64' +} + +jar { + dependsOn tasks.named("copyNativeLib") + from('src/main/resources') { + include 'darwin-aarch64/**' + } +} diff --git a/languages/java/gradle/wrapper/gradle-wrapper.jar b/languages/java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/languages/java/gradle/wrapper/gradle-wrapper.properties b/languages/java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..ac72c34e8 --- /dev/null +++ b/languages/java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/languages/java/gradlew b/languages/java/gradlew new file mode 100755 index 000000000..0adc8e1a5 --- /dev/null +++ b/languages/java/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/languages/java/gradlew.bat b/languages/java/gradlew.bat new file mode 100644 index 000000000..6689b85be --- /dev/null +++ b/languages/java/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/languages/java/pom.xml b/languages/java/pom.xml deleted file mode 100644 index 5c08781d1..000000000 --- a/languages/java/pom.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - 4.0.0 - - bit.sdk - JavaWrapper - 1.0-SNAPSHOT - - - 11 - 11 - UTF-8 - - - - - com.fasterxml.jackson.core - jackson-core - 2.9.10 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.9.10 - - - net.java.dev.jna - jna-platform - 5.12.1 - - - - - - - maven-resources-plugin - 3.3.1 - - - copy-resources - validate - - copy-resources - - - ${project.build.outputDirectory} - - - ../../target/debug - - libbitwarden_c*.dylib - libbitwarden_c*.so - bitwarden_c*.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/java/settings.gradle b/languages/java/settings.gradle new file mode 100644 index 000000000..6eb5c8f3e --- /dev/null +++ b/languages/java/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'JavaWrapper' diff --git a/languages/java/src/main/java/bit/sdk/BitwardenClient.java b/languages/java/src/main/java/bit/sdk/BitwardenClient.java index bd859a49b..02a2de49e 100644 --- a/languages/java/src/main/java/bit/sdk/BitwardenClient.java +++ b/languages/java/src/main/java/bit/sdk/BitwardenClient.java @@ -36,7 +36,6 @@ static Function throwingFunctionWrapper(ThrowingFunction Date: Fri, 29 Sep 2023 12:04:43 +0200 Subject: [PATCH 04/15] Update .github/workflows/generate_schemas.yml Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> --- .github/workflows/generate_schemas.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_schemas.yml b/.github/workflows/generate_schemas.yml index 62754ba6f..7baf688a4 100644 --- a/.github/workflows/generate_schemas.yml +++ b/.github/workflows/generate_schemas.yml @@ -65,7 +65,7 @@ jobs: if-no-files-found: error - name: Upload java schemas artifact - uses: actions/upload-artifact@ #TODO + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: sdk-schemas-java path: ${{ github.workspace }}/languages/java/src/main/java/bit/sdk/schema/* From f00e7ec611b82018c4f44ab911dd8edfea6ca579 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Mon, 2 Oct 2023 10:06:30 +0200 Subject: [PATCH 05/15] added build/publish workflows --- .github/workflows/build-java.yml | 68 ++++++++++++++++++++++++++ .github/workflows/publish-maven.yml | 69 +++++++++++++++++++++++++++ languages/java/build.gradle | 74 ++++++++++++++++------------- 3 files changed, 177 insertions(+), 34 deletions(-) create mode 100644 .github/workflows/build-java.yml create mode 100644 .github/workflows/publish-maven.yml diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml new file mode 100644 index 000000000..920d612c4 --- /dev/null +++ b/.github/workflows/build-java.yml @@ -0,0 +1,68 @@ +name: Build Java SDK + +on: + pull_request: + branches: + - master + +jobs: + generate_schemas: + uses: ./.github/workflows/generate_schemas.yml + + build_rust: + uses: ./.github/workflows/build-rust-cross-platform.yml + + build_dotnet: + name: Build .NET + runs-on: ubuntu-22.04 + needs: + - generate_schemas + - build_rust + + steps: + - name: Checkout Repository + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + + - name: Download Java schemas artifact + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: sdk-schemas-java + path: languages/java/src/main/java/bit/sdk/schema/ + + - name: Setup Java + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0 + with: + distribution: temurin + java-version: 17 + + - name: Download x86_64-apple-darwin files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-x86_64-apple-darwin + path: languages/java/src/main/resources/darwin-x64 + + - name: Download aarch64-apple-darwin files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-aarch64-apple-darwin + path: languages/java/src/main/resources/darwin-aarch64 + + - name: Download x86_64-unknown-linux-gnu files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-x86_64-unknown-linux-gnu + path: languages/java/src/main/resources/ubuntu-x64 + + - name: Download x86_64-pc-windows-msvc files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-x86_64-pc-windows-msvc + path: languages/java/src/main/resources/windows-x64 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: languages/java + + - name: Build with Gradle + run: ./gradlew build + working-directory: languages/java diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml new file mode 100644 index 000000000..27e942243 --- /dev/null +++ b/.github/workflows/publish-maven.yml @@ -0,0 +1,69 @@ +name: Publish Maven Package + +on: + workflow_dispatch: + version_number: + description: "New Version" + required: true + +jobs: + generate_schemas: + uses: ./.github/workflows/generate_schemas.yml + + build_rust: + uses: ./.github/workflows/build-rust-cross-platform.yml + + deploy: + name: Deploy + runs-on: ubuntu-22.04 + needs: + - generate_schemas + - build_rust + + steps: + - name: Checkout Repository + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + + - name: Download Java schemas artifact + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: sdk-schemas-java + path: languages/java/src/main/java/bit/sdk/schema/ + + - name: Setup Java + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0 + with: + distribution: temurin + java-version: 17 + + - name: Download x86_64-apple-darwin files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-x86_64-apple-darwin + path: languages/java/src/main/resources/darwin-x64 + + - name: Download aarch64-apple-darwin files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-aarch64-apple-darwin + path: languages/java/src/main/resources/darwin-aarch64 + + - name: Download x86_64-unknown-linux-gnu files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-x86_64-unknown-linux-gnu + path: languages/java/src/main/resources/ubuntu-x64 + + - name: Download x86_64-pc-windows-msvc files + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + with: + name: libbitwarden_c_files-x86_64-pc-windows-msvc + path: languages/java/src/main/resources/windows-x64 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + working-directory: languages/java + + - name: Publish to Maven Central + run: ./gradlew publish -PmavenUsername=${{ secrets.MAVEN_USERNAME }} -PmavenPassword=${{ secrets.MAVEN_PASSWORD }} + working-directory: languages/java/ diff --git a/languages/java/build.gradle b/languages/java/build.gradle index 426b9357b..222284d2f 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -11,48 +11,54 @@ repositories { mavenLocal() maven { url = uri('https://repo.maven.apache.org/maven2/') + credentials { + username project.findProperty("mavenUsername") ?: System.getenv("MAVEN_USERNAME") + password project.findProperty("mavenPassword") ?: System.getenv("MAVEN_PASSWORD") + } } -} -dependencies { - api 'com.fasterxml.jackson.core:jackson-core:2.9.10' - api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10' - api 'net.java.dev.jna:jna-platform:5.12.1' -} + dependencies { + api 'com.fasterxml.jackson.core:jackson-core:2.9.10' + api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10' + api 'net.java.dev.jna:jna-platform:5.12.1' + } -group = 'bit.sdk' -version = '1.0-SNAPSHOT' -description = 'JavaWrapper' -java.sourceCompatibility = JavaVersion.VERSION_1_8 + group = 'bit.sdk' + version = '1.0-SNAPSHOT' + description = 'JavaWrapper' + java.sourceCompatibility = JavaVersion.VERSION_1_8 -publishing { - publications { - maven(MavenPublication) { - from(components.java) + publishing { + publications { + maven(MavenPublication) { + from(components.java) + } } } -} -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } -tasks.withType(Javadoc) { - options.encoding = 'UTF-8' -} + tasks.withType(Javadoc) { + options.encoding = 'UTF-8' + } -tasks.register('copyNativeLib', Copy) { - delete 'src/main/resources/darwin-aarch64' - from '../../target/debug' - include '*libbitwarden_c*.dylib' - include '*libbitwarden_c*.so' - include '*bitwarden_c*.dll' - into 'src/main/resources/darwin-aarch64' -} +//tasks.register('copyNativeLib', Copy) { +// delete 'src/main/resources/darwin-aarch64' +// from '../../target/debug' +// include '*libbitwarden_c*.dylib' +// include '*libbitwarden_c*.so' +// include '*bitwarden_c*.dll' +// into 'src/main/resources/darwin-aarch64' +//} -jar { - dependsOn tasks.named("copyNativeLib") - from('src/main/resources') { - include 'darwin-aarch64/**' + jar { +// dependsOn tasks.named("copyNativeLib") + from('src/main/resources') { + include 'darwin-aarch64/**' + include 'darwin-x64/**' + include 'ubuntu-x64/**' + include 'windows-x64/**' + } } -} From 52c5df564e6f2fe71e5fb54472a5d01cde1bfdd9 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Mon, 2 Oct 2023 11:25:37 +0200 Subject: [PATCH 06/15] switch to gradle-build-action --- .github/workflows/build-java.yml | 14 +++--- .github/workflows/publish-maven.yml | 69 ----------------------------- languages/java/build.gradle | 67 ++++++++++++++++++++-------- 3 files changed, 56 insertions(+), 94 deletions(-) delete mode 100644 .github/workflows/publish-maven.yml diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index 920d612c4..876fff099 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -59,10 +59,10 @@ jobs: name: libbitwarden_c_files-x86_64-pc-windows-msvc path: languages/java/src/main/resources/windows-x64 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: languages/java - - - name: Build with Gradle - run: ./gradlew build - working-directory: languages/java + - name: Publish Maven + uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2.8.1 + with: + arguments: sdk:publish + build-root-directory: languages/java + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml deleted file mode 100644 index 27e942243..000000000 --- a/.github/workflows/publish-maven.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Publish Maven Package - -on: - workflow_dispatch: - version_number: - description: "New Version" - required: true - -jobs: - generate_schemas: - uses: ./.github/workflows/generate_schemas.yml - - build_rust: - uses: ./.github/workflows/build-rust-cross-platform.yml - - deploy: - name: Deploy - runs-on: ubuntu-22.04 - needs: - - generate_schemas - - build_rust - - steps: - - name: Checkout Repository - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - - - name: Download Java schemas artifact - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 - with: - name: sdk-schemas-java - path: languages/java/src/main/java/bit/sdk/schema/ - - - name: Setup Java - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0 - with: - distribution: temurin - java-version: 17 - - - name: Download x86_64-apple-darwin files - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 - with: - name: libbitwarden_c_files-x86_64-apple-darwin - path: languages/java/src/main/resources/darwin-x64 - - - name: Download aarch64-apple-darwin files - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 - with: - name: libbitwarden_c_files-aarch64-apple-darwin - path: languages/java/src/main/resources/darwin-aarch64 - - - name: Download x86_64-unknown-linux-gnu files - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 - with: - name: libbitwarden_c_files-x86_64-unknown-linux-gnu - path: languages/java/src/main/resources/ubuntu-x64 - - - name: Download x86_64-pc-windows-msvc files - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 - with: - name: libbitwarden_c_files-x86_64-pc-windows-msvc - path: languages/java/src/main/resources/windows-x64 - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - working-directory: languages/java - - - name: Publish to Maven Central - run: ./gradlew publish -PmavenUsername=${{ secrets.MAVEN_USERNAME }} -PmavenPassword=${{ secrets.MAVEN_PASSWORD }} - working-directory: languages/java/ diff --git a/languages/java/build.gradle b/languages/java/build.gradle index 222284d2f..ae3760a9f 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -11,10 +11,6 @@ repositories { mavenLocal() maven { url = uri('https://repo.maven.apache.org/maven2/') - credentials { - username project.findProperty("mavenUsername") ?: System.getenv("MAVEN_USERNAME") - password project.findProperty("mavenPassword") ?: System.getenv("MAVEN_PASSWORD") - } } dependencies { @@ -31,18 +27,53 @@ repositories { publishing { publications { maven(MavenPublication) { - from(components.java) + groupId = 'com.bitwarden' + artifactId = 'sdk-java' + + // Determine the version from the git history. + // + // PRs: use the branch name. + // Master: Grab it from `crates/bitwarden/Cargo.toml` + + def branchName = "git branch --show-current".execute().text.trim() + + if (branchName == "master") { + def content = ['grep', '-o', '^version = ".*"', '../../crates/bitwarden/Cargo.toml'].execute().text.trim() + def match = ~/version = "(.*)"/ + def matcher = match.matcher(content) + matcher.find() + + version = "${matcher.group(1)}-SNAPSHOT" + } else { + // branchName-SNAPSHOT + version = "${branchName.replaceAll('/', '-')}-SNAPSHOT" + } + + afterEvaluate { + from components.java + } + } + } + repositories { + maven { + name = "GitHubPackages" + url = "https://maven.pkg.github.com/bitwarden/sdk" + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } } } } +} - tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' - } +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} - tasks.withType(Javadoc) { - options.encoding = 'UTF-8' - } +tasks.withType(Javadoc) { + options.encoding = 'UTF-8' +} //tasks.register('copyNativeLib', Copy) { // delete 'src/main/resources/darwin-aarch64' @@ -53,12 +84,12 @@ repositories { // into 'src/main/resources/darwin-aarch64' //} - jar { +jar { // dependsOn tasks.named("copyNativeLib") - from('src/main/resources') { - include 'darwin-aarch64/**' - include 'darwin-x64/**' - include 'ubuntu-x64/**' - include 'windows-x64/**' - } + from('src/main/resources') { + include 'darwin-aarch64/**' + include 'darwin-x64/**' + include 'ubuntu-x64/**' + include 'windows-x64/**' } +} From f71fd690a057d49cd8996edc989587bdf164b2fb Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Wed, 4 Oct 2023 11:48:48 +0200 Subject: [PATCH 07/15] cleanup --- .github/workflows/build-java.yml | 2 +- languages/java/README.md | 71 +++++++++++++++++++ languages/java/build.gradle | 11 +-- .../main/java/bit/sdk/BitwardenClient.java | 20 ++++-- .../main/java/bit/sdk/BitwardenSettings.java | 32 +++++++++ .../sdk/{Wrapper.java => ExampleProgram.java} | 26 +++---- 6 files changed, 126 insertions(+), 36 deletions(-) create mode 100644 languages/java/README.md create mode 100644 languages/java/src/main/java/bit/sdk/BitwardenSettings.java rename languages/java/src/main/java/bit/sdk/{Wrapper.java => ExampleProgram.java} (65%) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index 876fff099..4e3192665 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -62,7 +62,7 @@ jobs: - name: Publish Maven uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2.8.1 with: - arguments: sdk:publish + arguments: publish build-root-directory: languages/java env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/languages/java/README.md b/languages/java/README.md new file mode 100644 index 000000000..b8868d238 --- /dev/null +++ b/languages/java/README.md @@ -0,0 +1,71 @@ +# Bitwarden Secrets Manager SDK + +Java bindings for interacting with the [Bitwarden Secrets Manager]. This is a beta release and might be missing some functionality. + +## Create access token + +Review the help documentation on [Access Tokens] + +## Usage code snippets + +### Create new Bitwarden client + +```java +BitwardenSettings bitwardenSettings = new BitwardenSettings(); +bitwardenSettings.setApiUrl("https://api.bitwarden.com"); +bitwardenSettings.setIdentityUrl("https://identity.bitwarden.com"); +BitwardenClient bitwardenClient = new BitwardenClient(bitwardenSettings); +bitwardenClient.accessTokenLogin(""); +``` + +### Create new project + +```java +UUID organizationId = UUID.fromString(""); +var projectResponse = bitwardenClient.projects().create(organizationId, "TestProject"); +``` + +### List all projects + +```java +var projectsResponse = bitwardenClient.projects().list(organizationId); +``` + +### Update project + +```java +UUID projectId = projectResponse.getData().getID(); +projectResponse = bitwardenClient.projects().get(projectId); +projectResponse = bitwardenClient.projects.update(projectId, organizationId, "TestProjectUpdated"); +``` + +### Add new secret + +```java +String key = "key"; +String value = "value"; +String note = "note"; +var secretResponse = bitwardenClient.secrets().create(key, value, note, organizationId, new UUID[]{projectId}); +UUID secretId = secretResponse.getData().getID(); +``` + +### Update secret +```java +bitwardenClient.secrets().update(secretId, key2, value2, note2, organizationId, new UUID[]{projectId}); +``` + +### List secrets + +```java +var secretIdentifiersResponse secretIdentifiersResponse = bitwardenClient.secrets().list(organizationId); +``` + +# Delete secret or project + +```java +bitwardenClient.secrets().delete(new UUID[]{secretId}); +bitwardenClient.projects().delete(new UUID[]{projectId}); +``` + +[Access Tokens]: https://bitwarden.com/help/access-tokens/ +[Bitwarden Secrets Manager]: https://bitwarden.com/products/secrets-manager/ diff --git a/languages/java/build.gradle b/languages/java/build.gradle index ae3760a9f..b88418182 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -75,17 +75,8 @@ tasks.withType(Javadoc) { options.encoding = 'UTF-8' } -//tasks.register('copyNativeLib', Copy) { -// delete 'src/main/resources/darwin-aarch64' -// from '../../target/debug' -// include '*libbitwarden_c*.dylib' -// include '*libbitwarden_c*.so' -// include '*bitwarden_c*.dll' -// into 'src/main/resources/darwin-aarch64' -//} - jar { -// dependsOn tasks.named("copyNativeLib") + // requires GitHub workflow to copy native library to resources from('src/main/resources') { include 'darwin-aarch64/**' include 'darwin-x64/**' diff --git a/languages/java/src/main/java/bit/sdk/BitwardenClient.java b/languages/java/src/main/java/bit/sdk/BitwardenClient.java index 02a2de49e..6de551d8c 100644 --- a/languages/java/src/main/java/bit/sdk/BitwardenClient.java +++ b/languages/java/src/main/java/bit/sdk/BitwardenClient.java @@ -1,13 +1,10 @@ package bit.sdk; -import bit.sdk.schema.AccessTokenLoginRequest; -import bit.sdk.schema.ClientSettings; -import bit.sdk.schema.Command; -import bit.sdk.schema.Converter; -import bit.sdk.schema.ResponseForAPIKeyLoginResponse; +import bit.sdk.schema.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.sun.jna.Native; import com.sun.jna.Pointer; + import java.util.function.Function; public class BitwardenClient implements AutoCloseable { @@ -35,9 +32,18 @@ static Function throwingFunctionWrapper(ThrowingFunction"); From 251ef474289114a3d77413f6cc0c0b015104d873 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Wed, 4 Oct 2023 12:01:21 +0200 Subject: [PATCH 08/15] build.gradle updates --- languages/java/build.gradle | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/languages/java/build.gradle b/languages/java/build.gradle index b88418182..25f87f3ca 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -19,8 +19,6 @@ repositories { api 'net.java.dev.jna:jna-platform:5.12.1' } - group = 'bit.sdk' - version = '1.0-SNAPSHOT' description = 'JavaWrapper' java.sourceCompatibility = JavaVersion.VERSION_1_8 @@ -75,8 +73,19 @@ tasks.withType(Javadoc) { options.encoding = 'UTF-8' } +//tasks.register('copyNativeLib', Copy) { +// delete 'src/main/resources/darwin-aarch64' +// from '../../target/debug' +// include '*libbitwarden_c*.dylib' +// include '*libbitwarden_c*.so' +// include '*bitwarden_c*.dll' +// into 'src/main/resources/darwin-aarch64' +//} + jar { - // requires GitHub workflow to copy native library to resources +// Requires GitHub workflow to copy native library to resources +// Uncomment the line below and copyNativeLib task above to use the local build (modify architecture if needed) +// dependsOn tasks.named("copyNativeLib") from('src/main/resources') { include 'darwin-aarch64/**' include 'darwin-x64/**' From bb2af7f73e2229f7bca547a97959bb0a95d1b83f Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Wed, 18 Oct 2023 11:38:02 +0200 Subject: [PATCH 09/15] unwrap sdk responses, addressing PR comments --- .gitignore | 2 +- .vscode/tasks.json | 7 +- languages/java/README.md | 9 +- languages/java/build.gradle | 2 +- .../src/main/java/bit/sdk/ExampleProgram.java | 48 --------- .../java/src/main/java/bit/sdk/Projects.java | 83 -------------- .../java/src/main/java/bit/sdk/Secrets.java | 91 ---------------- .../bitwarden}/sdk/BitwardenClient.java | 30 +++--- .../sdk/BitwardenClientException.java | 8 ++ .../bitwarden}/sdk/BitwardenLibrary.java | 2 +- .../bitwarden}/sdk/BitwardenSettings.java | 2 +- .../bitwarden}/sdk/CommandRunner.java | 6 +- .../com/bitwarden/sdk/ExampleProgram.java | 42 ++++++++ .../com/bitwarden/sdk/ProjectsClient.java | 94 ++++++++++++++++ .../java/com/bitwarden/sdk/SecretsClient.java | 101 ++++++++++++++++++ .../bitwarden}/sdk/ThrowingFunction.java | 2 +- support/scripts/schemas.ts | 4 +- 17 files changed, 280 insertions(+), 253 deletions(-) delete mode 100644 languages/java/src/main/java/bit/sdk/ExampleProgram.java delete mode 100644 languages/java/src/main/java/bit/sdk/Projects.java delete mode 100644 languages/java/src/main/java/bit/sdk/Secrets.java rename languages/java/src/main/java/{bit => com/bitwarden}/sdk/BitwardenClient.java (66%) create mode 100644 languages/java/src/main/java/com/bitwarden/sdk/BitwardenClientException.java rename languages/java/src/main/java/{bit => com/bitwarden}/sdk/BitwardenLibrary.java (90%) rename languages/java/src/main/java/{bit => com/bitwarden}/sdk/BitwardenSettings.java (95%) rename languages/java/src/main/java/{bit => com/bitwarden}/sdk/CommandRunner.java (91%) create mode 100644 languages/java/src/main/java/com/bitwarden/sdk/ExampleProgram.java create mode 100644 languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java create mode 100644 languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java rename languages/java/src/main/java/{bit => com/bitwarden}/sdk/ThrowingFunction.java (81%) diff --git a/.gitignore b/.gitignore index 8bd146fea..908917e10 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,4 @@ crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts languages/csharp/Bitwarden.Sdk/schemas.cs languages/js_webassembly/bitwarden_client/schemas.ts languages/python/BitwardenClient/schemas.py -languages/java/src/main/java/bit/sdk/schema \ No newline at end of file +languages/java/src/main/java/com/bitwarden/sdk/schema \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index bbe71a60d..6616022c4 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -50,11 +50,8 @@ { "label": "buildJava", "type": "shell", - "command": "mvn", - "args": [ - "clean", - "install" - ], + "command": "gradle", + "args": ["build"], "dependsOrder": "sequence", "dependsOn": ["rust: bitwarden-c build"] } diff --git a/languages/java/README.md b/languages/java/README.md index b8868d238..aabf67a99 100644 --- a/languages/java/README.md +++ b/languages/java/README.md @@ -1,6 +1,7 @@ # Bitwarden Secrets Manager SDK -Java bindings for interacting with the [Bitwarden Secrets Manager]. This is a beta release and might be missing some functionality. +Java bindings for interacting with the [Bitwarden Secrets Manager]. This is a beta release and might be missing some +functionality. ## Create access token @@ -34,7 +35,7 @@ var projectsResponse = bitwardenClient.projects().list(organizationId); ### Update project ```java -UUID projectId = projectResponse.getData().getID(); +UUID projectId = projectResponse.getID(); projectResponse = bitwardenClient.projects().get(projectId); projectResponse = bitwardenClient.projects.update(projectId, organizationId, "TestProjectUpdated"); ``` @@ -46,10 +47,11 @@ String key = "key"; String value = "value"; String note = "note"; var secretResponse = bitwardenClient.secrets().create(key, value, note, organizationId, new UUID[]{projectId}); -UUID secretId = secretResponse.getData().getID(); +UUID secretId = secretResponse.getID(); ``` ### Update secret + ```java bitwardenClient.secrets().update(secretId, key2, value2, note2, organizationId, new UUID[]{projectId}); ``` @@ -68,4 +70,5 @@ bitwardenClient.projects().delete(new UUID[]{projectId}); ``` [Access Tokens]: https://bitwarden.com/help/access-tokens/ + [Bitwarden Secrets Manager]: https://bitwarden.com/products/secrets-manager/ diff --git a/languages/java/build.gradle b/languages/java/build.gradle index 25f87f3ca..340d11358 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -26,7 +26,7 @@ repositories { publications { maven(MavenPublication) { groupId = 'com.bitwarden' - artifactId = 'sdk-java' + artifactId = 'sdk' // Determine the version from the git history. // diff --git a/languages/java/src/main/java/bit/sdk/ExampleProgram.java b/languages/java/src/main/java/bit/sdk/ExampleProgram.java deleted file mode 100644 index cdc5ee563..000000000 --- a/languages/java/src/main/java/bit/sdk/ExampleProgram.java +++ /dev/null @@ -1,48 +0,0 @@ -package bit.sdk; - -import bit.sdk.schema.*; - -import java.util.UUID; - -public class ExampleProgram { - - public static void main(String[] args) { - BitwardenSettings bitwardenSettings = new BitwardenSettings(); - bitwardenSettings.setApiUrl("https://api.bitwarden.com"); - bitwardenSettings.setIdentityUrl("https://identity.bitwarden.com"); - - BitwardenClient bitwardenClient = new BitwardenClient(bitwardenSettings); - ResponseForAPIKeyLoginResponse responseForAPIKeyLoginResponse = bitwardenClient.accessTokenLogin( - ""); - - UUID organizationId = UUID.fromString(""); - ResponseForProjectResponse responseForProjectResponse = bitwardenClient.projects().create(organizationId, - "NewTestProject"); - UUID projectId = responseForProjectResponse.getData().getID(); - ResponseForProjectsResponse responseForProjectsResponse = bitwardenClient.projects().list(organizationId); - responseForProjectResponse = bitwardenClient.projects().get(projectId); - responseForProjectResponse = bitwardenClient.projects().update(projectId, organizationId, "NewTestProject2"); - - String key = "key"; - String value = "value"; - String note = "note"; - ResponseForSecretResponse responseForSecretResponse = - bitwardenClient.secrets().create(key, value, note, organizationId, new UUID[]{projectId}); - UUID secretId = responseForSecretResponse.getData().getID(); - ResponseForSecretIdentifiersResponse responseForSecretIdentifiersResponse = - bitwardenClient.secrets().list(organizationId); - responseForSecretResponse = bitwardenClient.secrets().get(secretId); - key = "key2"; - value = "value2"; - note = "note2"; - responseForSecretResponse = bitwardenClient.secrets().update(secretId, key, value, note, organizationId, - new UUID[]{projectId}); - - ResponseForSecretsDeleteResponse responseForSecretsDeleteResponse = - bitwardenClient.secrets().delete(new UUID[]{secretId}); - ResponseForProjectsDeleteResponse responseForProjectsDeleteResponse = bitwardenClient.projects().delete( - new UUID[]{projectId}); - - bitwardenClient.close(); - } -} diff --git a/languages/java/src/main/java/bit/sdk/Projects.java b/languages/java/src/main/java/bit/sdk/Projects.java deleted file mode 100644 index 218e6b625..000000000 --- a/languages/java/src/main/java/bit/sdk/Projects.java +++ /dev/null @@ -1,83 +0,0 @@ -package bit.sdk; - -import static bit.sdk.BitwardenClient.throwingFunctionWrapper; - -import bit.sdk.schema.Command; -import bit.sdk.schema.Converter; -import bit.sdk.schema.ProjectCreateRequest; -import bit.sdk.schema.ProjectGetRequest; -import bit.sdk.schema.ProjectPutRequest; -import bit.sdk.schema.ProjectsCommand; -import bit.sdk.schema.ProjectsDeleteRequest; -import bit.sdk.schema.ProjectsListRequest; -import bit.sdk.schema.ResponseForProjectResponse; -import bit.sdk.schema.ResponseForProjectsDeleteResponse; -import bit.sdk.schema.ResponseForProjectsResponse; -import java.util.UUID; - -public class Projects { - - private CommandRunner commandRunner; - - Projects(CommandRunner commandRunner) { - this.commandRunner = commandRunner; - } - - public ResponseForProjectResponse get(UUID id) { - Command command = new Command(); - ProjectsCommand projectsCommand = new ProjectsCommand(); - ProjectGetRequest projectGetRequest = new ProjectGetRequest(); - projectGetRequest.setID(id); - projectsCommand.setGet(projectGetRequest); - command.setProjects(projectsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); - } - - public ResponseForProjectResponse create(UUID organizationId, String name) { - Command command = new Command(); - ProjectsCommand projectsCommand = new ProjectsCommand(); - ProjectCreateRequest projectCreateRequest = new ProjectCreateRequest(); - projectCreateRequest.setOrganizationID(organizationId); - projectCreateRequest.setName(name); - projectsCommand.setCreate(projectCreateRequest); - command.setProjects(projectsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); - } - - public ResponseForProjectResponse update(UUID id, UUID organizationId, String name) { - Command command = new Command(); - ProjectsCommand projectsCommand = new ProjectsCommand(); - ProjectPutRequest projectPutRequest = new ProjectPutRequest(); - projectPutRequest.setID(id); - projectPutRequest.setOrganizationID(organizationId); - projectPutRequest.setName(name); - projectsCommand.setUpdate(projectPutRequest); - command.setProjects(projectsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); - } - - public ResponseForProjectsDeleteResponse delete(UUID[] ids) { - Command command = new Command(); - ProjectsCommand projectsCommand = new ProjectsCommand(); - ProjectsDeleteRequest projectsDeleteRequest = new ProjectsDeleteRequest(); - projectsDeleteRequest.setIDS(ids); - projectsCommand.setDelete(projectsDeleteRequest); - command.setProjects(projectsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForProjectsDeleteResponseFromJsonString)); - } - - public ResponseForProjectsResponse list(UUID organizationId) { - Command command = new Command(); - ProjectsCommand projectsCommand = new ProjectsCommand(); - ProjectsListRequest projectsListRequest = new ProjectsListRequest(); - projectsListRequest.setOrganizationID(organizationId); - projectsCommand.setList(projectsListRequest); - command.setProjects(projectsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForProjectsResponseFromJsonString)); - } -} diff --git a/languages/java/src/main/java/bit/sdk/Secrets.java b/languages/java/src/main/java/bit/sdk/Secrets.java deleted file mode 100644 index 655452f66..000000000 --- a/languages/java/src/main/java/bit/sdk/Secrets.java +++ /dev/null @@ -1,91 +0,0 @@ -package bit.sdk; - -import static bit.sdk.BitwardenClient.throwingFunctionWrapper; - -import bit.sdk.schema.Command; -import bit.sdk.schema.Converter; -import bit.sdk.schema.ResponseForSecretIdentifiersResponse; -import bit.sdk.schema.ResponseForSecretResponse; -import bit.sdk.schema.ResponseForSecretsDeleteResponse; -import bit.sdk.schema.SecretCreateRequest; -import bit.sdk.schema.SecretGetRequest; -import bit.sdk.schema.SecretIdentifiersRequest; -import bit.sdk.schema.SecretPutRequest; -import bit.sdk.schema.SecretsCommand; -import bit.sdk.schema.SecretsDeleteRequest; -import java.util.UUID; - -public class Secrets { - - private CommandRunner commandRunner; - - Secrets(CommandRunner commandRunner) { - this.commandRunner = commandRunner; - } - - public ResponseForSecretResponse get(UUID id) { - Command command = new Command(); - SecretsCommand secretsCommand = new SecretsCommand(); - SecretGetRequest secretGetRequest = new SecretGetRequest(); - secretGetRequest.setID(id); - secretsCommand.setGet(secretGetRequest); - command.setSecrets(secretsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); - } - - public ResponseForSecretResponse create(String key, String value, String note, UUID organizationId, - UUID[] projectIds) { - Command command = new Command(); - SecretsCommand secretsCommand = new SecretsCommand(); - SecretCreateRequest secretCreateRequest = new SecretCreateRequest(); - secretCreateRequest.setKey(key); - secretCreateRequest.setValue(value); - secretCreateRequest.setNote(note); - secretCreateRequest.setOrganizationID(organizationId); - secretCreateRequest.setProjectIDS(projectIds); - secretsCommand.setCreate(secretCreateRequest); - command.setSecrets(secretsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); - } - - public ResponseForSecretResponse update(UUID id, String key, String value, String note, UUID organizationId, - UUID[] projectIds) { - Command command = new Command(); - SecretsCommand secretsCommand = new SecretsCommand(); - SecretPutRequest secretPutRequest = new SecretPutRequest(); - secretPutRequest.setID(id); - secretPutRequest.setKey(key); - secretPutRequest.setValue(value); - secretPutRequest.setNote(note); - secretPutRequest.setOrganizationID(organizationId); - secretPutRequest.setProjectIDS(projectIds); - secretsCommand.setUpdate(secretPutRequest); - command.setSecrets(secretsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); - } - - public ResponseForSecretsDeleteResponse delete(UUID[] ids) { - Command command = new Command(); - SecretsCommand secretsCommand = new SecretsCommand(); - SecretsDeleteRequest secretsDeleteRequest = new SecretsDeleteRequest(); - secretsDeleteRequest.setIDS(ids); - secretsCommand.setDelete(secretsDeleteRequest); - command.setSecrets(secretsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForSecretsDeleteResponseFromJsonString)); - } - - public ResponseForSecretIdentifiersResponse list(UUID organizationId) { - Command command = new Command(); - SecretsCommand secretsCommand = new SecretsCommand(); - SecretIdentifiersRequest secretIdentifiersRequest = new SecretIdentifiersRequest(); - secretIdentifiersRequest.setOrganizationID(organizationId); - secretsCommand.setList(secretIdentifiersRequest); - command.setSecrets(secretsCommand); - return commandRunner.runCommand(command, - throwingFunctionWrapper(Converter::ResponseForSecretIdentifiersResponseFromJsonString)); - } -} diff --git a/languages/java/src/main/java/bit/sdk/BitwardenClient.java b/languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java similarity index 66% rename from languages/java/src/main/java/bit/sdk/BitwardenClient.java rename to languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java index 6de551d8c..889fa0734 100644 --- a/languages/java/src/main/java/bit/sdk/BitwardenClient.java +++ b/languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java @@ -1,6 +1,6 @@ -package bit.sdk; +package com.bitwarden.sdk; -import bit.sdk.schema.*; +import com.bitwarden.sdk.schema.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -15,7 +15,7 @@ static Function throwingFunctionWrapper(ThrowingFunction Function throwingFunctionWrapper(ThrowingFunction"); + + UUID organizationId = UUID.fromString(""); + ProjectResponse projectResponse = bitwardenClient.projects().create(organizationId, "NewTestProject"); + UUID projectId = projectResponse.getID(); + ProjectsResponse projectsResponse = bitwardenClient.projects().list(organizationId); + projectResponse = bitwardenClient.projects().get(projectId); + projectResponse = bitwardenClient.projects().update(projectId, organizationId, "NewTestProject2"); + + String key = "key"; + String value = "value"; + String note = "note"; + SecretResponse secretResponse = bitwardenClient.secrets().create(key, value, note, organizationId, + new UUID[]{projectId}); + UUID secretId = secretResponse.getID(); + SecretIdentifiersResponse secretIdentifiersResponse = bitwardenClient.secrets().list(organizationId); + secretResponse = bitwardenClient.secrets().get(secretId); + key = "key2"; + value = "value2"; + note = "note2"; + secretResponse = bitwardenClient.secrets().update(secretId, key, value, note, organizationId, + new UUID[]{projectId}); + + SecretsDeleteResponse secretsDeleteResponse = bitwardenClient.secrets().delete(new UUID[]{secretId}); + ProjectsDeleteResponse projectsDeleteResponse = bitwardenClient.projects().delete(new UUID[]{projectId}); + } + } +} diff --git a/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java b/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java new file mode 100644 index 000000000..e212052db --- /dev/null +++ b/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java @@ -0,0 +1,94 @@ +package com.bitwarden.sdk; + +import com.bitwarden.sdk.schema.*; + +import java.util.UUID; + +public class ProjectsClient { + + private CommandRunner commandRunner; + + ProjectsClient(CommandRunner commandRunner) { + this.commandRunner = commandRunner; + } + + public ProjectResponse get(UUID id) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectGetRequest projectGetRequest = new ProjectGetRequest(); + projectGetRequest.setID(id); + projectsCommand.setGet(projectGetRequest); + command.setProjects(projectsCommand); + ResponseForProjectResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Project not found"); + } + return response.getData(); + } + + public ProjectResponse create(UUID organizationId, String name) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectCreateRequest projectCreateRequest = new ProjectCreateRequest(); + projectCreateRequest.setOrganizationID(organizationId); + projectCreateRequest.setName(name); + projectsCommand.setCreate(projectCreateRequest); + command.setProjects(projectsCommand); + ResponseForProjectResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Project create failed"); + } + return response.getData(); + } + + public ProjectResponse update(UUID id, UUID organizationId, String name) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectPutRequest projectPutRequest = new ProjectPutRequest(); + projectPutRequest.setID(id); + projectPutRequest.setOrganizationID(organizationId); + projectPutRequest.setName(name); + projectsCommand.setUpdate(projectPutRequest); + command.setProjects(projectsCommand); + ResponseForProjectResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Project update failed"); + } + return response.getData(); + } + + public ProjectsDeleteResponse delete(UUID[] ids) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectsDeleteRequest projectsDeleteRequest = new ProjectsDeleteRequest(); + projectsDeleteRequest.setIDS(ids); + projectsCommand.setDelete(projectsDeleteRequest); + command.setProjects(projectsCommand); + ResponseForProjectsDeleteResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectsDeleteResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? + response.getErrorMessage() : "Projects update failed"); + } + return response.getData(); + } + + public ProjectsResponse list(UUID organizationId) { + Command command = new Command(); + ProjectsCommand projectsCommand = new ProjectsCommand(); + ProjectsListRequest projectsListRequest = new ProjectsListRequest(); + projectsListRequest.setOrganizationID(organizationId); + projectsCommand.setList(projectsListRequest); + command.setProjects(projectsCommand); + ResponseForProjectsResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectsResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? + response.getErrorMessage() : "No projects for given organization"); + } + return response.getData(); + } +} diff --git a/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java b/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java new file mode 100644 index 000000000..e857f56a4 --- /dev/null +++ b/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java @@ -0,0 +1,101 @@ +package com.bitwarden.sdk; + +import com.bitwarden.sdk.schema.*; + +import java.util.UUID; + +public class SecretsClient { + + private CommandRunner commandRunner; + + SecretsClient(CommandRunner commandRunner) { + this.commandRunner = commandRunner; + } + + public SecretResponse get(UUID id) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretGetRequest secretGetRequest = new SecretGetRequest(); + secretGetRequest.setID(id); + secretsCommand.setGet(secretGetRequest); + command.setSecrets(secretsCommand); + ResponseForSecretResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secret not found"); + } + return response.getData(); + } + + public SecretResponse create(String key, String value, String note, UUID organizationId, + UUID[] projectIds) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretCreateRequest secretCreateRequest = new SecretCreateRequest(); + secretCreateRequest.setKey(key); + secretCreateRequest.setValue(value); + secretCreateRequest.setNote(note); + secretCreateRequest.setOrganizationID(organizationId); + secretCreateRequest.setProjectIDS(projectIds); + secretsCommand.setCreate(secretCreateRequest); + command.setSecrets(secretsCommand); + ResponseForSecretResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secret create failed"); + } + return response.getData(); + } + + public SecretResponse update(UUID id, String key, String value, String note, UUID organizationId, + UUID[] projectIds) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretPutRequest secretPutRequest = new SecretPutRequest(); + secretPutRequest.setID(id); + secretPutRequest.setKey(key); + secretPutRequest.setValue(value); + secretPutRequest.setNote(note); + secretPutRequest.setOrganizationID(organizationId); + secretPutRequest.setProjectIDS(projectIds); + secretsCommand.setUpdate(secretPutRequest); + command.setSecrets(secretsCommand); + ResponseForSecretResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secret update failed"); + } + return response.getData(); + } + + public SecretsDeleteResponse delete(UUID[] ids) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretsDeleteRequest secretsDeleteRequest = new SecretsDeleteRequest(); + secretsDeleteRequest.setIDS(ids); + secretsCommand.setDelete(secretsDeleteRequest); + command.setSecrets(secretsCommand); + ResponseForSecretsDeleteResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretsDeleteResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secrets delete failed"); + } + return response.getData(); + } + + public SecretIdentifiersResponse list(UUID organizationId) { + Command command = new Command(); + SecretsCommand secretsCommand = new SecretsCommand(); + SecretIdentifiersRequest secretIdentifiersRequest = new SecretIdentifiersRequest(); + secretIdentifiersRequest.setOrganizationID(organizationId); + secretsCommand.setList(secretIdentifiersRequest); + command.setSecrets(secretsCommand); + ResponseForSecretIdentifiersResponse response = commandRunner.runCommand(command, + BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretIdentifiersResponseFromJsonString)); + if (response == null || !response.getSuccess()) { + throw new BitwardenClientException(response != null ? + response.getErrorMessage() : "No secrets for given organization"); + } + return response.getData(); + } +} diff --git a/languages/java/src/main/java/bit/sdk/ThrowingFunction.java b/languages/java/src/main/java/com/bitwarden/sdk/ThrowingFunction.java similarity index 81% rename from languages/java/src/main/java/bit/sdk/ThrowingFunction.java rename to languages/java/src/main/java/com/bitwarden/sdk/ThrowingFunction.java index 41a2f68f0..cab5b1041 100644 --- a/languages/java/src/main/java/bit/sdk/ThrowingFunction.java +++ b/languages/java/src/main/java/com/bitwarden/sdk/ThrowingFunction.java @@ -1,4 +1,4 @@ -package bit.sdk; +package com.bitwarden.sdk; @FunctionalInterface public interface ThrowingFunction { diff --git a/support/scripts/schemas.ts b/support/scripts/schemas.ts index a4712e35a..d220c680a 100644 --- a/support/scripts/schemas.ts +++ b/support/scripts/schemas.ts @@ -68,12 +68,12 @@ async function main() { inputData, lang: "java", rendererOptions: { - package: "bit.sdk.schema", + package: "com.bitwarden.sdk.schema", "java-version": "8", }, }); - const javaDir = "./languages/java/src/main/java/bit/sdk/schema/"; + const javaDir = "./languages/java/src/main/java/com/bitwarden/sdk/schema/"; if (!fs.existsSync(javaDir)) { fs.mkdirSync(javaDir); } From 9b113832b255d0a5bdae1753940fcf2f96b66451 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak <46886659+lukpotSym@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:40:12 +0100 Subject: [PATCH 10/15] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel García --- languages/java/build.gradle | 2 +- languages/java/settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/java/build.gradle b/languages/java/build.gradle index 340d11358..0dac1f7d2 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -19,7 +19,7 @@ repositories { api 'net.java.dev.jna:jna-platform:5.12.1' } - description = 'JavaWrapper' + description = 'BitwardenSDK' java.sourceCompatibility = JavaVersion.VERSION_1_8 publishing { diff --git a/languages/java/settings.gradle b/languages/java/settings.gradle index 6eb5c8f3e..961795f50 100644 --- a/languages/java/settings.gradle +++ b/languages/java/settings.gradle @@ -2,4 +2,4 @@ * This file was generated by the Gradle 'init' task. */ -rootProject.name = 'JavaWrapper' +rootProject.name = 'BitwardenSDK' From b8085cacdb8ad503b9f44f8bb663d11e8f42ed0f Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Sat, 25 Nov 2023 20:15:22 +0100 Subject: [PATCH 11/15] spacing changes and tasks.json fix --- .github/workflows/generate_schemas.yml | 2 +- .gitignore | 2 +- .vscode/tasks.json | 7 +++- languages/java/.gitignore | 2 - languages/java/README.md | 2 +- .../com/bitwarden/sdk/BitwardenClient.java | 38 +++++++++++-------- .../java/com/bitwarden/sdk/CommandRunner.java | 7 +++- .../com/bitwarden/sdk/ProjectsClient.java | 17 ++++++++- .../java/com/bitwarden/sdk/SecretsClient.java | 20 ++++++++-- 9 files changed, 68 insertions(+), 29 deletions(-) diff --git a/.github/workflows/generate_schemas.yml b/.github/workflows/generate_schemas.yml index d367d0e48..48cd57bf6 100644 --- a/.github/workflows/generate_schemas.yml +++ b/.github/workflows/generate_schemas.yml @@ -69,4 +69,4 @@ jobs: with: name: sdk-schemas-java path: ${{ github.workspace }}/languages/java/src/main/java/bit/sdk/schema/* - if-no-files-found: error \ No newline at end of file + if-no-files-found: error diff --git a/.gitignore b/.gitignore index 908917e10..38b074349 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,4 @@ crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts languages/csharp/Bitwarden.Sdk/schemas.cs languages/js_webassembly/bitwarden_client/schemas.ts languages/python/BitwardenClient/schemas.py -languages/java/src/main/java/com/bitwarden/sdk/schema \ No newline at end of file +languages/java/src/main/java/com/bitwarden/sdk/schema diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6616022c4..31edf637b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -53,7 +53,10 @@ "command": "gradle", "args": ["build"], "dependsOrder": "sequence", - "dependsOn": ["rust: bitwarden-c build"] - } + "dependsOn": ["rust: bitwarden-c build"], + "options": { + "cwd": "${workspaceFolder}/languages/java" + } + } ] } diff --git a/languages/java/.gitignore b/languages/java/.gitignore index eea31218b..b5b6c5697 100644 --- a/languages/java/.gitignore +++ b/languages/java/.gitignore @@ -1,5 +1,3 @@ target -.idea -build .gradle src/main/resources diff --git a/languages/java/README.md b/languages/java/README.md index aabf67a99..93010b510 100644 --- a/languages/java/README.md +++ b/languages/java/README.md @@ -71,4 +71,4 @@ bitwardenClient.projects().delete(new UUID[]{projectId}); [Access Tokens]: https://bitwarden.com/help/access-tokens/ -[Bitwarden Secrets Manager]: https://bitwarden.com/products/secrets-manager/ +[Bitwarden Secrets Manager]: https://bitwarden.com/products/secrets-manager/ \ No newline at end of file diff --git a/languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java b/languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java index 889fa0734..9e1948184 100644 --- a/languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java +++ b/languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java @@ -9,28 +9,17 @@ public class BitwardenClient implements AutoCloseable { - static Function throwingFunctionWrapper(ThrowingFunction throwingFunction) { - - return i -> { - try { - return throwingFunction.accept(i); - } catch (Exception ex) { - throw new BitwardenClientException("Response deserialization failed"); - } - }; - } - - private Pointer client; + private final Pointer client; - private BitwardenLibrary library; + private final BitwardenLibrary library; - private CommandRunner commandRunner; + private final CommandRunner commandRunner; private boolean isClientOpen; - private ProjectsClient projects; + private final ProjectsClient projects; - private SecretsClient secrets; + private final SecretsClient secrets; public BitwardenClient(BitwardenSettings bitwardenSettings) { ClientSettings clientSettings = new ClientSettings(); @@ -38,28 +27,45 @@ public BitwardenClient(BitwardenSettings bitwardenSettings) { clientSettings.setIdentityURL(bitwardenSettings.getIdentityUrl()); clientSettings.setDeviceType(DeviceType.SDK); clientSettings.setUserAgent("Bitwarden JAVA-SDK"); + library = Native.load("bitwarden_c", BitwardenLibrary.class); + try { client = library.init(Converter.ClientSettingsToJsonString(clientSettings)); } catch (JsonProcessingException e) { throw new BitwardenClientException("Error while processing client settings"); } + commandRunner = new CommandRunner(library, client); projects = new ProjectsClient(commandRunner); secrets = new SecretsClient(commandRunner); isClientOpen = true; } + static Function throwingFunctionWrapper(ThrowingFunction throwingFunction) { + + return i -> { + try { + return throwingFunction.accept(i); + } catch (Exception ex) { + throw new BitwardenClientException("Response deserialization failed"); + } + }; + } + public APIKeyLoginResponse accessTokenLogin(String accessToken) { Command command = new Command(); AccessTokenLoginRequest accessTokenLoginRequest = new AccessTokenLoginRequest(); accessTokenLoginRequest.setAccessToken(accessToken); command.setAccessTokenLogin(accessTokenLoginRequest); + ResponseForAPIKeyLoginResponse response = commandRunner.runCommand(command, throwingFunctionWrapper(Converter::ResponseForAPIKeyLoginResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Login failed"); } + return response.getData(); } diff --git a/languages/java/src/main/java/com/bitwarden/sdk/CommandRunner.java b/languages/java/src/main/java/com/bitwarden/sdk/CommandRunner.java index 6b903d9b2..11a100814 100644 --- a/languages/java/src/main/java/com/bitwarden/sdk/CommandRunner.java +++ b/languages/java/src/main/java/com/bitwarden/sdk/CommandRunner.java @@ -5,14 +5,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.jna.Pointer; + import java.io.IOException; import java.util.function.Function; class CommandRunner { - private BitwardenLibrary library; + private final BitwardenLibrary library; - private Pointer client; + private final Pointer client; CommandRunner(BitwardenLibrary library, Pointer client) { this.library = library; @@ -21,11 +22,13 @@ class CommandRunner { T runCommand(Command command, Function deserializer) { String response = null; + try { response = library.run_command(commandToString(command), client); } catch (IOException e) { throw new RuntimeException(e); } + return deserializer.apply(response); } diff --git a/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java b/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java index e212052db..73b87440c 100644 --- a/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java +++ b/languages/java/src/main/java/com/bitwarden/sdk/ProjectsClient.java @@ -6,7 +6,7 @@ public class ProjectsClient { - private CommandRunner commandRunner; + private final CommandRunner commandRunner; ProjectsClient(CommandRunner commandRunner) { this.commandRunner = commandRunner; @@ -19,11 +19,14 @@ public ProjectResponse get(UUID id) { projectGetRequest.setID(id); projectsCommand.setGet(projectGetRequest); command.setProjects(projectsCommand); + ResponseForProjectResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Project not found"); } + return response.getData(); } @@ -35,11 +38,14 @@ public ProjectResponse create(UUID organizationId, String name) { projectCreateRequest.setName(name); projectsCommand.setCreate(projectCreateRequest); command.setProjects(projectsCommand); + ResponseForProjectResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Project create failed"); } + return response.getData(); } @@ -52,11 +58,14 @@ public ProjectResponse update(UUID id, UUID organizationId, String name) { projectPutRequest.setName(name); projectsCommand.setUpdate(projectPutRequest); command.setProjects(projectsCommand); + ResponseForProjectResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Project update failed"); } + return response.getData(); } @@ -67,12 +76,15 @@ public ProjectsDeleteResponse delete(UUID[] ids) { projectsDeleteRequest.setIDS(ids); projectsCommand.setDelete(projectsDeleteRequest); command.setProjects(projectsCommand); + ResponseForProjectsDeleteResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectsDeleteResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Projects update failed"); } + return response.getData(); } @@ -83,12 +95,15 @@ public ProjectsResponse list(UUID organizationId) { projectsListRequest.setOrganizationID(organizationId); projectsCommand.setList(projectsListRequest); command.setProjects(projectsCommand); + ResponseForProjectsResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForProjectsResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "No projects for given organization"); } + return response.getData(); } } diff --git a/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java b/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java index e857f56a4..f1a97fdc7 100644 --- a/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java +++ b/languages/java/src/main/java/com/bitwarden/sdk/SecretsClient.java @@ -6,7 +6,7 @@ public class SecretsClient { - private CommandRunner commandRunner; + private final CommandRunner commandRunner; SecretsClient(CommandRunner commandRunner) { this.commandRunner = commandRunner; @@ -19,16 +19,18 @@ public SecretResponse get(UUID id) { secretGetRequest.setID(id); secretsCommand.setGet(secretGetRequest); command.setSecrets(secretsCommand); + ResponseForSecretResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secret not found"); } + return response.getData(); } - public SecretResponse create(String key, String value, String note, UUID organizationId, - UUID[] projectIds) { + public SecretResponse create(String key, String value, String note, UUID organizationId, UUID[] projectIds) { Command command = new Command(); SecretsCommand secretsCommand = new SecretsCommand(); SecretCreateRequest secretCreateRequest = new SecretCreateRequest(); @@ -39,11 +41,14 @@ public SecretResponse create(String key, String value, String note, UUID organiz secretCreateRequest.setProjectIDS(projectIds); secretsCommand.setCreate(secretCreateRequest); command.setSecrets(secretsCommand); + ResponseForSecretResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secret create failed"); } + return response.getData(); } @@ -60,11 +65,14 @@ public SecretResponse update(UUID id, String key, String value, String note, UUI secretPutRequest.setProjectIDS(projectIds); secretsCommand.setUpdate(secretPutRequest); command.setSecrets(secretsCommand); + ResponseForSecretResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secret update failed"); } + return response.getData(); } @@ -75,11 +83,14 @@ public SecretsDeleteResponse delete(UUID[] ids) { secretsDeleteRequest.setIDS(ids); secretsCommand.setDelete(secretsDeleteRequest); command.setSecrets(secretsCommand); + ResponseForSecretsDeleteResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretsDeleteResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Secrets delete failed"); } + return response.getData(); } @@ -90,12 +101,15 @@ public SecretIdentifiersResponse list(UUID organizationId) { secretIdentifiersRequest.setOrganizationID(organizationId); secretsCommand.setList(secretIdentifiersRequest); command.setSecrets(secretsCommand); + ResponseForSecretIdentifiersResponse response = commandRunner.runCommand(command, BitwardenClient.throwingFunctionWrapper(Converter::ResponseForSecretIdentifiersResponseFromJsonString)); + if (response == null || !response.getSuccess()) { throw new BitwardenClientException(response != null ? response.getErrorMessage() : "No secrets for given organization"); } + return response.getData(); } } From 299bd8dfad8e01c3e1fa1abd29486ee904304681 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak <46886659+lukpotSym@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:16:26 +0100 Subject: [PATCH 12/15] Update languages/java/README.md Co-authored-by: Oscar Hinton --- languages/java/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/languages/java/README.md b/languages/java/README.md index 93010b510..06f1ffec3 100644 --- a/languages/java/README.md +++ b/languages/java/README.md @@ -70,5 +70,4 @@ bitwardenClient.projects().delete(new UUID[]{projectId}); ``` [Access Tokens]: https://bitwarden.com/help/access-tokens/ - [Bitwarden Secrets Manager]: https://bitwarden.com/products/secrets-manager/ \ No newline at end of file From b4714807538cff5e580c3bb5099610a450d1503e Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Mon, 27 Nov 2023 14:12:48 +0100 Subject: [PATCH 13/15] fix path for generate_schemas workflow and run prettier on schems --- .github/workflows/generate_schemas.yml | 2 +- support/scripts/schemas.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate_schemas.yml b/.github/workflows/generate_schemas.yml index 48cd57bf6..675f53c1e 100644 --- a/.github/workflows/generate_schemas.yml +++ b/.github/workflows/generate_schemas.yml @@ -68,5 +68,5 @@ jobs: uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: sdk-schemas-java - path: ${{ github.workspace }}/languages/java/src/main/java/bit/sdk/schema/* + path: ${{ github.workspace }}/languages/java/src/main/java/com/bitwarden/sdk/schema/* if-no-files-found: error diff --git a/support/scripts/schemas.ts b/support/scripts/schemas.ts index d220c680a..7181d6010 100644 --- a/support/scripts/schemas.ts +++ b/support/scripts/schemas.ts @@ -1,4 +1,10 @@ -import { quicktype, quicktypeMultiFile, InputData, JSONSchemaInput, FetchingJSONSchemaStore } from "quicktype-core"; +import { + quicktype, + quicktypeMultiFile, + InputData, + JSONSchemaInput, + FetchingJSONSchemaStore, +} from "quicktype-core"; import fs from "fs"; import path from "path"; @@ -79,7 +85,7 @@ async function main() { } java.forEach((file, path) => { writeToFile(javaDir + path, file.lines); - }) + }); } main(); From 65e25d4b6a3315d6f93e797c9bf5a018c8fdc985 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Mon, 27 Nov 2023 16:04:11 +0100 Subject: [PATCH 14/15] fix duplicate lib files gradle issue and rename build task --- .github/workflows/build-java.yml | 4 ++-- languages/java/build.gradle | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index 4e3192665..e500424dd 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -12,8 +12,8 @@ jobs: build_rust: uses: ./.github/workflows/build-rust-cross-platform.yml - build_dotnet: - name: Build .NET + build_java: + name: Build Java runs-on: ubuntu-22.04 needs: - generate_schemas diff --git a/languages/java/build.gradle b/languages/java/build.gradle index 0dac1f7d2..6fe925530 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -86,10 +86,16 @@ jar { // Requires GitHub workflow to copy native library to resources // Uncomment the line below and copyNativeLib task above to use the local build (modify architecture if needed) // dependsOn tasks.named("copyNativeLib") - from('src/main/resources') { - include 'darwin-aarch64/**' - include 'darwin-x64/**' - include 'ubuntu-x64/**' - include 'windows-x64/**' + into('darwin-aarch64') { + from 'src/main/resources/darwin-aarch64' + } + into('darwin-x64') { + from 'src/main/resources/darwin-x64' + } + into('ubuntu-x64') { + from 'src/main/resources/ubuntu-x64' + } + into('windows-x64') { + from 'src/main/resources/windows-x64' } } From 7df172c26c03eff990678c38708cce03c4a675c0 Mon Sep 17 00:00:00 2001 From: Luka Potkonjak Date: Mon, 27 Nov 2023 22:54:56 +0100 Subject: [PATCH 15/15] commented out jar task to unblock github workflow --- languages/java/build.gradle | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/languages/java/build.gradle b/languages/java/build.gradle index 6fe925530..dc17386c4 100644 --- a/languages/java/build.gradle +++ b/languages/java/build.gradle @@ -73,6 +73,8 @@ tasks.withType(Javadoc) { options.encoding = 'UTF-8' } +// Gradle build requires GitHub workflow to copy native library to resources +// Uncomment copyNativeLib and jar tasks to use the local build (modify architecture if needed) //tasks.register('copyNativeLib', Copy) { // delete 'src/main/resources/darwin-aarch64' // from '../../target/debug' @@ -81,21 +83,8 @@ tasks.withType(Javadoc) { // include '*bitwarden_c*.dll' // into 'src/main/resources/darwin-aarch64' //} - -jar { -// Requires GitHub workflow to copy native library to resources -// Uncomment the line below and copyNativeLib task above to use the local build (modify architecture if needed) -// dependsOn tasks.named("copyNativeLib") - into('darwin-aarch64') { - from 'src/main/resources/darwin-aarch64' - } - into('darwin-x64') { - from 'src/main/resources/darwin-x64' - } - into('ubuntu-x64') { - from 'src/main/resources/ubuntu-x64' - } - into('windows-x64') { - from 'src/main/resources/windows-x64' - } -} +// +//jar { +// dependsOn tasks.named("copyNativeLib").get() +// from 'src/main/resources' +//}