Merge branch 'main' into arshavir/enforce-unique-passkey-pubkeys

Author: aterga

.github/workflows/canister-tests.yml

@@ -137,6 +137,46 @@ jobs:
           # downloaded file
           path: archive.wasm.gz
 
+  docker-build-internet_identity_frontend:
+    runs-on: ubuntu-latest
+    needs: docker-build-base
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Infer version
+        id: version
+        run: |
+          version="$(./scripts/version)"
+          echo "Inferred version: '$version'"
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+
+      - name: Set up docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build internet_identity_frontend.wasm.gz
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          build-args: |
+            II_VERSION=${{ steps.version.outputs.version }}
+            II_DEV_CSP=0
+          cache-from: type=gha,scope=cached-stage
+          # Exports the artefacts from the final stage
+          outputs: ./out
+          target: scratch_internet_identity_frontend
+
+      - run: mv out/internet_identity_frontend.wasm.gz internet_identity_frontend.wasm.gz
+      - run: sha256sum internet_identity_frontend.wasm.gz
+      - name: "Upload internet_identity_frontend.wasm.gz"
+        uses: actions/upload-artifact@v4
+        with:
+          # name is the name used to display and retrieve the artifact
+          name: internet_identity_frontend.wasm.gz
+          # path is the name used as the file to upload and the name of the
+          # downloaded file
+          path: internet_identity_frontend.wasm.gz
+
   wasm-size:
     runs-on: ubuntu-latest
     needs: docker-build-ii
@@ -518,7 +558,7 @@ jobs:
           svg='<svg viewBox=\\\"0 0 24 24\\\"><path d=\\\"m14 2.8-2.6 1.8v16.6l2.6-1.4zm-3.3 5.4C1.9 9 2 14.7 2 14.7c0 5.6 8.7 6.5 8.7 6.5v-1.9c-6.3-1-5.5-4.5-5.5-4.5.3-4 5.5-4.3 5.5-4.3Zm4 0v2.1s1.6 0 3 1.2l-1.5.6 5.8 1.4V9l-2 1.1s-1.7-1.7-5.3-1.9z\\\" style=\\\"fill: currentColor;\\\"></path></svg>'
           configs=()
           for port in ${{ env.openid_providers }}; do
-            configs+=("record { name = \\\"Test OpenID $port\\\"; logo = \\\"$svg\\\"; issuer = \\\"http://localhost:$port\\\"; client_id = \\\"internet_identity\\\"; jwks_uri = \\\"http://localhost:$port/jwks\\\"; auth_uri = \\\"http://localhost:$port/auth\\\"; auth_scope = vec { \\\"openid\\\"; \\\"profile\\\"; \\\"email\\\" }; fedcm_uri = opt \\\"\\\"; }")
+            configs+=("record { name = \\\"Test OpenID $port\\\"; logo = \\\"$svg\\\"; issuer = \\\"http://localhost:$port\\\"; client_id = \\\"internet_identity\\\"; jwks_uri = \\\"http://localhost:$port/jwks\\\"; auth_uri = \\\"http://localhost:$port/auth\\\"; auth_scope = vec { \\\"openid\\\"; \\\"profile\\\"; \\\"email\\\" }; fedcm_uri = opt \\\"\\\"; email_verification = opt variant { Google }; }")
           done
           openid_configs="$(IFS='; '; echo "${configs[*]}")"
           echo "OPENID_CONFIGS=$openid_configs" >> "$GITHUB_OUTPUT"
@@ -528,7 +568,8 @@ jobs:
           # NOTE: dfx install will run the postinstall scripts from dfx.json
           dfx canister install internet_identity --wasm internet_identity_test.wasm.gz --argument "(opt record { captcha_config = opt record { max_unsolved_captchas= 50:nat64; captcha_trigger = variant {Static = variant { CaptchaDisabled }}}; related_origins = opt vec { \"https://id.ai\"; \"https://identity.ic0.app\"; \"https://identity.internetcomputer.org\" }; new_flow_origins = opt vec { \"https://id.ai\" }; dummy_auth = opt opt record { prompt_for_index = true }; openid_configs = opt vec { ${{ steps.openid-configs.outputs.OPENID_CONFIGS }} } })"
           if [ "${{ matrix.canister == 'split' }}" = "true" ]; then
-            dfx canister install internet_identity_frontend --wasm internet_identity_frontend_test.wasm.gz
+            II_CANISTER_ID=$(dfx canister id internet_identity)
+            dfx canister install internet_identity_frontend --wasm internet_identity_frontend_test.wasm.gz --argument "(record { backend_canister_id = principal \"$II_CANISTER_ID\"; backend_origin = \"https://backend.id.ai\"; related_origins = opt vec { \"https://id.ai\"; \"https://identity.ic0.app\"; \"https://identity.internetcomputer.org\" }; dummy_auth = opt opt record { prompt_for_index = true } })"
           fi
           dfx canister install test_app --wasm demos/test-app/test_app.wasm
 
