From 29b75f84c2a08b18aec12d41567e028012b6aa26 Mon Sep 17 00:00:00 2001
From: David Zhuang <cnbeining@gmail.com>
Date: Fri, 10 Dec 2021 01:49:38 -0500
Subject: [PATCH] fix: Optimizing Heroku deployment: more configs, add
 collaboration support (#2838)

---
 Procfile |  2 +-
 app.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/Procfile b/Procfile
index 0de779fbe..2b1be1ced 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-web: yarn start --services=web,websockets
+web: yarn start --services=web,websockets,collaboration
 worker: yarn start --services=worker
diff --git a/app.json b/app.json
index d11939b9b..7ebbc83f8 100644
--- a/app.json
+++ b/app.json
@@ -35,7 +35,7 @@
       "required": true
     },
     "SECRET_KEY": {
-      "description": "A secret key",
+      "description": "A 32-character secret key, generate with openssl rand -hex 32",
       "generator": "secret",
       "required": true
     },
@@ -43,8 +43,12 @@
       "value": "true",
       "required": true
     },
+    "ALLOWED_DOMAINS": {
+      "description": "Comma separated list of domains to be allowed (optional). If not set, all domains are allowed by default when using Google OAuth to signin. Consider putting {your app name}.herokuapp.com and any domain you are binding on in this list.",
+      "required": false
+    },
     "URL": {
-      "description": "https://{your app name}.herokuapp.com",
+      "description": "https://{your app name}.herokuapp.com, or the domain you are binding to",
       "required": true
     },
     "GOOGLE_CLIENT_ID": {
@@ -55,8 +59,51 @@
       "description": "",
       "required": false
     },
-    "ALLOWED_DOMAINS": {
-      "description": "Comma separated list of domains to be allowed (optional). If not set, all Google apps domains are allowed by default",
+    "AZURE_CLIENT_ID": {
+      "description": "To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See the guide for details on setting up your Azure App: https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4",
+      "required": false
+    },
+    "AZURE_CLIENT_SECRET": {
+      "description": "",
+      "required": false
+    },
+    "AZURE_RESOURCE_APP_ID": {
+      "description": "",
+      "required": false
+    },
+    "OIDC_CLIENT_ID": {
+      "description": "To configure generic OIDC auth, you'll need some kind of identity provider. See documentation for whichever IdP you use to acquire the following info; Redirect URI is https://<URL>/auth/oidc.callback",
+      "required": false
+    },
+    "OIDC_CLIENT_SECRET": {
+      "description": "",
+      "required": false
+    },
+    "OIDC_AUTH_URI": {
+      "description": "",
+      "required": false
+    },
+    "OIDC_TOKEN_URI": {
+      "description": "",
+      "required": false
+    },
+    "OIDC_USERINFO_URI": {
+      "description": "",
+      "required": false
+    },
+    "OIDC_USERNAME_CLAIM": {
+      "description": "Specify which claims to derive user information from. Supports any valid JSON path with the JWT payload",
+      "value": "preferred_username",
+      "required": false
+    },
+    "OIDC_DISPLAY_NAME": {
+      "description": "Display name for OIDC authentication",
+      "value": "OpenID",
+      "required": false
+    },
+    "OIDC_SCOPES": {
+      "description": "Space separated auth scopes.",
+      "value": "openid profile email",
       "required": false
     },
     "SLACK_KEY": {
@@ -155,6 +202,11 @@
     "TEAM_LOGO": {
       "description": "A logo that will be displayed on the signed out home page",
       "required": false
+    },
+    "DEFAULT_LANGUAGE": {
+      "value": "en_US",
+      "description": "The default interface language. See translate.getoutline.com for a list of available language codes and their rough percentage translated.",
+      "required": false
     }
   }
 }
\ No newline at end of file