Java wrapper for SDK

.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

.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

.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"]
+  }
   ]
 }

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,
     };
 

languages/java/.gitignore

@@ -0,0 +1,2 @@
+target
+.idea

languages/java/pom.xml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>bit.sdk</groupId>
+    <artifactId>JavaWrapper</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.9.10</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna-platform</artifactId>
+            <version>5.12.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../../target/debug</directory>
+                                    <includes>
+                                        <include>libbitwarden_c*.dylib</include>
+                                        <include>libbitwarden_c*.so</include>
+                                        <include>bitwarden_c*.dll</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!--    <profiles>-->
+    <!--        <profile>-->
+    <!--            <id>debug</id>-->
+    <!--            <build>-->
+    <!--                <plugins>-->
+    <!--                    <plugin>-->
+    <!--                        <artifactId>maven-resources-plugin</artifactId>-->
+    <!--                        <version>3.3.1</version>-->
+    <!--                        <executions>-->
+    <!--                            <execution>-->
+    <!--                                <id>copy-resources</id>-->
+    <!--                                <phase>validate</phase>-->
+    <!--                                <goals>-->
+    <!--                                    <goal>copy-resources</goal>-->
+    <!--                                </goals>-->
+    <!--                                <configuration>-->
+    <!--                                    <outputDirectory>${project.build.outputDirectory}-->
+    <!--                                    </outputDirectory>-->
+    <!--                                    <resources>-->
+    <!--                                        <resource>-->
+    <!--                                            <directory>../../target/debug</directory>-->
+    <!--                                            <includes>-->
+    <!--                                                <include>libbitwarden_c*.dylib</include>-->
+    <!--                                                <include>libbitwarden_c*.so</include>-->
+    <!--                                                <include>bitwarden_c*.dll</include>-->
+    <!--                                            </includes>-->
+    <!--                                        </resource>-->
+    <!--                                    </resources>-->
+    <!--                                </configuration>-->
+    <!--                            </execution>-->
+    <!--                        </executions>-->
+    <!--                    </plugin>-->
+    <!--                </plugins>-->
+    <!--            </build>-->
+    <!--        </profile>-->
+
+    <!--        <profile>-->
+    <!--            <id>release</id>-->
+    <!--            <build>-->
+    <!--                <plugins>-->
+    <!--                    <plugin>-->
+    <!--                        <artifactId>maven-resources-plugin</artifactId>-->
+    <!--                        <version>3.3.1</version>-->
+    <!--                        <executions>-->
+    <!--                            <execution>-->
+    <!--                                <id>copy-resources</id>-->
+    <!--                                <phase>validate</phase>-->
+    <!--                                <goals>-->
+    <!--                                    <goal>copy-resources</goal>-->
+    <!--                                </goals>-->
+    <!--                                <configuration>-->
+    <!--                                    <outputDirectory>${project.build.outputDirectory}-->
+    <!--                                    </outputDirectory>-->
+    <!--                                    <resources>-->
+    <!--                                        <resource>-->
+    <!--                                            <directory>../../target/release/</directory>-->
+    <!--                                            <includes>-->
+    <!--                                                <include>libbitwarden_c*.dylib</include>-->
+    <!--                                                <include>libbitwarden_c*.so</include>-->
+    <!--                                                <include>bitwarden_c*.dll</include>-->
+    <!--                                            </includes>-->
+    <!--                                        </resource>-->
+    <!--                                    </resources>-->
+    <!--                                </configuration>-->
+    <!--                            </execution>-->
+    <!--                        </executions>-->
+    <!--                    </plugin>-->
+    <!--                </plugins>-->
+    <!--            </build>-->
+    <!--        </profile>-->
+    <!--    </profiles>-->
+
+</project>

languages/java/src/main/java/bit/sdk/BitwardenClient.java

@@ -0,0 +1,72 @@
+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 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 {
+
+    static <T, R> Function<T, R> throwingFunctionWrapper(ThrowingFunction<T, R, Exception> throwingFunction) {
+
+        return i -> {
+            try {
+                return throwingFunction.accept(i);
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        };
+    }
+
+    private Pointer client;
+
+    private BitwardenLibrary library;
+
+    private CommandRunner commandRunner;
+
+    private boolean isClientOpen;
+
+    private Projects projects;
+
+    private Secrets secrets;
+
+    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));
+        commandRunner = new CommandRunner(library, client);
+        projects = new Projects(commandRunner);
+        secrets = new Secrets(commandRunner);
+        isClientOpen = true;
+    }
+
+    public ResponseForAPIKeyLoginResponse accessTokenLogin(String accessToken) {
+        Command command = new Command();
+        AccessTokenLoginRequest accessTokenLoginRequest = new AccessTokenLoginRequest();
+        accessTokenLoginRequest.setAccessToken(accessToken);
+        command.setAccessTokenLogin(accessTokenLoginRequest);
+        return commandRunner.runCommand(command,
+            throwingFunctionWrapper(Converter::ResponseForAPIKeyLoginResponseFromJsonString));
+    }
+
+    public Projects projects() {
+        return projects;
+    }
+
+    public Secrets secrets() {
+        return secrets;
+    }
+
+    @Override
+    public void close() {
+        if (isClientOpen) {
+            library.free_mem(client);
+            isClientOpen = false;
+        }
+    }
+}

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);
+}

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> T runCommand(Command command, Function<String, T> 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);
+    }
+}