fixes geoserver auth button #4335

GeoNode · Jun 12, 2019 · 8fee085 · gannebamm · Nov 26, 2019 · gannebamm
1 parent 05d12ef
commit 8fee085
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/scripts/spcgeonode/.env b/scripts/spcgeonode/.env
@@ -18,7 +18,8 @@ HTTPS_HOST=
 HTTPS_PORT=443
 
 # IP or domain name and port where the server can be reached on HTTP (leave HOST empty if you want to use HTTPS only)
-HTTP_HOST=127.0.0.1
+HTTP_HOST=172.30.218.218
+#127.0.0.1
 HTTP_PORT=80
 
 # Email where alters should be sent. This will be used by let's encrypt and as the django admin email.

diff --git a/scripts/spcgeonode/django/initialize.py b/scripts/spcgeonode/django/initialize.py
@@ -84,7 +84,8 @@
     pk=1,
     name='GeoServer',
     client_type='confidential',
-    authorization_grant_type='authorization-code'
+    authorization_grant_type='authorization-code',
+    skip_authorization=True
 )
 redirect_uris = [
     'http://{}/geoserver'.format(os.getenv('HTTPS_HOST',"") if os.getenv('HTTPS_HOST',"") != "" else os.getenv('HTTP_HOST')),

diff --git a/scripts/spcgeonode/geoserver/docker-entrypoint.sh b/scripts/spcgeonode/geoserver/docker-entrypoint.sh
@@ -100,8 +100,8 @@ fi
 sed -i -r "s|<cliendId>.*</cliendId>|<cliendId>$CLIENT_ID</cliendId>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
 sed -i -r "s|<clientSecret>.*</clientSecret>|<clientSecret>$CLIENT_SECRET</clientSecret>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
 # OAuth endpoints (client)
-sed -i -r "s|<userAuthorizationUri>.*</userAuthorizationUri>|<userAuthorizationUri>$BASEURL/o/authorize/</userAuthorizationUri>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
-sed -i -r "s|<redirectUri>.*</redirectUri>|<redirectUri>$BASEURL/geoserver/index.html</redirectUri>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
+sed -i -r "s|<userAuthorizationUri>.*</userAuthorizationUri>|<userAuthorizationUri>/o/authorize/</userAuthorizationUri>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
+sed -i -r "s|<redirectUri>.*</redirectUri>|<redirectUri>$BASEURL/index.html</redirectUri>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
 sed -i -r "s|<logoutUri>.*</logoutUri>|<logoutUri>$BASEURL/account/logout/</logoutUri>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"
 # OAuth endpoints (server)
 sed -i -r "s|<accessTokenUri>.*</accessTokenUri>|<accessTokenUri>http://nginx/o/token/</accessTokenUri>|" "/spcgeonode-geodatadir/security/filter/geonode-oauth2/config.xml"