Upgrade to uws-server-1.2.21 & modify JobManager to use env IM

CHANGELOG.md

@@ -11,7 +11,9 @@ Find changes for the upcoming release in the project's [changelog.d](https://git
 
 ### Fixed
 
-- Introduce RubinIdentityManagerImpl, extends IdentityManager which replaces the deprecated Authenticator
+- Changed QueryJobManager to use the IdentityManager available via the AuthenticationUtil class (OpenID in our case)
+- Added deprecated AuthenticatorImpl, this is only useful in case this version of TAP is used with the old Auth params/implementations (Unlikely)
+- Upgrade version of uws-server to 1.2.21
 
 <a id='changelog-1.18.4'></a>
 ## 1.18.4 (2024-07-19)

tap/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     implementation 'org.opencadc:cadc-tap-server-pg:[1.0.0,)'
     implementation 'org.opencadc:cadc-util:1.11.2'
     implementation 'org.opencadc:cadc-uws:1.0.5'
-    implementation 'org.opencadc:cadc-uws-server:1.2.20'
+    implementation 'org.opencadc:cadc-uws-server:1.2.21'
     implementation 'org.opencadc:cadc-vosi:1.4.6'
 
     // Switch out this to use any supported database instead of PostgreSQL.

tap/src/main/java/ca/nrc/cadc/sample/JobManager.java

@@ -7,6 +7,10 @@
 import ca.nrc.cadc.uws.server.impl.PostgresJobPersistence;
 import ca.nrc.cadc.uws.server.SimpleJobManager;
 import ca.nrc.cadc.uws.server.ThreadPoolExecutor;
+import ca.nrc.cadc.auth.AuthenticationUtil;
+import ca.nrc.cadc.auth.IdentityManager;
+import ca.nrc.cadc.uws.server.JobPersistence;
+import ca.nrc.cadc.uws.server.RandomStringGenerator;
 
 
 /**
@@ -21,7 +25,9 @@ public class JobManager extends SimpleJobManager {
     public JobManager() {
         super();
 
-        PostgresJobPersistence jobPersist = new PostgresJobPersistence(new X500IdentityManager());
+        IdentityManager im = AuthenticationUtil.getIdentityManager();
+        // persist UWS jobs to PostgreSQL using default jdbc/uws connection pool
+        JobPersistence jobPersist = new PostgresJobPersistence(new RandomStringGenerator(16), im, true);
 
         // max threads: 6 == number of simultaneously running async queries (per
         // web server), plus sync queries, plus VOSI-tables queries