From a45bf3ab419f9c34f6a23c39729caef1c316612c Mon Sep 17 00:00:00 2001
From: Frederik Hahne <atomfrede@gmail.com>
Date: Wed, 10 Jun 2020 06:02:33 +0200
Subject: [PATCH] add oauth properties

---
 .../heroku/templates/application-heroku.yml.ejs    | 14 +++++++++++++-
 .../heroku/templates/provision-okta-addon.sh.ejs   |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/generators/heroku/templates/application-heroku.yml.ejs b/generators/heroku/templates/application-heroku.yml.ejs
index 7fdb4ce7..c23b80b4 100644
--- a/generators/heroku/templates/application-heroku.yml.ejs
+++ b/generators/heroku/templates/application-heroku.yml.ejs
@@ -28,7 +28,19 @@
 # https://docs.micronaut.io/latest/guide/configurationreference.html
 # ===================================================================
 
-
+<%_ if (useOkta) { _%>
+micronaut:
+  security:
+    enabled: true
+    oauth2:
+      enabled: true
+      clients:
+        oidc:
+          client-secret: ${OKTA_OAUTH2_CLIENT_SECRET_WEB}
+          client-id: ${OKTA_OAUTH2_CLIENT_ID_WEB}
+          openid:
+            issuer: ${OKTA_OAUTH2_ISSUER}
+<%_ } _%>
 
 datasources:
   default:
diff --git a/generators/heroku/templates/provision-okta-addon.sh.ejs b/generators/heroku/templates/provision-okta-addon.sh.ejs
index afc6fe9d..0476de0e 100644
--- a/generators/heroku/templates/provision-okta-addon.sh.ejs
+++ b/generators/heroku/templates/provision-okta-addon.sh.ejs
@@ -21,7 +21,7 @@ get_apps() {
 }
 
 add_redirect_url() {
-    REDIRECT_URL="${1//\"/}login/oauth2/code/oidc"
+    REDIRECT_URL="${1//\"/}oauth2/callback/oidc"
     jq '.settings.oauthClient.redirect_uris += ["'"${REDIRECT_URL}"'"]' app1.json >app1-mod.json
     jq '.settings.oauthClient.redirect_uris += ["'"${REDIRECT_URL}"'"]' app2.json >app2-mod.json