Feature/ns to gw

.env.local

@@ -1,4 +1,4 @@
-LOG_LEVEL=info
+LOG_LEVEL=debug
 DISABLE_LOGGING='true'
 AUTH_STRATEGY=Oauth2Proxy
 KNEX_HOST=kong-db
@@ -31,3 +31,10 @@ NEXT_PUBLIC_DEVELOPER_IDS=idir,bceid,bcsc,github
 NEXT_PUBLIC_PROVIDER_IDS=idir
 NEXT_PUBLIC_ACCOUNT_BCEID_URL=https://www.test.bceid.ca/logon.aspx?returnUrl=/profile_management
 NEXT_PUBLIC_ACCOUNT_BCSC_URL=https://idtest.gov.bc.ca/account/
+
+# For automated integrated testing
+TEST_PORTAL_CLIENT_ID=aps-portal
+TEST_PORTAL_CLIENT_SECRET=8e1a17ed-cb93-4806-ac32-e303d1c86018
+TEST_PORTAL_USERNAME=janis@idir
+TEST_PORTAL_PASSWORD=awsummer
+

.github/workflows/ci-build-deploy.yaml

@@ -262,7 +262,7 @@ jobs:
             NEXT_PUBLIC_HELP_ISSUE_URL:
               value: 'https://github.com/bcgov/api-services-portal/issues'
             NEXT_PUBLIC_HELP_API_DOCS_URL:
-              value: '/ds/api/v2/console/'
+              value: '/ds/api/v3/console/'
             NEXT_PUBLIC_HELP_SUPPORT_URL:
               value: 'https://developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/'
             NEXT_PUBLIC_HELP_RELEASE_URL:

.github/workflows/ci-feat-sonar.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Run Tests
         run: |
-          docker compose up kong-db -d
+          docker compose up keycloak -d
 
           set -o allexport
           source ./.env.local

README.md

@@ -67,17 +67,19 @@ Use the following configuration to run the Portal locally (outside of Docker) ag
 
    1. If using Node version > 17, run `npm install --legacy-peer-deps`
 
-1. Turn off the docker compose Portal: `docker stop apsportal`
-1. Configure the `oauth2-proxy` that is running in Docker:
+1. Turn off the docker compose Portal and OAuth2 Proxy: `docker stop apsportal oauth2-proxy`
 
-   1. Update `upstreams` in `local/oauth2-proxy/oauth2-proxy-local.cfg` to include the IP address of your local machine, e.g. `upstreams=["http://172.100.100.01:3000"]`
-      <br>You can obtain the IP address using `hostname -I`.
+1. Start the OAuth2 Proxy locally:
 
-   1. Restart the oauth2-proxy: `docker compose restart oauth2-proxy`
-   1. Update `DESTINATION_URL` in `local/feeds/.env.local` to include the IP address of your local machine
-   1. Restart the feeder: `docker compose restart feeder`
-   1. Update `PORTAL_ACTIVITY_URL` in `local/gwa-api/.env.local` to include the IP address of your local machine
-   1. Restart the feeder: `docker compose restart gwa-api`
+```sh
+hostip=$(ifconfig en0 | awk '$1 == "inet" {print $2}')
+
+docker run -ti --rm --name proxy --net=host \
+  --add-host portal.localtest.me:$hostip \
+  -v `pwd`/local/oauth2-proxy/oauth2-proxy-dev.cfg:/oauth2.config \
+  quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 \
+  --config /oauth2.config
+```
 
 1. Start the Portal locally:
 

e2e/cypress.config.ts

@@ -38,6 +38,7 @@ export default defineConfig({
         './cypress/tests/16-*/*.ts',
         './cypress/tests/17-*/*.ts',
         './cypress/tests/18-*/*.ts',
+        './cypress/tests/19-*/*.ts',
       ]
       return config
     },
@@ -59,7 +60,7 @@ export default defineConfig({
     env: {
       CLIENT_ID: 'aps-portal',
       CLIENT_SECRET: '8e1a17ed-cb93-4806-ac32-e303d1c86018',
-      OIDC_ISSUER: 'http://keycloak.localtest.me:9081',
+      OIDC_ISSUER: 'http://keycloak.localtest.me:9081/auth/realms/master',
       TOKEN_URL:
         'http://keycloak.localtest.me:9081/auth/realms/master/protocol/openid-connect/token',
       GWA_API_URL: 'http://gwa-api.localtest.me:2000/v2',
@@ -69,6 +70,8 @@ export default defineConfig({
       BASE_URL: 'http://oauth2proxy.localtest.me:4180',
       KEYCLOAK_URL: 'http://keycloak.localtest.me:9081',
       WEBAPP_URL: 'http://html-sample-app.localtest.me:4242',
+      DEV_USERNAME: 'janis@idir',
+      DEV_PASSWORD: 'awsummer',
     },
     retries: {
       runMode: 2,