@@ -721,7 +762,13 @@ jobs:
   # On release tags, a new release is created and the assets are uploaded.
   release:
     runs-on: ubuntu-latest
-    needs: [docker-build-ii, docker-build-archive, vc_demo_issuer-build]
+    needs:
+      [
+        docker-build-ii,
+        docker-build-archive,
+        docker-build-internet_identity_frontend,
+        vc_demo_issuer-build,
+      ]
 
     steps:
       - uses: actions/checkout@v4
@@ -750,6 +797,12 @@ jobs:
           name: archive.wasm.gz
           path: .
 
+      - name: "Download frontend"
+        uses: actions/download-artifact@v4
+        with:
+          name: internet_identity_frontend.wasm.gz
+          path: .
+
       - name: "Download issuer"
         uses: actions/download-artifact@v4
         with:
@@ -815,6 +868,7 @@ jobs:
             internet_identity_production.wasm.gz
             internet_identity_dev.wasm.gz
             internet_identity_test.wasm.gz
+            internet_identity_frontend.wasm.gz
             archive.wasm.gz
             vc_demo_issuer.wasm.gz
           production_asset: internet_identity_production.wasm.gz
@@ -842,6 +896,7 @@ jobs:
             internet_identity_production.wasm.gz.sha256 \
             internet_identity_dev.wasm.gz \
             internet_identity_test.wasm.gz \
+            internet_identity_frontend.wasm.gz \
             src/internet_identity/internet_identity.did \
             archive.wasm.gz \
             vc_demo_issuer.wasm.gz

Dockerfile

@@ -99,8 +99,27 @@ RUN touch src/*/src/lib.rs
 RUN ./scripts/build --archive
 RUN sha256sum /archive.wasm.gz
 
+FROM deps as build_internet_identity_frontend
+
+COPY . .
+
+# The version baked in
+ARG II_VERSION=
+
+# The features, see README
+ARG II_DEV_CSP=
+
+RUN touch src/*/src/lib.rs
+RUN npm ci
+
+RUN ./scripts/build --frontend
+RUN sha256sum /internet_identity_frontend.wasm.gz
+
 FROM scratch AS scratch_internet_identity
 COPY --from=build_internet_identity /internet_identity.wasm.gz /
 
 FROM scratch AS scratch_archive
 COPY --from=build_archive /archive.wasm.gz /
+
+FROM scratch AS scratch_internet_identity_frontend
+COPY --from=build_internet_identity_frontend /internet_identity_frontend.wasm.gz /

dfx.json

@@ -5,6 +5,7 @@
       "candid": "src/internet_identity_frontend/internet_identity_frontend.did",
       "wasm": "internet_identity_frontend.wasm.gz",
       "build": "bash -c 'II_DEV_CSP=1 II_FETCH_ROOT_KEY=1 II_DUMMY_CAPTCHA=${II_DUMMY_CAPTCHA:-1} scripts/build --frontend'",
+      "init_arg_file": "src/internet_identity_frontend/local_test_arg.did",
       "shrink": false
     },
     "internet_identity": {
@@ -27,9 +28,7 @@
       "wasm": "demos/vc_issuer/vc_demo_issuer.wasm.gz",
       "build": "demos/vc_issuer/build.sh",
       "post_install": "bash -c 'demos/vc_issuer/provision'",
-      "dependencies": [
-        "internet_identity"
-      ]
+      "dependencies": ["internet_identity"]
     }
   },
   "defaults": {
@@ -39,4 +38,4 @@
   },
   "dfx": "0.29.0",
   "version": 1
-}
+}

scripts/build

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -xeuo pipefail
 
 # Make sure we always run from the root
 SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -84,14 +84,14 @@ if [ ${#CANISTERS[@]} -eq 0 ]; then
     CANISTERS=("internet_identity")
 fi
 
-# Checking for dependencies
-if [[ ! "$(command -v ic-wasm)" || "$(ic-wasm --version)" != "ic-wasm 0.8.5" ]]
-then
-    echo "could not find ic-wasm 0.8.5"
-    echo "ic-wasm version 0.8.5 is needed, please run the following command:"
-    echo "  cargo install ic-wasm --version 0.8.5"
-    exit 1
-fi
+# # Checking for dependencies
+# if [[ ! "$(command -v ic-wasm)" || "$(ic-wasm --version)" != "ic-wasm 0.8.5" ]]
+# then
+#     echo "could not find ic-wasm 0.8.5"
+#     echo "ic-wasm version 0.8.5 is needed, please run the following command:"
+#     echo "  cargo install ic-wasm --version 0.8.5"
+#     exit 1
+# fi
 
 # Check for exact node version
 if [[ "$(node --version)" !=  "v$(cat .node-version)" ]]