Merge pull request #25 from lsst/tickets/DM-29613

DM-29613: Replace outdated /oauth2 endpoints with /login, /logout

CHANGELOG.rst

@@ -2,11 +2,20 @@
 Change log
 ##########
 
+2.1.1 (2021-04-07)
+==================
+
+- **Uses Firefly release-2020.3.3**  See the `Firefly release notes <https://github.com/Caltech-IPAC/firefly/blob/dev/docs/release-notes.md>`.  Key LSST-relevant fix:
+
+  - Charts in "expanded mode" do not update after options changes
+    [`FIREFLY-525 <https://jira.ipac.caltech.edu/browse/FIREFLY-525>`_]
+
+- Changes URLs for interaction with the authentication to use Gafaelfawr ones.
+
 2.1.0 (2020-10-05)
 ==================
 
-- **Uses Firefly release-2020.3.0**  See the `Firefly release notes <https://github.com/Caltech-IPAC/firefly/blob/dev/docs\
-/release-notes.md>`.  Key LSST-relevant features:
+- **Uses Firefly release-2020.3.0**  See the `Firefly release notes <https://github.com/Caltech-IPAC/firefly/blob/dev/docs/release-notes.md>`.  Key LSST-relevant features:
 
   - Bug fixes for Python-driven plotting and Slate
 

config/app.config

@@ -28,8 +28,8 @@ pct.vis.shared.mem.size = 0.4
 download.bundle.maxbytes = 304857600
 
 sso.server.url = "https://test.cilogon.org/"
-sso.login.url = "oauth2/start?rd=/portal/suit/"
-sso.logout.url = "/oauth2/sign_in"
+sso.login.url = "/login?rd=/portal/suit/"
+sso.logout.url = "/logout"
 sso.user.profile.url =
 __$help.base.url = "onlinehelp/"
 

config/firefly_build.tag

@@ -1 +1 @@
-rc-2020.3
+release-2020.3.3

config/k8s/suit-int.yaml

@@ -109,7 +109,7 @@ metadata:
       proxy_set_header X-Forwarded-Proto https;
       proxy_set_header X-Forwarded-Port 443;
       proxy_set_header X-Forwarded-Path /portal/app;
-      error_page 403 = "https://lsst-lsp-int.ncsa.illinois.edu/oauth2/start?rd=$request_uri";
+      error_page 403 = "https://lsst-lsp-int.ncsa.illinois.edu/login?rd=$request_uri";
 spec:
   tls:
   - hosts:

config/k8s/suit-stable.yaml

@@ -109,7 +109,7 @@ metadata:
       proxy_set_header X-Forwarded-Proto https;
       proxy_set_header X-Forwarded-Port 443;
       proxy_set_header X-Forwarded-Path /portal/app;
-      error_page 403 = "https://lsst-lsp-stable.ncsa.illinois.edu/oauth2/start?rd=$request_uri";
+      error_page 403 = "https://lsst-lsp-stable.ncsa.illinois.edu/login?rd=$request_uri";
 spec:
   tls:
   - hosts:

src/suit/java/edu/caltech/ipac/lsst/security/LsstSsoAdapter.java

@@ -25,8 +25,8 @@
  */
 public class LsstSsoAdapter implements SsoAdapter {
     private static Logger.LoggerImpl LOGGER = Logger.getLogger();
-    private static String LOGIN_URL         = AppProperties.getProperty("sso.login.url", "/oauth2/start?rd=/portal/suit/");
-    private static String LOGOUT_URL        = AppProperties.getProperty("sso.logout.url", "/oauth2/sign_in");
+    private static String LOGIN_URL         = AppProperties.getProperty("sso.login.url", "/login?rd=/portal/suit/");
+    private static String LOGOUT_URL        = AppProperties.getProperty("sso.logout.url", "/logout");
     private static String REQ_AUTH_HOSTS    = AppProperties.getProperty("sso.req.auth.hosts", ".ncsa.illinois.edu");
 
     private static final String ID_TOKEN = "X-Auth-Request-Token";