From 83426881ec8e90384ae3d33151d2936f0e1d71a3 Mon Sep 17 00:00:00 2001
From: Adam Yoho <ayoho@us.ibm.com>
Date: Wed, 23 Aug 2023 09:31:53 -0500
Subject: [PATCH 1/2] Remove beta flags in product code for OIDC Private Key
 JWT

---
 .../resources/OSGI-INF/metatype/metatype.xml  |  6 +++---
 .../resources/OSGI-INF/metatype/metatype.xml  |  6 +++---
 .../token/auth/PrivateKeyJwtAuthMethod.java   | 19 -------------------
 .../auth/PrivateKeyJwtAuthMethodTest.java     |  3 ---
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/dev/com.ibm.ws.security.openidconnect.client/resources/OSGI-INF/metatype/metatype.xml b/dev/com.ibm.ws.security.openidconnect.client/resources/OSGI-INF/metatype/metatype.xml
index a2297a3184b..c6823913c02 100644
--- a/dev/com.ibm.ws.security.openidconnect.client/resources/OSGI-INF/metatype/metatype.xml
+++ b/dev/com.ibm.ws.security.openidconnect.client/resources/OSGI-INF/metatype/metatype.xml
@@ -94,7 +94,7 @@
                 <Option label="%tokenEndpointAuthMethod.privateKeyJwt" value="private_key_jwt" />
          </AD>
          <AD id="tokenEndpointAuthSigningAlgorithm" name="%tokenEndpointAuthSigningAlgorithm" description="%tokenEndpointAuthSigningAlgorithm.desc" required="false"
-             type="String" default="RS256" ibm:beta="true" >
+             type="String" default="RS256" >
                 <Option label="%tokenEndpointAuthSigningAlgorithm.RS256" value="RS256" />
                 <Option label="%tokenEndpointAuthSigningAlgorithm.RS384" value="RS384" />
                 <Option label="%tokenEndpointAuthSigningAlgorithm.RS512" value="RS512" />
@@ -102,7 +102,7 @@
                 <Option label="%tokenEndpointAuthSigningAlgorithm.ES384" value="ES384" />
                 <Option label="%tokenEndpointAuthSigningAlgorithm.ES512" value="ES512" />
          </AD>
-         <AD id="keyAliasName" name="%keyAliasName" description="%keyAliasName.desc" required="false" type="String" ibm:beta="true" />
+         <AD id="keyAliasName" name="%keyAliasName" description="%keyAliasName.desc" required="false" type="String" />
          <AD id="jsonWebKey" name="internal" description="internal use only" required="false" type="String" />
          <AD id="prompt" name="internal" description="internal use only" required="false" type="String" />
           <AD id="jwt" name="internal" description="internal use only" ibm:type="pid" ibm:reference="com.ibm.ws.security.openidconnect.client.jwt"
@@ -162,7 +162,7 @@
                 <Option label="%pkceCodeChallengeMethod.plain" value="plain" />
                 <Option label="%pkceCodeChallengeMethod.S256" value="S256" />
          </AD>
-         <AD id="tokenRequestOriginHeader" name="%tokenRequestOriginHeader" description="%tokenRequestOriginHeader.desc" required="false" type="String" ibm:beta="true" />
+         <AD id="tokenRequestOriginHeader" name="%tokenRequestOriginHeader" description="%tokenRequestOriginHeader.desc" required="false" type="String" />
      </OCD>
 
     <Designate factoryPid="com.ibm.ws.security.openidconnect.client.oidcClientConfig">
