From 248c62dfbf664e6758167f1114562e3d8155a9d0 Mon Sep 17 00:00:00 2001
From: ThanatosDi <yykkold55tw@gmail.com>
Date: Sat, 26 Oct 2024 13:22:03 +0800
Subject: [PATCH 1/3] refactor: #934 remove SUPABASE_USER variable

---
 deploy.env             | 4 ++--
 docker-compose-ci.yml  | 1 -
 docker-compose-dev.yml | 1 -
 docker-compose.yml     | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/deploy.env b/deploy.env
index 75adfea0..607e638e 100644
--- a/deploy.env
+++ b/deploy.env
@@ -9,7 +9,7 @@ POSTGRES_PORT=5432
 POSTGRES_DB=postgres
 
 # Supabase user settings
-SUPABASE_USER=supabase_auth_admin
+# SUPABASE_USER=supabase_auth_admin #934 force set username supabase_auth_admin
 SUPABASE_PASSWORD=root
 
 # Redis Settings
@@ -71,7 +71,7 @@ API_EXTERNAL_URL=http://your-host
 
 # In docker environment, `postgres` is the hostname of the postgres service
 # GoTrue connect to postgres using this url
-GOTRUE_DATABASE_URL=postgres://${SUPABASE_USER}:${SUPABASE_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+GOTRUE_DATABASE_URL=postgres://supabase_auth_admin:${SUPABASE_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
 
 # Refer to this for details: https://github.com/AppFlowy-IO/AppFlowy-Cloud/blob/main/doc/AUTHENTICATION.md
 # Google OAuth2
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index 37c9085b..526a01a8 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -36,7 +36,6 @@ services:
       - POSTGRES_DB=${POSTGRES_DB:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
       - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
-      - SUPABASE_USER=${SUPABASE_USER:-supabase_auth_admin}
       - SUPABASE_PASSWORD=${SUPABASE_PASSWORD:-root}
     volumes:
       - ./migrations/before:/docker-entrypoint-initdb.d
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 741c44c0..33dd18f4 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -27,7 +27,6 @@ services:
       - POSTGRES_DB=${POSTGRES_DB:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
       - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
-      - SUPABASE_USER=${SUPABASE_USER:-supabase_auth_admin}
       - SUPABASE_PASSWORD=${SUPABASE_PASSWORD:-root}
     ports:
       - 5432:5432
diff --git a/docker-compose.yml b/docker-compose.yml
index aabf92ff..92b44787 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,6 @@ services:
       - POSTGRES_DB=${POSTGRES_DB:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
       - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
-      - SUPABASE_USER=${SUPABASE_USER:-supabase_auth_admin}
       - SUPABASE_PASSWORD=${SUPABASE_PASSWORD:-root}
     volumes:
       - ./migrations/before:/docker-entrypoint-initdb.d

From 8d730b54e67a491ab330df81cf14ed0b178e500e Mon Sep 17 00:00:00 2001
From: ThanatosDi <yykkold55tw@gmail.com>
Date: Sat, 26 Oct 2024 13:22:39 +0800
Subject: [PATCH 2/3] refactor: #934 force set supabase username
 "supabase_auth_admin"

---
 migrations/before/supabase_auth.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/migrations/before/supabase_auth.sh b/migrations/before/supabase_auth.sh
index c83a0a0b..d483ebc4 100755
--- a/migrations/before/supabase_auth.sh
+++ b/migrations/before/supabase_auth.sh
@@ -19,17 +19,17 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
     DO \$\$ BEGIN IF NOT EXISTS (
         SELECT
         FROM pg_catalog.pg_roles
-        WHERE rolname = '$SUPABASE_USER'
-    ) THEN CREATE USER "$SUPABASE_USER" BYPASSRLS NOINHERIT CREATEROLE LOGIN NOREPLICATION PASSWORD '$SUPABASE_PASSWORD';
+        WHERE rolname = 'supabase_auth_admin'
+    ) THEN CREATE USER "supabase_auth_admin" BYPASSRLS NOINHERIT CREATEROLE LOGIN NOREPLICATION PASSWORD '$SUPABASE_PASSWORD';
     END IF;
     END \$\$;
 
     -- Create auth schema if it does not exist
-    CREATE SCHEMA IF NOT EXISTS auth AUTHORIZATION $SUPABASE_USER;
+    CREATE SCHEMA IF NOT EXISTS auth AUTHORIZATION supabase_auth_admin;
 
     -- Grant permissions
-    GRANT CREATE ON DATABASE postgres TO $SUPABASE_USER;
+    GRANT CREATE ON DATABASE postgres TO supabase_auth_admin;
 
     -- Set search_path for supabase_auth_admin
-    ALTER USER $SUPABASE_USER SET search_path = 'auth';
+    ALTER USER supabase_auth_admin SET search_path = 'auth';
 EOSQL

From 8a3bc89015e0ba089469422b9eda1c993f7d45f0 Mon Sep 17 00:00:00 2001
From: ThanatosDi <yykkold55tw@gmail.com>
Date: Mon, 28 Oct 2024 22:34:17 +0800
Subject: [PATCH 3/3] refactor: remove comment

---
 deploy.env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy.env b/deploy.env
index 607e638e..c8b80dd3 100644
--- a/deploy.env
+++ b/deploy.env
@@ -9,7 +9,6 @@ POSTGRES_PORT=5432
 POSTGRES_DB=postgres
 
 # Supabase user settings
-# SUPABASE_USER=supabase_auth_admin #934 force set username supabase_auth_admin
 SUPABASE_PASSWORD=root
 
 # Redis Settings