Skip to content

Commit 8a285b6

Browse files
authored
Revert "Oauth Docs "
1 parent 2c51475 commit 8a285b6

File tree

24 files changed

+793
-1827
lines changed

24 files changed

+793
-1827
lines changed

docs/user-guide/authentication/oauth.md

Lines changed: 0 additions & 413 deletions
This file was deleted.

mkdocs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ nav:
7575
- Authentication:
7676
- Overview: user-guide/authentication/index.md
7777
- JWT Tokens: user-guide/authentication/jwt-tokens.md
78-
- OAuth: user-guide/authentication/oauth.md
7978
- User Management: user-guide/authentication/user-management.md
8079
- Permissions: user-guide/authentication/permissions.md
8180
- Admin Panel:

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ dependencies = [
3333
"gunicorn>=23.0.0",
3434
"ruff>=0.11.13",
3535
"mypy>=1.16.0",
36-
"fastapi-sso>=0.18.0",
3736
]
3837

3938
[project.optional-dependencies]
@@ -108,7 +107,6 @@ filterwarnings = [
108107
dev = [
109108
"pre-commit>=4.3.0",
110109
"pytest-asyncio>=1.0.0",
111-
"watchfiles>=1.1.1",
112110
]
113111

114112
[tool.mypy]

scripts/gunicorn_managing_uvicorn_workers/.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file contains example values for development/testing purposes only.
55
#
66
# SECURITY CRITICAL: Before deploying to production, you MUST:
7-
# 1. Copy this file to a .env file at the project root
7+
# 1. Copy this file to src/.env
88
# 2. Generate a new SECRET_KEY using: openssl rand -hex 32
99
# 3. Change all passwords (POSTGRES_PASSWORD, ADMIN_PASSWORD, etc.)
1010
# 4. Update all sensitive configuration values
@@ -20,7 +20,7 @@ CONTACT_NAME="Me"
2020
CONTACT_EMAIL="my.email@example.com"
2121
LICENSE_NAME="MIT"
2222

23-
# ------------- database -------------
23+
# ------------- database -------------
2424
POSTGRES_USER="postgres"
2525
POSTGRES_PASSWORD=1234
2626
POSTGRES_SERVER="db"

scripts/gunicorn_managing_uvicorn_workers/docker-compose.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
web:
3-
build:
3+
build:
44
context: .
55
dockerfile: Dockerfile
66
# -------- Both of the following commands should be commented to run with nginx --------
@@ -9,7 +9,7 @@ services:
99
# command: uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
1010
command: gunicorn app.main:app -w 4 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:8000
1111
env_file:
12-
- .env
12+
- ./src/.env
1313
# -------- replace with expose if you are using nginx --------
1414
ports:
1515
- "8000:8000"
@@ -20,26 +20,26 @@ services:
2020
- redis
2121
volumes:
2222
- ./src/app:/code/app
23-
- .env:/.env
23+
- ./src/.env:/code/.env
2424

2525
worker:
26-
build:
26+
build:
2727
context: .
2828
dockerfile: Dockerfile
2929
command: arq app.core.worker.settings.WorkerSettings
3030
env_file:
31-
- .env
31+
- ./src/.env
3232
depends_on:
3333
- db
3434
- redis
3535
volumes:
3636
- ./src/app:/code/app
37-
- .env:/.env
37+
- ./src/.env:/code/.env
3838

3939
db:
4040
image: postgres:13
4141
env_file:
42-
- .env
42+
- ./src/.env
4343
volumes:
4444
- postgres-data:/var/lib/postgresql/data
4545
expose:
@@ -64,11 +64,11 @@ services:
6464

6565
#-------- uncomment to create first superuser --------
6666
create_superuser:
67-
build:
67+
build:
6868
context: .
6969
dockerfile: Dockerfile
7070
env_file:
71-
- .env
71+
- ./src/.env
7272
depends_on:
7373
- db
7474
- web
@@ -78,11 +78,11 @@ services:
7878

7979
#-------- uncomment to run tests --------
8080
# pytest:
81-
# build:
81+
# build:
8282
# context: .
83-
# dockerfile: Dockerfile
83+
# dockerfile: Dockerfile
8484
# env_file:
85-
# - .env
85+
# - ./src/.env
8686
# depends_on:
8787
# - db
8888
# - create_superuser
@@ -93,11 +93,11 @@ services:
9393

9494
#-------- uncomment to create first tier --------
9595
# create_tier:
96-
# build:
96+
# build:
9797
# context: .
9898
# dockerfile: Dockerfile
9999
# env_file:
100-
# - .env
100+
# - ./src/.env
101101
# depends_on:
102102
# - create_superuser
103103
# - db
@@ -109,3 +109,4 @@ services:
109109
volumes:
110110
postgres-data:
111111
redis-data:
112+

scripts/local_with_uvicorn/.env.example

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file contains example values for development/testing purposes only.
55
#
66
# SECURITY CRITICAL: Before deploying to production, you MUST:
7-
# 1. Copy this file to a .env file at the project root
7+
# 1. Copy this file to src/.env
88
# 2. Generate a new SECRET_KEY using: openssl rand -hex 32
99
# 3. Change all passwords (POSTGRES_PASSWORD, ADMIN_PASSWORD, etc.)
1010
# 4. Update all sensitive configuration values
@@ -16,8 +16,6 @@
1616
APP_NAME="My Project"
1717
APP_DESCRIPTION="My Project Description"
1818
APP_VERSION="0.1"
19-
APP_BACKEND_HOST="http://localhost:8000"
20-
APP_FRONTEND_HOST="http://localhost:3000"
2119
CONTACT_NAME="Me"
2220
CONTACT_EMAIL="my.email@example.com"
2321
LICENSE_NAME="MIT"
@@ -72,13 +70,3 @@ ENVIRONMENT="local"
7270

7371
# ------------- first tier -------------
7472
TIER_NAME="free"
75-
76-
# ------------- auth settings -------------
77-
# ENABLE_PASSWORD_AUTH=true
78-
# GOOGLE_CLIENT_ID=
79-
# GOOGLE_CLIENT_SECRET=
80-
# MICROSOFT_CLIENT_ID=
81-
# MICROSOFT_CLIENT_SECRET=
82-
# MICROSOFT_TENANT=
83-
# GITHUB_CLIENT_ID=
84-
# GITHUB_CLIENT_SECRET=

scripts/local_with_uvicorn/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@ COPY --from=builder --chown=app:app /app/.venv /app/.venv
3333
# Ensure the virtual environment is in the PATH
3434
ENV PATH="/app/.venv/bin:$PATH"
3535

36-
# Force file watching to use polling, which is more reliable in some Docker environments (like WSL/macOS)
37-
ENV WATCHFILES_FORCE_POLLING=true
38-
3936
# Switch to the non-root user
4037
USER app
4138

4239
# Set the working directory
4340
WORKDIR /code
4441

4542
# -------- replace with comment to run with gunicorn --------
46-
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--reload-include", ".env"]
43+
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
4744
# CMD ["gunicorn", "app.main:app", "-w", "4", "-k", "uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:8000"]

scripts/local_with_uvicorn/docker-compose.yml

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,45 @@
11
services:
22
web:
3-
build:
3+
build:
44
context: .
55
dockerfile: Dockerfile
6-
environment:
7-
# Enable polling for file changes on macOS/Windows Docker Desktop
8-
- WATCHFILES_FORCE_POLLING=true
6+
# -------- Both of the following commands should be commented to run with nginx --------
7+
8+
# -------- replace with comment to run with gunicorn --------
9+
command: uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
10+
# command: gunicorn app.main:app -w 4 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:8000
11+
env_file:
12+
- ./src/.env
13+
# -------- replace with expose if you are using nginx --------
914
ports:
1015
- "8000:8000"
16+
# expose:
17+
# - "8000"
1118
depends_on:
1219
- db
1320
- redis
1421
volumes:
1522
- ./src/app:/code/app
16-
- .env:/code/.env
23+
- ./src/.env:/code/.env
1724

1825
worker:
19-
build:
26+
build:
2027
context: .
2128
dockerfile: Dockerfile
2229
command: arq app.core.worker.settings.WorkerSettings
2330
env_file:
24-
- .env
31+
- ./src/.env
2532
depends_on:
2633
- db
2734
- redis
2835
volumes:
2936
- ./src/app:/code/app
30-
- .env:/code/.env
37+
- ./src/.env:/code/.env
3138

3239
db:
3340
image: postgres:13
3441
env_file:
35-
- .env
42+
- ./src/.env
3643
volumes:
3744
- postgres-data:/var/lib/postgresql/data
3845
expose:
@@ -57,11 +64,11 @@ services:
5764

5865
#-------- uncomment to create first superuser --------
5966
create_superuser:
60-
build:
67+
build:
6168
context: .
6269
dockerfile: Dockerfile
6370
env_file:
64-
- .env
71+
- ./src/.env
6572
depends_on:
6673
- db
6774
- web
@@ -71,11 +78,11 @@ services:
7178

7279
#-------- uncomment to run tests --------
7380
pytest:
74-
build:
81+
build:
7582
context: .
76-
dockerfile: Dockerfile
83+
dockerfile: Dockerfile
7784
env_file:
78-
- .env
85+
- ./src/.env
7986
depends_on:
8087
- db
8188
- create_superuser
@@ -86,11 +93,11 @@ services:
8693

8794
#-------- uncomment to create first tier --------
8895
# create_tier:
89-
# build:
96+
# build:
9097
# context: .
9198
# dockerfile: Dockerfile
9299
# env_file:
93-
# - .env
100+
# - ./src/.env
94101
# depends_on:
95102
# - create_superuser
96103
# - db
@@ -102,3 +109,4 @@ services:
102109
volumes:
103110
postgres-data:
104111
redis-data:
112+

scripts/production_with_nginx/.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file contains example values for development/testing purposes only.
55
#
66
# SECURITY CRITICAL: Before deploying to production, you MUST:
7-
# 1. Copy this file to a .env file at the project root
7+
# 1. Copy this file to src/.env
88
# 2. Generate a new SECRET_KEY using: openssl rand -hex 32
99
# 3. Change all passwords (POSTGRES_PASSWORD, ADMIN_PASSWORD, etc.)
1010
# 4. Update all sensitive configuration values
@@ -20,7 +20,7 @@ CONTACT_NAME="Me"
2020
CONTACT_EMAIL="my.email@example.com"
2121
LICENSE_NAME="MIT"
2222

23-
# ------------- database -------------
23+
# ------------- database -------------
2424
POSTGRES_USER="postgres"
2525
POSTGRES_PASSWORD=1234
2626
POSTGRES_SERVER="db"

0 commit comments

Comments
 (0)