diff --git a/dev/com.ibm.ws.security.social/resources/OSGI-INF/metatype/metatype.xml b/dev/com.ibm.ws.security.social/resources/OSGI-INF/metatype/metatype.xml
index 766755184fb..89fb46f3f2a 100644
--- a/dev/com.ibm.ws.security.social/resources/OSGI-INF/metatype/metatype.xml
+++ b/dev/com.ibm.ws.security.social/resources/OSGI-INF/metatype/metatype.xml
@@ -421,7 +421,7 @@
                <Option label="%tokenEndpointAuthMethod.privateKeyJwt" value="private_key_jwt" />
          </AD>
         <AD id="tokenEndpointAuthSigningAlgorithm" name="%tokenEndpointAuthSigningAlgorithm" description="%tokenEndpointAuthSigningAlgorithm.desc" required="false"
-            type="String" default="RS256" ibm:beta="true" >
+            type="String" default="RS256" >
                <Option label="%tokenEndpointAuthSigningAlgorithm.RS256" value="RS256" />
                <Option label="%tokenEndpointAuthSigningAlgorithm.RS384" value="RS384" />
                <Option label="%tokenEndpointAuthSigningAlgorithm.RS512" value="RS512" />
@@ -429,7 +429,7 @@
                <Option label="%tokenEndpointAuthSigningAlgorithm.ES384" value="ES384" />
                <Option label="%tokenEndpointAuthSigningAlgorithm.ES512" value="ES512" />
         </AD>
-        <AD id="keyAliasName" name="%keyAliasName" description="%keyAliasName.desc" required="false" type="String" ibm:beta="true" />
+        <AD id="keyAliasName" name="%keyAliasName" description="%keyAliasName.desc" required="false" type="String" />
         <AD id="redirectToRPHostAndPort" name="%redirectToRPHostAndPort" description="%redirectToRPHostAndPort.desc" required="false" type="String" />
         <AD id="hostNameVerificationEnabled" name="%hostNameVerificationEnabled" description="%hostNameVerificationEnabled.desc" required="false" type="Boolean" default="true"/>
         <AD id="responseType" name="%responseType" description="%responseType.desc" required="false" type="String" default="code">
@@ -463,7 +463,7 @@
             <Option label="%pkceCodeChallengeMethod.plain" value="plain" />
             <Option label="%pkceCodeChallengeMethod.S256" value="S256" />
         </AD>
-        <AD id="tokenRequestOriginHeader" name="%tokenRequestOriginHeader" description="%tokenRequestOriginHeader.desc" required="false" type="String" ibm:beta="true" />
+        <AD id="tokenRequestOriginHeader" name="%tokenRequestOriginHeader" description="%tokenRequestOriginHeader.desc" required="false" type="String" />
     </OCD>
 
      <OCD id="com.ibm.ws.security.social.client.param.metatype" name="%oidcClientCustomRequestParam" description="%oidcClientCustomRequestParam.desc"
diff --git a/dev/io.openliberty.security.oidcclientcore.internal/src/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethod.java b/dev/io.openliberty.security.oidcclientcore.internal/src/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethod.java
index 89936ef3add..d0ebccdc9b8 100644
--- a/dev/io.openliberty.security.oidcclientcore.internal/src/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethod.java
+++ b/dev/io.openliberty.security.oidcclientcore.internal/src/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethod.java
@@ -25,7 +25,6 @@
 import com.ibm.websphere.ras.TraceComponent;
 import com.ibm.websphere.ras.annotation.Sensitive;
 import com.ibm.ws.ffdc.annotation.FFDCIgnore;
-import com.ibm.ws.kernel.productinfo.ProductInfo;
 import com.ibm.ws.security.common.ssl.SecuritySSLUtils;
 import com.ibm.ws.ssl.KeyStoreService;
 
