Merge pull request #939 from ThanatosDi/refactor/force-set-supabase-username

refactor: remove supabase username variable and force set to "supabase_auth_admin"

deploy.env

@@ -9,7 +9,6 @@ POSTGRES_PORT=5432
 POSTGRES_DB=postgres
 
 # Supabase user settings
-SUPABASE_USER=supabase_auth_admin
 SUPABASE_PASSWORD=root
 
 # Redis Settings
@@ -71,7 +70,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

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

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

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

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'
+        WHERE rolname = 'supabase_auth_admin'
-    ) THEN CREATE USER "$SUPABASE_USER" BYPASSRLS NOINHERIT CREATEROLE LOGIN NOREPLICATION PASSWORD '$SUPABASE_PASSWORD';
+    ) 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