Skip to content

Commit

Permalink
Merge pull request #953 from hpcc-systems/authRework
Browse files Browse the repository at this point in the history
Auth rework
  • Loading branch information
FancMa01 authored Dec 17, 2024
2 parents be475ae + 0202e0f commit d82a0ed
Show file tree
Hide file tree
Showing 261 changed files with 19,436 additions and 19,572 deletions.
25 changes: 12 additions & 13 deletions Tombolo/.env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ HOSTNAME=localhost
SERVER_PORT=3000
HTTP_PORT=3001
HTTPS_PORT=443
WEB_URL=http://localhost:3001/
WEB_URL=http://localhost:3001

# SSL Certificate Configuration (Nginx)
CERT_PATH=/certs
Expand All @@ -29,17 +29,6 @@ DB_PORT=3306
DB_NAME=tombolo
DB_HOSTNAME=localhost

# Authentication Configuration
APP_AUTH_METHOD=

# if using auth service for authentication
AUTH_SERVICE_URL=
AUTHSERVICE_TOMBOLO_CLIENT_ID=

# If using Azure AD for authentication
TENENT_ID=
CLIENT_ID=

# Email Configuration
EMAIL_SMTP_HOST=
EMAIL_PORT=
Expand All @@ -49,8 +38,18 @@ EMAIL_SENDER=donotreply@tombolo.com
ENCRYPTION_KEY=
API_KEY_DURATION=

# Authentication and Authorization Configuration
JWT_SECRET=
JWT_REFRESH_SECRET=

# OAuth 2.0 - Azure
TENENT_ID=
CLIENT_ID=
CLIENT_SECRET=
REDIRECT_URI=

# Logging Configuration
NODE_LOG_LEVEL=http
NODE_LOG_LEVEL=info

# Integration Specific Configuration

Expand Down
9 changes: 4 additions & 5 deletions Tombolo/client-reactjs/.env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ REACT_APP_PROXY_URL=http://localhost:3000
# LDAP Configuration
REACT_APP_LDAP_SEARCH_ENABLED=false

# Authentication Configuration
REACT_APP_APP_AUTH_METHOD=azure_ad
# Authentication Configuration - traditional,azure available: CSV format
REACT_APP_AUTH_METHODS=traditional,azure

# Azure Configuration - only if using Azure AD for authentication
REACT_APP_AZURE_CLIENT_ID=
REACT_APP_AZURE_TENENT_ID=
REACT_APP_AZURE_REDIRECT_URI=localhost:3001
REACT_APP_AZURE_API_TOKEN_SCOPE=
REACT_APP_AZURE_TENENT_ID=
REACT_APP_AZURE_REDIRECT_URI=http://localhost:3001

# App version
REACT_APP_VERSION=$npm_package_version
2 changes: 2 additions & 0 deletions Tombolo/client-reactjs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
.env.development.local
.env.test.local
.env.production.local
.env.new
.env.old
.eslintcache

npm-debug.log*
Expand Down
Loading

0 comments on commit d82a0ed

Please sign in to comment.