Skip to content

Commit

Permalink
Merge branch 'km/beeep/fido2-rust-v2'
Browse files Browse the repository at this point in the history
  • Loading branch information
quexten committed Dec 19, 2024
2 parents ac6112d + 91e8fcd commit 11cb624
Show file tree
Hide file tree
Showing 19 changed files with 466 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ jobs:
- name: Set up environment
run: |
sudo apt-get update
sudo apt-get -y install pkg-config libxss-dev rpm musl-dev musl-tools flatpak flatpak-builder
sudo apt-get -y install pkg-config libxss-dev libusb-1.0-0-dev libudev-dev linux-headers-generic rpm musl-dev musl-tools flatpak flatpak-builder
sudo updatedb && locate hidraw.h
- name: Set up Snap
run: sudo snap install snapcraft --classic
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ jobs:
- name: Check Rust version
run: rustup --version

- name: Install gnome-keyring
if: ${{ matrix.os=='ubuntu-latest' }}
- name: Install dependencies
if: ${{ matrix.os=='ubuntu-22.04' }}
run: |
sudo apt-get update
sudo apt-get install -y gnome-keyring dbus-x11
sudo apt-get install -y gnome-keyring dbus-x11 libusb-1.0-0-dev libudev-dev
- name: Check out repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand All @@ -127,7 +127,7 @@ jobs:
run: cargo build

- name: Test Ubuntu
if: ${{ matrix.os=='ubuntu-latest' }}
if: ${{ matrix.os=='ubuntu-22.04' }}
working-directory: ./apps/desktop/desktop_native
run: |
eval "$(dbus-launch --sh-syntax)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,4 +340,15 @@ export abstract class BrowserPlatformUtilsService implements PlatformUtilsServic

return "";
}

supportsNativeWebauthn(): boolean {
return false;
}
performNativeWebauthnAuthentication(
challenge: string,
credentials: Array<string>,
origin: string,
): Promise<string> {
throw new Error("Method not implemented.");
}
}
11 changes: 11 additions & 0 deletions apps/cli/src/platform/services/cli-platform-utils.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,15 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
getAutofillKeyboardShortcut(): Promise<string> {
return null;
}

supportsNativeWebauthn(): boolean {
return false;
}
performNativeWebauthnAuthentication(
challenge: string,
credentials: Array<string>,
origin: string,
): Promise<string> {
throw new Error("Method not implemented.");
}
}
Loading

0 comments on commit 11cb624

Please sign in to comment.