Merge branch 'main' into tests

Author: Tyrrrz

.github/workflows/bump.yml

@@ -29,7 +29,15 @@ jobs:
           version=$(echo "$props" | grep -oPm1 "(?<=<Version>)[^<]*")
           echo "version=$version" >> $GITHUB_OUTPUT
 
-      - name: Validate new version
+      - name: Validate new version (format)
+        # Use regex to make sure the version is 1.2.3 or 1.2.3-ci-abcdef0
+        run: |
+          if ! [[ "${{ inputs.version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z].*)?$ ]]; then
+              echo "Invalid version: ${{ inputs.version }}"
+              exit 1
+          fi
+
+      - name: Validate new version (increment)
         run: >
           npx semver@7.5.4 "${{ inputs.version }}"
           --range "> ${{ steps.current-version.outputs.version }}"

.github/workflows/main.yml

@@ -38,6 +38,34 @@ env:
 #   steps to more sensitive access scopes.
 
 jobs:
+  # Determine version
+  version:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Determine stable version
+        id: stable-version
+        if: ${{ github.event_name == 'release' }}
+        run: |
+          if ! [[ "${{ github.event.release.tag_name }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z].*)?$ ]]; then
+              echo "Invalid version: ${{ github.event.release.tag_name }}"
+              exit 1
+          fi
+          
+          echo "version=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+
+      - name: Determine prerelease version
+        id: pre-version
+        if: ${{ github.event_name != 'release' }}
+        run: |
+          hash="${{ github.event.pull_request.head.sha || github.sha }}"
+          echo "version=0.0.0-ci-${hash:0:7}" >> $GITHUB_OUTPUT
+
+    outputs:
+      version: ${{ steps.stable-version.outputs.version || steps.pre-version.outputs.version }}
+
   # Check formatting
   format:
     runs-on: ubuntu-latest
@@ -98,6 +126,7 @@ jobs:
 
   # Pack the output into NuGet packages
   pack:
+    needs: version
     runs-on: ubuntu-latest
     permissions:
       actions: write
@@ -120,29 +149,14 @@ jobs:
           --configuration Release
           -p:ContinuousIntegrationBuild=true
 
-      # When triggered by `push` or `pull_request` events, generate a prerelease version
-      # for the packages, so as to clearly indicate that it's not a stable version release.
-      - name: Generate prerelease version
-        id: prerelease-version
-        if: ${{ github.event_name != 'release' }}
-        run: |
-          time=$(date +%s)
-          ref="${{ github.head_ref || github.ref_name }}"
-          
-          ref_clean=$ref
-          ref_clean="${ref_clean/\//-}"
-          ref_clean="${ref_clean/_/-}"
-          
-          echo "version=0.0.0-ci-$time-$ref_clean" >> $GITHUB_OUTPUT
-
-      - name: Create packages
+      - name: Run pack
         run: >
           dotnet pack
+          -p:Version=${{ needs.version.outputs.version }}
+          -p:ContinuousIntegrationBuild=true
           --no-restore
           --no-build
           --configuration Release
-          -p:ContinuousIntegrationBuild=true
-          ${{ steps.prerelease-version.outputs.version && format('-p:Version={0}', steps.prerelease-version.outputs.version) || '' }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
@@ -192,7 +206,10 @@ jobs:
   # Notify the Slack channel about the release
   notify:
     if: ${{ github.event_name == 'release' }}
-    needs: deploy
+    needs:
+      - version
+      - deploy
+
     runs-on: ubuntu-latest
 
     steps:
@@ -205,5 +222,5 @@ jobs:
             Content-Type: application/json; charset=UTF-8
           body: |
             {
-              "text": "*Passwordless-dotnet* version `${{ github.event.release.name }}` has been released! 🎉\nDetails: ${{ github.event.release.html_url }}"
+              "text": "*Passwordless-dotnet* version `${{ needs.version.outputs.version }}` has been released! 🎉\nDetails: ${{ github.event.release.html_url }}"
             }

src/Passwordless/Models/Credential.cs

@@ -101,4 +101,19 @@ public Credential(CredentialDescriptor descriptor, byte[] publicKey, byte[] user
     /// Identifier for the user
     /// </summary>
     public string UserId { get; }
+
+    /// <summary>
+    /// Whether the credential is synced (or backed up or not).
+    /// </summary>
+    public bool? BackupState { get; set; }
+
+    /// <summary>
+    /// Whether the credential is eligible for backup or syncing
+    /// </summary>
+    public bool? IsBackupEligible { get; set; }
+
+    /// <summary>
+    /// Whether the credential is discoverable
+    /// </summary>
+    public bool? IsDiscoverable { get; set; }
 }