Merge pull request #195 from quexten/restructure

Restructure & add version command

com.quexten.Goldwarden.yml → .github/com.quexten.Goldwarden.yml

@@ -32,24 +32,24 @@ modules:
       - type: git
         url: https://gitlab.gnome.org/jwestman/blueprint-compiler
         tag: v0.12.0
-  - ./gui/python3-requirements.json
+  - ../gui/python3-requirements.json
   - name: goldwarden-python-ui
     buildsystem: simple
     build-commands:
       - mkdir -p /app/bin
-      - cp -R ./gui/* /app/bin
+      - cp -R ./* /app/bin
       - chmod +x /app/bin/goldwarden_ui_main.py
-      - install -D ./gui/com.quexten.Goldwarden.desktop /app/share/applications/com.quexten.Goldwarden.desktop
-      - install -D ./gui/goldwarden.svg /app/share/icons/hicolor/scalable/apps/com.quexten.Goldwarden.svg
-      - install -Dm644 ./gui/com.quexten.Goldwarden.metainfo.xml -t /app/share/metainfo/
+      - install -D ./com.quexten.Goldwarden.desktop /app/share/applications/com.quexten.Goldwarden.desktop
+      - install -D ./goldwarden.svg /app/share/icons/hicolor/scalable/apps/com.quexten.Goldwarden.svg
+      - install -Dm644 ./com.quexten.Goldwarden.metainfo.xml -t /app/share/metainfo/
       - blueprint-compiler batch-compile /app/bin/src/gui/.templates/ /app/bin/src/gui/ /app/bin/src/gui/*.blp
     sources:
       - type: dir
-        path: ./
+        path: ../gui/
   - name: goldwarden-core-daemon
     buildsystem: simple
     build-commands:
       - install -D goldwarden /app/bin/goldwarden
     sources:
       - type: file
-        path: ./goldwarden
+        path: ../goldwarden

PKGBUILD → .github/workflows/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=goldwarden
-pkgver=0.2.16
+pkgver=REPLACED_IN_CI_PIPELINE
 pkgrel=1
 pkgdesc='A feature-packed Bitwarden compatible desktop integration'
 arch=('x86_64' 'aarch64')
@@ -24,6 +24,8 @@ build() {
   export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
   export CGO_ENABLED=1
 
+  echo "$pkgver" > cmd/version.txt
+
   go mod tidy
   go build -o build/$pkgname .
 }

.github/workflows/flatpak.yml

@@ -43,6 +43,6 @@ jobs:
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: goldwarden.flatpak
-        manifest-path: com.quexten.Goldwarden.yml
+        manifest-path: .github/com.quexten.Goldwarden.yml
         cache-key: flatpak-builder-${{ github.sha }}
         arch: ${{ matrix.arch }}

.github/workflows/go.yml

@@ -18,6 +18,8 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: ${{ env.GO_VERSION }}
+    - name: Write version
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build Debug
@@ -35,6 +37,8 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: ${{ env.GO_VERSION }}
+    - name: Write version
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -52,6 +56,8 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: ${{ env.GO_VERSION }}
+    - name: Write version
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -69,6 +75,8 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: ${{ env.GO_VERSION }}
+    - name: Write version
+      run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
     - name: Build
       run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v .
     - uses: actions/upload-artifact@v3
@@ -85,6 +93,8 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+      - name: Write version
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -106,6 +116,8 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+      - name: Write version
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -127,6 +139,8 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+      - name: Write version
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - uses: MinoruSekine/setup-scoop@v2
       - name: Fido2
         run: |
@@ -148,6 +162,8 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+      - name: Write version
+        run: echo "$(git rev-parse --short HEAD)" > ./cli/cmd/version.txt
       - name: Build
         run: set GOARCH=arm64 && go build -tags nofido2 -o "goldwarden_windows_aarch64.exe" -v .
       - uses: actions/upload-artifact@v3

.github/workflows/release.yml

@@ -26,11 +26,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
         go-version: ${{ env.GO_VERSION }}
+    - name: Write version
+      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -39,17 +40,6 @@ jobs:
       with:
         files: './goldwarden_linux_x86_64'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Publish AUR package
-      uses: KSXGitHub/[email protected]
-      with:
-        pkgname: goldwarden
-        updpkgsums: true
-        pkgbuild: ./PKGBUILD
-        commit_username: ${{ secrets.AUR_USERNAME }}
-        commit_email: ${{ secrets.AUR_EMAIL }}
-        ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-        commit_message: Update AUR package from GitHub Actions automation
-        ssh_keyscan_types: ed25519
     - name: Move binaries to directories
       run: |
         mkdir -p .debpkg/usr/bin
@@ -93,7 +83,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
+    - name: Write version
+      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -109,6 +100,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+    - name: Write version
+      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -125,6 +118,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Write version
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -146,6 +141,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Write version
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -167,6 +164,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Write version
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -188,6 +187,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Write version
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -198,3 +199,24 @@ jobs:
         with:
           files: './goldwarden_windows_aarch64.exe'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+  publish_to_aur:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Write version
+        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+      - name: Replace version in PKGBUILD
+        run: sed -i "s/pkgver=.*/pkgver=${GITHUB_REF#refs\/tags\//}/" ./.github/workflows/PKGBUILD
+      - name: Publish AUR package
+        uses: KSXGitHub/[email protected]
+        with:
+          pkgname: goldwarden
+          updpkgsums: true
+          pkgbuild: ./.github/workflows/PKGBUILD
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          commit_email: ${{ secrets.AUR_EMAIL }}
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message: Update AUR package from GitHub Actions automation
+          ssh_keyscan_types: ed25519

.gitignore

@@ -6,3 +6,4 @@ flatpak-pip-generator
 repo
 __debug*
 .templates
+vendor

Readme.md

@@ -31,8 +31,8 @@ There is a flatpak that includes a small UI, autotype functionality and autostar
 
 [<img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png' />](https://flathub.org/apps/details/com.quexten.Goldwarden)
 
-<img src='https://github.com/quexten/goldwarden/assets/11866552/fd302636-3494-4f92-a51d-50ac863885f2' width='400'>
-<img src='https://github.com/quexten/goldwarden/assets/11866552/683f0ed4-e4cb-4088-9fb0-d08fcec3fa22' width='400'>
+<img src='https://github.com/quexten/goldwarden/cli/assets/11866552/fd302636-3494-4f92-a51d-50ac863885f2' width='400'>
+<img src='https://github.com/quexten/goldwarden/cli/assets/11866552/683f0ed4-e4cb-4088-9fb0-d08fcec3fa22' width='400'>
 
 #### CLI
 ##### Arch (AUR)
@@ -61,12 +61,12 @@ go install github.com/quexten/goldwarden@latest
 ```
 
 ### Setup and Usage
-To get started, follow the instructions provided in the wiki https://github.com/quexten/goldwarden/wiki/Getting-Started.
+To get started, follow the instructions provided in the wiki https://github.com/quexten/goldwarden/cli/wiki/Getting-Started.
 For instructions on specific features, also consult the wiki page for the feature.
 
 ### Contributing
 Interested in contributing a feature or bug-fix? Great! Here is some information on how to set up your development environment:
 
-https://github.com/quexten/goldwarden/wiki/Setting-up-the-Development-Environment
+https://github.com/quexten/goldwarden/cli/wiki/Setting-up-the-Development-Environment
 
 After that, create a PR. If you encounter any issues, feel free to open a discussion thread.

agent/actions/actions.go → cli/agent/actions/actions.go

@@ -3,14 +3,14 @@ package actions
 import (
 	"context"
 
-	"github.com/quexten/goldwarden/agent/bitwarden"
-	"github.com/quexten/goldwarden/agent/bitwarden/crypto"
-	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/sockets"
-	"github.com/quexten/goldwarden/agent/systemauth"
-	"github.com/quexten/goldwarden/agent/vault"
-	"github.com/quexten/goldwarden/ipc/messages"
-	"github.com/quexten/goldwarden/logging"
+	"github.com/quexten/goldwarden/cli/agent/bitwarden"
+	"github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
+	"github.com/quexten/goldwarden/cli/agent/config"
+	"github.com/quexten/goldwarden/cli/agent/sockets"
+	"github.com/quexten/goldwarden/cli/agent/systemauth"
+	"github.com/quexten/goldwarden/cli/agent/vault"
+	"github.com/quexten/goldwarden/cli/ipc/messages"
+	"github.com/quexten/goldwarden/cli/logging"
 )
 
 var actionsLog = logging.GetLogger("Goldwarden", "Actions")

agent/actions/browserbiometrics.go → cli/agent/actions/browserbiometrics.go

@@ -6,14 +6,14 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/notify"
-	"github.com/quexten/goldwarden/agent/sockets"
-	"github.com/quexten/goldwarden/agent/systemauth/biometrics"
-	"github.com/quexten/goldwarden/agent/systemauth/pinentry"
-	"github.com/quexten/goldwarden/agent/vault"
+	"github.com/quexten/goldwarden/cli/agent/config"
+	"github.com/quexten/goldwarden/cli/agent/notify"
+	"github.com/quexten/goldwarden/cli/agent/sockets"
+	"github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
+	"github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
+	"github.com/quexten/goldwarden/cli/agent/vault"
 
-	"github.com/quexten/goldwarden/ipc/messages"
+	"github.com/quexten/goldwarden/cli/ipc/messages"
 )
 
 func handleGetBiometricsKey(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

agent/actions/config.go → cli/agent/actions/config.go

@@ -5,10 +5,10 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/sockets"
-	"github.com/quexten/goldwarden/agent/vault"
-	"github.com/quexten/goldwarden/ipc/messages"
+	"github.com/quexten/goldwarden/cli/agent/config"
+	"github.com/quexten/goldwarden/cli/agent/sockets"
+	"github.com/quexten/goldwarden/cli/agent/vault"
+	"github.com/quexten/goldwarden/cli/ipc/messages"
 )
 
 func handleSetApiURL(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

agent/actions/getclicredentials.go → cli/agent/actions/getclicredentials.go

@@ -3,12 +3,12 @@ package actions
 import (
 	"fmt"
 
-	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/sockets"
-	"github.com/quexten/goldwarden/agent/systemauth"
-	"github.com/quexten/goldwarden/agent/systemauth/pinentry"
-	"github.com/quexten/goldwarden/agent/vault"
-	"github.com/quexten/goldwarden/ipc/messages"
+	"github.com/quexten/goldwarden/cli/agent/config"
+	"github.com/quexten/goldwarden/cli/agent/sockets"
+	"github.com/quexten/goldwarden/cli/agent/systemauth"
+	"github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
+	"github.com/quexten/goldwarden/cli/agent/vault"
+	"github.com/quexten/goldwarden/cli/ipc/messages"
 )
 
 func handleGetCliCredentials(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

agent/actions/login.go → cli/agent/actions/login.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/quexten/goldwarden/agent/bitwarden"
-	"github.com/quexten/goldwarden/agent/bitwarden/crypto"
-	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/notify"
-	"github.com/quexten/goldwarden/agent/sockets"
-	"github.com/quexten/goldwarden/agent/vault"
-	"github.com/quexten/goldwarden/ipc/messages"
+	"github.com/quexten/goldwarden/cli/agent/bitwarden"
+	"github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
+	"github.com/quexten/goldwarden/cli/agent/config"
+	"github.com/quexten/goldwarden/cli/agent/notify"
+	"github.com/quexten/goldwarden/cli/agent/sockets"
+	"github.com/quexten/goldwarden/cli/agent/vault"
+	"github.com/quexten/goldwarden/cli/ipc/messages"
 )
 
 func handleLogin(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) {

agent/actions/logins.go → cli/agent/actions/logins.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"runtime/debug"
 
-	"github.com/quexten/goldwarden/agent/bitwarden/crypto"
-	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/sockets"
-	"github.com/quexten/goldwarden/agent/systemauth"
-	"github.com/quexten/goldwarden/agent/systemauth/pinentry"
-	"github.com/quexten/goldwarden/agent/vault"
-	"github.com/quexten/goldwarden/ipc/messages"
+	"github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
+	"github.com/quexten/goldwarden/cli/agent/config"
+	"github.com/quexten/goldwarden/cli/agent/sockets"
+	"github.com/quexten/goldwarden/cli/agent/systemauth"
+	"github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
+	"github.com/quexten/goldwarden/cli/agent/vault"
+	"github.com/quexten/goldwarden/cli/ipc/messages"
 )
 
 func handleGetLoginCipher(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {