Merge pull request #126 from CodeGov-org/nathan/fix-ii-and-candid

fix: ii integration and governance canister candid

Author: nathanosdev

scripts/canisters/governance.did

@@ -41,9 +41,9 @@ describe('User Profile', () => {
       const res = await driver.actor.list_reviewer_profiles();
       const resOk = extractOkResponse(res);
 
-      expect(resOk).toEqual({
-        profiles: [alice, bob],
-      });
+      expect(resOk.profiles).toBeArrayOfSize(2);
+      expect(resOk.profiles).toContainEqual(alice);
+      expect(resOk.profiles).toContainEqual(bob);
     });
   });
 

src/backend/integration/src/tests/user_profile.spec.ts

@@ -2,7 +2,7 @@
   {
     "match": "**/*",
     "headers": {
-      "Content-Security-Policy": "default-src 'self'; connect-src 'self' https://icp-api.io; img-src 'self' https://icp0.io http://localhost; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; form-action 'self'; object-src 'none'; frame-ancestors 'none'; upgrade-insecure-requests; block-all-mixed-content",
+      "Content-Security-Policy": "default-src 'self'; connect-src 'self' https://icp-api.io; img-src 'self' https://icp0.io http://localhost blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; form-action 'self'; object-src 'none'; frame-ancestors 'none'; upgrade-insecure-requests; block-all-mixed-content",
       "Permissions-Policy": "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), fullscreen=(), geolocation=(), gyroscope=(), keyboard-map=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=(), clipboard-read=(), clipboard-write=(), gamepad=(), speaker-selection=(), conversion-measurement=(), focus-without-user-activation=(), hid=(), idle-detection=(), interest-cohort=(), serial=(), sync-script=(), trust-token-redemption=(), window-placement=(), vertical-scroll=()",
       "X-Frame-Options": "DENY",
       "Referrer-Policy": "same-origin",

src/frontend/src/.ic-assets.json

@@ -29,7 +29,6 @@ export const APP_CONFIG: ApplicationConfig = {
     }),
     provideIcAuth({
       identityProvider: ENV.IDENTITY_PROVIDER,
-      derivationOrigin: ENV.DERIVATION_ORIGIN,
     }),
   ],
 };

src/frontend/src/app/app.config.ts

@@ -9,18 +9,9 @@ export const BACKEND_ORIGIN = IS_MAINNET
   ? `https://${CANISTER_ID_BACKEND}.icp0.io`
   : `http://${CANISTER_ID_BACKEND}.localhost:8080`;
 
-export const CANISTER_ID_MARKETING = import.meta.CANISTER_ID_MARKETING ?? '';
-
 export const CANISTER_ID_INTERNET_IDENTITY =
   import.meta.CANISTER_ID_INTERNET_IDENTITY ?? '';
 
 export const IDENTITY_PROVIDER = IS_MAINNET
   ? 'https://identity.ic0.app'
   : `http://${CANISTER_ID_INTERNET_IDENTITY}.localhost:8080`;
-
-// don't use derivation origins locally because II rejects them as invalid
-// this can be enabled locally once II supports it
-// Use this value for local support: `http://${CANISTER_ID_MARKETING}.localhost:8000`;
-export const DERIVATION_ORIGIN = IS_MAINNET
-  ? `https://${CANISTER_ID_MARKETING}.icp0.io`
-  : undefined;

src/frontend/src/environments/environment.common.ts

@@ -2,7 +2,6 @@ import {
   API_GATEWAY,
   BACKEND_ORIGIN,
   CANISTER_ID_BACKEND,
-  DERIVATION_ORIGIN,
   DFX_NETWORK,
   IDENTITY_PROVIDER,
   IS_MAINNET,
@@ -15,5 +14,4 @@ export const ENV = {
   DFX_NETWORK,
   IDENTITY_PROVIDER,
   IS_MAINNET,
-  DERIVATION_ORIGIN,
 };

src/frontend/src/environments/environment.development.ts

@@ -2,7 +2,6 @@ import {
   API_GATEWAY,
   BACKEND_ORIGIN,
   CANISTER_ID_BACKEND,
-  DERIVATION_ORIGIN,
   DFX_NETWORK,
   IDENTITY_PROVIDER,
   IS_MAINNET,
@@ -15,5 +14,4 @@ export const ENV = {
   DFX_NETWORK,
   IDENTITY_PROVIDER,
   IS_MAINNET,
-  DERIVATION_ORIGIN,
 };

src/frontend/src/environments/environment.ts

@@ -1,6 +1,5 @@
 interface ImportMeta {
   CANISTER_ID_BACKEND?: string;
-  CANISTER_ID_MARKETING?: string;
   CANISTER_ID_INTERNET_IDENTITY?: string;
   DFX_NETWORK?: string;
 }

src/frontend/src/typings.d.ts

@@ -5,7 +5,7 @@
   "version": "0.0.1",
   "scripts": {
     "start": "astro dev",
-    "build": "astro check && astro build && node ./generate-alt-origins.mjs"
+    "build": "astro check && astro build"
   },
   "dependencies": {
     "@astrojs/netlify": "^5.2.0",