From 491d8e7413f48f2645ceb6cded35c169e7eab216 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 13:39:49 +0900 Subject: [PATCH 01/10] Changing the email provider values --- ansible/dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/dev.yaml b/ansible/dev.yaml index 577abd68..6e2b15c9 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -69,11 +69,11 @@ network_mode: oasst env: FASTAPI_URL: http://oasst-backend:8080 - FASTAPI_KEY: "123" + FASTAPI_KEY: 123 DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres NEXTAUTH_SECRET: O/M2uIbGj+lDD2oyNa8ax4jEOJqCPJzO53UbWShmq98= EMAIL_SERVER_HOST: oasst-maildev - EMAIL_SERVER_PORT: "25" + EMAIL_SERVER_PORT: 1025 EMAIL_FROM: info@example.com NEXTAUTH_URL: http://web.dev.open-assistant.io/ DEBUG_LOGIN: "true" From d2dd96b43a97766946eed0b605406cde31aefd2f Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 13:47:01 +0900 Subject: [PATCH 02/10] Wrapping numbers in quotes after learning ansible --- ansible/dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/dev.yaml b/ansible/dev.yaml index 6e2b15c9..940e6cbc 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -69,11 +69,11 @@ network_mode: oasst env: FASTAPI_URL: http://oasst-backend:8080 - FASTAPI_KEY: 123 + FASTAPI_KEY: "1234" DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres NEXTAUTH_SECRET: O/M2uIbGj+lDD2oyNa8ax4jEOJqCPJzO53UbWShmq98= EMAIL_SERVER_HOST: oasst-maildev - EMAIL_SERVER_PORT: 1025 + EMAIL_SERVER_PORT: "1025" EMAIL_FROM: info@example.com NEXTAUTH_URL: http://web.dev.open-assistant.io/ DEBUG_LOGIN: "true" From 310763ebb8643c137b997d5cada550e4e60cb05e Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 14:07:30 +0900 Subject: [PATCH 03/10] Adding discord credentials to dev deployment --- .github/workflows/release.yaml | 3 +++ ansible/dev.yaml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e7b8806c..17b00357 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,6 +30,9 @@ jobs: deploy-dev: needs: [build-backend, build-web, build-bot] runs-on: ubuntu-latest + env: + WEB_DISCORD_CLIENT_ID: ${{ secrets.DEV_WEB_DISCORD_CLIENT_ID }} + WEB_DISCORD_CLIENT_SECRET: ${{ secrets.DEV_WEB_DISCORD_CLIENT_SECRET }} steps: - name: Checkout uses: actions/checkout@v2 diff --git a/ansible/dev.yaml b/ansible/dev.yaml index 940e6cbc..16cb0a17 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -39,6 +39,8 @@ state: started restart_policy: always network_mode: oasst + ports: + - 1080:1080 - name: Run the oasst oasst-backend community.docker.docker_container: @@ -68,6 +70,8 @@ restart_policy: always network_mode: oasst env: + DISCORD_CLIENT_ID: "{{ lookup('WEB_DISCORD_CLIENT_ID') }} " + DISCORD_CLIENT_SECRET: "{{ lookup('WEB_DISCORD_CLIENT_SECRET') }} " FASTAPI_URL: http://oasst-backend:8080 FASTAPI_KEY: "1234" DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres From f22abd524bd252f1df4b7bdc824cddacf28400b1 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 14:16:49 +0900 Subject: [PATCH 04/10] Adding discord credentials to dev deployment --- ansible/dev.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/dev.yaml b/ansible/dev.yaml index 16cb0a17..53f920df 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -70,8 +70,10 @@ restart_policy: always network_mode: oasst env: - DISCORD_CLIENT_ID: "{{ lookup('WEB_DISCORD_CLIENT_ID') }} " - DISCORD_CLIENT_SECRET: "{{ lookup('WEB_DISCORD_CLIENT_SECRET') }} " + DISCORD_CLIENT_ID: + "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_ID') }} " + DISCORD_CLIENT_SECRET: + "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_SECRET') }} " FASTAPI_URL: http://oasst-backend:8080 FASTAPI_KEY: "1234" DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres From 00e51af787b67c1b8c13adb70150affe0ec36fb6 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 14:43:45 +0900 Subject: [PATCH 05/10] Adding the email secrets and environment variables --- .github/workflows/release.yaml | 4 ++++ ansible/dev.yaml | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 17b00357..eec73daa 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,6 +33,10 @@ jobs: env: WEB_DISCORD_CLIENT_ID: ${{ secrets.DEV_WEB_DISCORD_CLIENT_ID }} WEB_DISCORD_CLIENT_SECRET: ${{ secrets.DEV_WEB_DISCORD_CLIENT_SECRET }} + WEB_EMAIL_SERVER_HOST: ${{ secrets.DEV_WEB_EMAIL_SERVER_HOST }} + WEB_EMAIL_SERVER_PASSWORD: ${{ secrets.DEV_WEB_EMAIL_SERVER_PASSWORD }} + WEB_EMAIL_SERVER_PORT: ${{ secrets.DEV_WEB_EMAIL_SERVER_PORT }} + WEB_EMAIL_SERVER_USER: ${{ secrets.DEV_WEB_EMAIL_SERVER_USER }} steps: - name: Checkout uses: actions/checkout@v2 diff --git a/ansible/dev.yaml b/ansible/dev.yaml index 53f920df..cf0d70a4 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -71,16 +71,22 @@ network_mode: oasst env: DISCORD_CLIENT_ID: - "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_ID') }} " + "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_ID') }}" DISCORD_CLIENT_SECRET: - "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_SECRET') }} " + "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_SECRET') }}" + EMAIL_SERVER_FROM: open-assistent@laion.ai + EMAIL_SERVER_HOST: + "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_HOST') }}" + EMAIL_SERVER_PASSWORD: + "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_PASSWORD') }}" + EMAIL_SERVER_PORT: + "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_PORT') }}" + EMAIL_SERVER_USER: + "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_USER') }}" FASTAPI_URL: http://oasst-backend:8080 FASTAPI_KEY: "1234" DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres NEXTAUTH_SECRET: O/M2uIbGj+lDD2oyNa8ax4jEOJqCPJzO53UbWShmq98= - EMAIL_SERVER_HOST: oasst-maildev - EMAIL_SERVER_PORT: "1025" - EMAIL_FROM: info@example.com NEXTAUTH_URL: http://web.dev.open-assistant.io/ DEBUG_LOGIN: "true" ports: From 0e9fd9a14059321ba6ef02e595c348795077db80 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 14:56:13 +0900 Subject: [PATCH 06/10] Seeing the admin users, email from, and next auth secret secrets --- .github/workflows/release.yaml | 2 ++ ansible/dev.yaml | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eec73daa..dea9c15d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -31,12 +31,14 @@ jobs: needs: [build-backend, build-web, build-bot] runs-on: ubuntu-latest env: + WEB_ADMIN_USERS: ${{ secrets.DEV_WEB_ADMIN_USERS }} WEB_DISCORD_CLIENT_ID: ${{ secrets.DEV_WEB_DISCORD_CLIENT_ID }} WEB_DISCORD_CLIENT_SECRET: ${{ secrets.DEV_WEB_DISCORD_CLIENT_SECRET }} WEB_EMAIL_SERVER_HOST: ${{ secrets.DEV_WEB_EMAIL_SERVER_HOST }} WEB_EMAIL_SERVER_PASSWORD: ${{ secrets.DEV_WEB_EMAIL_SERVER_PASSWORD }} WEB_EMAIL_SERVER_PORT: ${{ secrets.DEV_WEB_EMAIL_SERVER_PORT }} WEB_EMAIL_SERVER_USER: ${{ secrets.DEV_WEB_EMAIL_SERVER_USER }} + WEB_NEXTAUTH_SECRET: ${{ secrets.DEV_WEB_NEXTAUTH_SECRET }} steps: - name: Checkout uses: actions/checkout@v2 diff --git a/ansible/dev.yaml b/ansible/dev.yaml index cf0d70a4..48be673e 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -70,11 +70,14 @@ restart_policy: always network_mode: oasst env: + ADMIN_USERS: "{{ lookup('ansible.builtin.env', 'WEB_ADMIN_USERS') }}" + DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres + DEBUG_LOGIN: "true" DISCORD_CLIENT_ID: "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_ID') }}" DISCORD_CLIENT_SECRET: "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_SECRET') }}" - EMAIL_SERVER_FROM: open-assistent@laion.ai + EMAIL_FROM: open-assistent@laion.ai EMAIL_SERVER_HOST: "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_HOST') }}" EMAIL_SERVER_PASSWORD: @@ -85,10 +88,9 @@ "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_USER') }}" FASTAPI_URL: http://oasst-backend:8080 FASTAPI_KEY: "1234" - DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres - NEXTAUTH_SECRET: O/M2uIbGj+lDD2oyNa8ax4jEOJqCPJzO53UbWShmq98= + NEXTAUTH_SECRET: + "{{ lookup('ansible.builtin.env', 'WEB_NEXTAUTH_SECRET') }}" NEXTAUTH_URL: http://web.dev.open-assistant.io/ - DEBUG_LOGIN: "true" ports: - 3000:3000 command: bash wait-for-postgres.sh node server.js From 2ca2abf4c193f6b9e95371989a96ab4d161fc7b8 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 15:25:02 +0900 Subject: [PATCH 07/10] Adding some debug stuff on admin --- website/src/pages/admin/index.tsx | 1 + website/src/pages/api/auth/[...nextauth].ts | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/website/src/pages/admin/index.tsx b/website/src/pages/admin/index.tsx index 9cbea222..7bfdad63 100644 --- a/website/src/pages/admin/index.tsx +++ b/website/src/pages/admin/index.tsx @@ -22,6 +22,7 @@ const AdminIndex = () => { if (status === "loading") { return; } + console.log("checking role: " + session?.user?.role); if (session?.user?.role === "admin") { return; } diff --git a/website/src/pages/api/auth/[...nextauth].ts b/website/src/pages/api/auth/[...nextauth].ts index 363c1404..4108d53c 100644 --- a/website/src/pages/api/auth/[...nextauth].ts +++ b/website/src/pages/api/auth/[...nextauth].ts @@ -69,6 +69,8 @@ const adminUserMap = process.env.ADMIN_USERS.split(",").reduce((result, entry) = result.set(authType, s); return result; }, new Map()); +console.log(adminUserMap); +console.log(process.env.ADMIN_USERS); export const authOptions: AuthOptions = { // Ensure we can store user data in a database. @@ -97,6 +99,7 @@ export const authOptions: AuthOptions = { where: { id: token.sub }, select: { role: true }, }); + console.log("found role: " + role); token.role = role; return token; }, @@ -118,6 +121,7 @@ export const authOptions: AuthOptions = { // Update the database if the user is an admin. if (adminForAccountType.has(account.providerAccountId)) { + console.log("updating admin"); await prisma.user.update({ data: { role: "admin", From 5b70b6c35cc021ab84df6e96a26791f5881ef29f Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 15:34:45 +0900 Subject: [PATCH 08/10] Revert "Adding some debug stuff on admin" This reverts commit 2ca2abf4c193f6b9e95371989a96ab4d161fc7b8. --- website/src/pages/admin/index.tsx | 1 - website/src/pages/api/auth/[...nextauth].ts | 4 ---- 2 files changed, 5 deletions(-) diff --git a/website/src/pages/admin/index.tsx b/website/src/pages/admin/index.tsx index 7bfdad63..9cbea222 100644 --- a/website/src/pages/admin/index.tsx +++ b/website/src/pages/admin/index.tsx @@ -22,7 +22,6 @@ const AdminIndex = () => { if (status === "loading") { return; } - console.log("checking role: " + session?.user?.role); if (session?.user?.role === "admin") { return; } diff --git a/website/src/pages/api/auth/[...nextauth].ts b/website/src/pages/api/auth/[...nextauth].ts index 4108d53c..363c1404 100644 --- a/website/src/pages/api/auth/[...nextauth].ts +++ b/website/src/pages/api/auth/[...nextauth].ts @@ -69,8 +69,6 @@ const adminUserMap = process.env.ADMIN_USERS.split(",").reduce((result, entry) = result.set(authType, s); return result; }, new Map()); -console.log(adminUserMap); -console.log(process.env.ADMIN_USERS); export const authOptions: AuthOptions = { // Ensure we can store user data in a database. @@ -99,7 +97,6 @@ export const authOptions: AuthOptions = { where: { id: token.sub }, select: { role: true }, }); - console.log("found role: " + role); token.role = role; return token; }, @@ -121,7 +118,6 @@ export const authOptions: AuthOptions = { // Update the database if the user is an admin. if (adminForAccountType.has(account.providerAccountId)) { - console.log("updating admin"); await prisma.user.update({ data: { role: "admin", From c1b3029f8ba0c0981e94d0942e2824c044d54a71 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 15:46:45 +0900 Subject: [PATCH 09/10] Deleting the maildev stanza now that we're using a real email server --- ansible/dev.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ansible/dev.yaml b/ansible/dev.yaml index 48be673e..8acdb8a4 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -32,16 +32,6 @@ - name: oasst-postgres - name: oasst-postgres-web - - name: Set up maildev - community.docker.docker_container: - name: oasst-maildev - image: maildev/maildev - state: started - restart_policy: always - network_mode: oasst - ports: - - 1080:1080 - - name: Run the oasst oasst-backend community.docker.docker_container: name: oasst-backend From 5e07480f149283a831aee1e033b47a5d590fb75b Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 15:54:30 +0900 Subject: [PATCH 10/10] Remove the workflow dispatch option --- .github/workflows/release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dea9c15d..1bf0ac6a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,7 +1,6 @@ name: Release on: - workflow_dispatch: release: types: [released]