@@ -56,8 +55,6 @@ public void unsetKeyStoreService(KeyStoreService keyStoreServiceSvc) {
 
     private static final float EXP_TIME_IN_MINUTES = 5;
 
-    private static boolean issuedBetaMessage = false;
-
     private String configurationId;
     private String clientId;
     private String tokenEndpoint;
@@ -90,9 +87,6 @@ public PrivateKeyJwtAuthMethod(String configurationId, String clientId, String t
     @Override
     @FFDCIgnore(PrivateKeyJwtAuthException.class)
     public void setAuthMethodSpecificSettings(Builder tokenRequestBuilder) throws TokenEndpointAuthMethodSettingsException {
-        if (!isRunningBetaMode()) {
-            return;
-        }
         try {
             HashMap<String, String> customParams = getPrivateKeyJwtParameters();
             tokenRequestBuilder.customParams(customParams);
@@ -101,19 +95,6 @@ public void setAuthMethodSpecificSettings(Builder tokenRequestBuilder) throws To
         }
     }
 
-    private boolean isRunningBetaMode() {
-        if (!ProductInfo.getBetaEdition()) {
-            return false;
-        } else {
-            // Running beta exception, issue message if we haven't already issued one for this class
-            if (!issuedBetaMessage) {
-                Tr.info(tc, "BETA: A beta method has been invoked for the class " + this.getClass().getName() + " for the first time.");
-                issuedBetaMessage = !issuedBetaMessage;
-            }
-            return true;
-        }
-    }
-
     HashMap<String, String> getPrivateKeyJwtParameters() throws PrivateKeyJwtAuthException {
         HashMap<String, String> parameters = new HashMap<>();
         parameters.put(TokenConstants.CLIENT_ASSERTION_TYPE, TokenConstants.CLIENT_ASSERTION_TYPE_JWT_BEARER);
diff --git a/dev/io.openliberty.security.oidcclientcore.internal/test/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethodTest.java b/dev/io.openliberty.security.oidcclientcore.internal/test/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethodTest.java
index 7f5734dd8e6..0bf6d854e49 100644
--- a/dev/io.openliberty.security.oidcclientcore.internal/test/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethodTest.java
+++ b/dev/io.openliberty.security.oidcclientcore.internal/test/io/openliberty/security/oidcclientcore/token/auth/PrivateKeyJwtAuthMethodTest.java
@@ -36,7 +36,6 @@
 import com.ibm.json.java.JSONObject;
 import com.ibm.websphere.ssl.JSSEHelper;
 import com.ibm.websphere.ssl.SSLConfigChangeListener;
-import com.ibm.ws.kernel.productinfo.ProductInfo;
 import com.ibm.ws.security.common.ssl.SecuritySSLUtils;
 import com.ibm.ws.security.test.common.CommonTestClass;
 import com.ibm.ws.ssl.KeyStoreService;
@@ -79,7 +78,6 @@ public class PrivateKeyJwtAuthMethodTest extends CommonTestClass {
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         outputMgr.captureStreams();
-        System.setProperty(ProductInfo.BETA_EDITION_JVM_PROPERTY, "true");
         KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
         keyGen.initialize(4096);
         keyPair = keyGen.generateKeyPair();
@@ -110,7 +108,6 @@ public void tearDown() {
 
     @AfterClass
     public static void tearDownAfterClass() throws Exception {
-        System.clearProperty(ProductInfo.BETA_EDITION_JVM_PROPERTY);
         outputMgr.dumpStreams();
         outputMgr.restoreStreams();
     }

From 554f4a0945120408a5467a0fdffe74ce2960bbfa Mon Sep 17 00:00:00 2001
From: Adam Yoho <ayoho@us.ibm.com>
Date: Wed, 23 Aug 2023 09:31:04 -0500
Subject: [PATCH 2/2] Remove beta flags in FATs for OIDC Private Key JWT

---
 .../jvm.options                                     |  3 ---
 .../jvm.options                                     |  3 ---
 .../jvm.options                                     | 13 -------------
 .../jvm.options                                     | 13 -------------
 .../jvm.options                                     | 13 -------------
 .../jvm.options                                     | 13 -------------
 .../jvm.options                                     |  3 ---
 .../jvm.options                                     |  3 ---
 8 files changed, 64 deletions(-)
 delete mode 100644 dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.op/jvm.options
 delete mode 100644 dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.opWithStub/jvm.options
 delete mode 100644 dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rp/jvm.options
 delete mode 100644 dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rs/jvm.options

diff --git a/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.pkceAndPrivateKeyJwt/jvm.options b/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.pkceAndPrivateKeyJwt/jvm.options
index 45b2e26f77a..0ff52dc85a4 100644
--- a/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.pkceAndPrivateKeyJwt/jvm.options
+++ b/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.pkceAndPrivateKeyJwt/jvm.options
@@ -16,6 +16,3 @@
 -Dhttp.proxyHost=1.2.3.4
 -Dhttps.proxyPort=34567
 -Dhttps.proxyHost=1.2.3.4
-
-# Enable beta PKCE function
--Dcom.ibm.ws.beta.edition=true
diff --git a/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.privateKeyJwt/jvm.options b/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.privateKeyJwt/jvm.options
index 45b2e26f77a..0ff52dc85a4 100644
--- a/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.privateKeyJwt/jvm.options
+++ b/dev/com.ibm.ws.security.oidc.client_fat.3/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.rp.privateKeyJwt/jvm.options
@@ -16,6 +16,3 @@
 -Dhttp.proxyHost=1.2.3.4
 -Dhttps.proxyPort=34567
 -Dhttps.proxyHost=1.2.3.4
-
-# Enable beta PKCE function
--Dcom.ibm.ws.beta.edition=true
diff --git a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.op/jvm.options b/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.op/jvm.options
deleted file mode 100644
index a44402043ec..00000000000
--- a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.op/jvm.options
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2022 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-2.0/
-# 
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
--Dcom.ibm.ws.beta.edition=false
diff --git a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.opWithStub/jvm.options b/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.opWithStub/jvm.options
deleted file mode 100644
index 63a64fca26d..00000000000
--- a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.opWithStub/jvm.options
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2021, 2022 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-2.0/
-# 
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
--Dcom.ibm.ws.beta.edition=false
diff --git a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rp/jvm.options b/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rp/jvm.options
deleted file mode 100644
index 63a64fca26d..00000000000
--- a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rp/jvm.options
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2021, 2022 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-2.0/
-# 
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
--Dcom.ibm.ws.beta.edition=false
diff --git a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rs/jvm.options b/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rs/jvm.options
deleted file mode 100644
index 63a64fca26d..00000000000
--- a/dev/com.ibm.ws.security.oidc.client_fat.jaxrs/publish/servers/com.ibm.ws.security.openidconnect.client-1.0_fat.jaxrs.rs/jvm.options
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2021, 2022 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-2.0/
-# 
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
--Dcom.ibm.ws.beta.edition=false
diff --git a/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.pkceAndPrivateKeyJwt/jvm.options b/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.pkceAndPrivateKeyJwt/jvm.options
index 79ddc43c6fd..edbab1e411f 100644
--- a/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.pkceAndPrivateKeyJwt/jvm.options
+++ b/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.pkceAndPrivateKeyJwt/jvm.options
@@ -15,6 +15,3 @@
 -Dhttp.proxyHost=1.2.3.4
 -Dhttps.proxyPort=34567
 -Dhttps.proxyHost=1.2.3.4
-
-# Enable beta PKCE function
--Dcom.ibm.ws.beta.edition=true
\ No newline at end of file
diff --git a/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.privateKeyJwt/jvm.options b/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.privateKeyJwt/jvm.options
index 79ddc43c6fd..edbab1e411f 100644
--- a/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.privateKeyJwt/jvm.options
+++ b/dev/com.ibm.ws.security.social_fat.LibertyOP.3/publish/servers/com.ibm.ws.security.social_fat.LibertyOP.social.privateKeyJwt/jvm.options
@@ -15,6 +15,3 @@
 -Dhttp.proxyHost=1.2.3.4
 -Dhttps.proxyPort=34567
 -Dhttps.proxyHost=1.2.3.4
-
-# Enable beta PKCE function
--Dcom.ibm.ws.beta.edition=true
\ No newline at end of file