fix: fixed env and auth bugs

ladjs · Oct 21, 2019 · 0a3f1dd · 0a3f1dd
1 parent 0be8bbb
commit 0a3f1dd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/template/.env.defaults b/template/.env.defaults
@@ -15,6 +15,8 @@ WEB_HOST=localhost
 WEB_PORT=3000
 WEB_PROTOCOL=http
 WEB_URL={{WEB_PROTOCOL}}://{{WEB_HOST}}:{{WEB_PORT}}
+WEB_SSL_KEY_PATH=
+WEB_SSL_CERT_PATH=
 LIVERELOAD_PORT=35729
 
 ################
@@ -24,6 +26,8 @@ API_HOST=localhost
 API_PORT=4000
 API_PROTOCOL=http
 API_URL={{API_PROTOCOL}}://{{API_HOST}}:{{API_PORT}}
+API_SSL_KEY_PATH=
+API_SSL_CERT_PATH=
 
 #########
 ## app ##
@@ -52,7 +56,7 @@ AUTH_STRIPE_ENABLED=false
 # https://console.developers.google.com
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
-GOOGLE_CALLBACK_URL={{WEB_URL}}/auth/google/ok
+GOOGLE_CALLBACK_URL={{{WEB_URL}}}/auth/google/ok
 # used by `mandarin` translation package
 GOOGLE_TRANSLATE_KEY=
 # your Postmark token from:
@@ -94,3 +98,9 @@ API_REDIS_PASSWORD=
 BULL_REDIS_PORT=6379
 BULL_REDIS_HOST=localhost
 BULL_REDIS_PASSWORD=
+
+#############
+## certbot ##
+#############
+CERTBOT_WELL_KNOWN_NAME=
+CERTBOT_WELL_KNOWN_CONTENTS=
diff --git a/template/.env.schema b/template/.env.schema
@@ -15,6 +15,8 @@ WEB_HOST=
 WEB_PORT=
 WEB_PROTOCOL=
 WEB_URL=
+WEB_SSL_KEY_PATH=
+WEB_SSL_CERT_PATH=
 LIVERELOAD_PORT=
 
 ################
@@ -24,6 +26,8 @@ API_HOST=
 API_PORT=
 API_PROTOCOL=
 API_URL=
+API_SSL_KEY_PATH=
+API_SSL_CERT_PATH=
 
 #########
 ## app ##
@@ -94,3 +98,9 @@ API_REDIS_PASSWORD=
 BULL_REDIS_PORT=
 BULL_REDIS_HOST=
 BULL_REDIS_PASSWORD=
+
+#############
+## certbot ##
+#############
+CERTBOT_WELL_KNOWN_NAME=
+CERTBOT_WELL_KNOWN_CONTENTS=
diff --git a/template/app/controllers/web/auth.js b/template/app/controllers/web/auth.js
@@ -302,6 +302,7 @@ async function catchError(ctx, next) {
   try {
     await next();
   } catch (err) {
+    ctx.logger.error(err);
     if (ctx.params.provider === 'google' && err.message === 'Consent required')
       return ctx.redirect('/auth/google/consent');
     ctx.flash('error', err.message);

diff --git a/template/routes/web/auth.js b/template/routes/web/auth.js
@@ -24,7 +24,7 @@ router
     (ctx, next) =>
       passport.authenticate(
         ctx.params.provider,
-        config.auth[ctx.params.provider]
+        config.passport[ctx.params.provider]
       )(ctx, next)
   )
   .get(