Skip to content

[CI-5972]: Remove deprecated JWT server-to-server authentication #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emanuelv-ens wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[CI-5972]: Remove deprecated JWT server-to-server authentication #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcbb8ba
CI-5972: Fix tests on Windows platform
emanuelvintila Jun 16, 2025
7c69080
CI-5972: Remove JWT Auth
emanuelvintila Jun 16, 2025
5b6f4f9
CI-5972: Bump version to 3.0.0
emanuelvintila Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions aem/core_aem/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ wrapping [`aio-lib-java-core`](../../core) and [`aio-lib-java-ims`](../../ims)

It hosts the services to
* get the Adobe Developer Console Workspace
* get Access token (using either JWT or OAuth token flow) from Adobe Identity Management System (IMS)
* get Access token (using the OAuth token flow) from Adobe Identity Management System (IMS)


## `Workspace` Configuration
Expand All @@ -18,14 +18,7 @@ service looks up the following OSGI configuration keys:
* `aio.consumer.org.id` your Adobe Developer Console consumer orgnaization id (`project.org.id`)
* `aio.ims.org.id` your Adobe Developer Console IMS Organization ID (`project.org.ims_org_id`)
* `aio.workspace.id` your Adobe Developer Console workspace Id (`project.workspace.id`)
* `aio.api.key` your Adobe Developer Console credential API Key (or Client ID)

When using JWT credentials also set
* `aio.credential.id` your Adobe Developer Console jwt credential id
* `aio.client.secret` your Adobe Developer Console jwt credential client secret
* `aio.meta.scopes` a comma separated list of metascopes associated with your API, see your Adobe Developer Console jwt credential metascopes
* `aio.technical.account.id` your Adobe Developer Console jwt credential technical account id
* `aio.encoded.pkcs8` your private key (in a base64 encoded pkcs8 format)
* `aio.api.key` your Adobe Developer Console credential API Key (or Client ID)

When using OAuth credentials also set
* `aio.client.secret` your Adobe Developer Console oAuth credential client secret
Expand Down
7 changes: 0 additions & 7 deletions aem/core_aem/src/main/java/com/adobe/aio/aem/workspace/internal/WorkspaceSupplierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
import com.adobe.aio.aem.workspace.WorkspaceSupplier;
import com.adobe.aio.aem.workspace.ocd.WorkspaceConfig;
import com.adobe.aio.auth.Context;
import com.adobe.aio.auth.JwtContext;
import com.adobe.aio.auth.OAuthContext;
import com.adobe.aio.ims.util.PrivateKeyBuilder;
import com.adobe.aio.util.WorkspaceUtil;
import com.adobe.aio.workspace.Workspace;
import java.util.HashMap;
Expand Down Expand Up @@ -84,11 +82,6 @@ private Map<String, String> getAuthConfigMap(

putIfNotBlank(map, Context.CLIENT_SECRET, config.aio_client_secret());


putIfNotBlank(map, JwtContext.TECHNICAL_ACCOUNT_ID, config.aio_technical_account_id());
putIfNotBlank(map, JwtContext.META_SCOPES, config.aio_meta_scopes());
putIfNotBlank(map, PrivateKeyBuilder.AIO_ENCODED_PKCS_8, config.aio_encoded_pkcs8());

putIfNotBlank(map, OAuthContext.SCOPES, config.aio_oauth_scopes());
return map;
}
Expand Down
12 changes: 0 additions & 12 deletions aem/core_aem/src/main/java/com/adobe/aio/aem/workspace/ocd/WorkspaceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
description = "Adobe IMS URL: prod: https://ims-na1.adobelogin.com | stage: https://ims-na1-stg1.adobelogin.com")
String aio_ims_url() default "https://ims-na1.adobelogin.com";

@AttributeDefinition(name = "JWT Meta Scopes (For deprecated JWT Auth only)",
description = "Comma separated list of metascopes associated with your API (`/s/event_receiver_api,/s/ent_adobeio_sdk` for instance) (project.workspace.details.credentials.jwt.meta_scopes), to be used for deprecated JWT Auth only.")
String aio_meta_scopes() default "/s/ent_adobeio_sdk";

@AttributeDefinition(name = "OAuth Scopes",
description = "Comma separated String. list of oauth scopes associated with your API (project.workspace.details.credentials.oauth_server_to_server.scopes)")
String aio_oauth_scopes();
Expand Down Expand Up @@ -54,16 +50,8 @@
description = "Adobe I/O Credential ID as shown in your Adobe Developer Console workspace (project.workspace.details.credentials.id)")
String aio_credential_id();

@AttributeDefinition(name = "Technical Account ID (For deprecated JWT Auth only)",
description = "Technical account ID as shown in your Adobe Developer Console workspace (project.workspace.details.credentials.jwt.technical_account_id)")
String aio_technical_account_id();

@AttributeDefinition(name = "Client Secret",
description = "Adobe I/O Client Secret as shown in your Adobe Developer Console workspace")
String aio_client_secret();

@AttributeDefinition(name = "Private Key (For deprecated JWT Auth only)",
description = "Base64 encoded pkcs8 Private Key (For deprecated JWT Auth only).")
String aio_encoded_pkcs8();

}
10 changes: 0 additions & 10 deletions core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ your [Adobe Developer Console Project Workspace](https://www.adobe.io/apis/exper

To get you started quickly use a `.properties` file,
* see our sample config files:
* [workspace.jwt.properties](./src/test/resources/workspace.jwt.properties)
* [workspace.oauth.properties](./src/test/resources/workspace.oauth.properties)
* download your `project` configurations file from your Adobe Developer Console Project overview page
* map your `project` configurations with this properties
Expand All @@ -37,15 +36,6 @@ For [OAuth2 authentication](https://developer.adobe.com/developer-console/docs/g
* `aio_client_secret` one your Adobe Developer Console OAuth Client Secrets (`project.workspace.details.credentials[i].oauth_server_to_server.client_secret`)
* `aio_oauth_scopes` a comma separated list of OAuth scopes associated with your API, see your Adobe Developer Console OAuth scopes (`project.workspace.details.credentials[i].oauth_server_to_server.scopes`)

#### JWT authentication
For [JWT authentication](https://developer.adobe.com/developer-console/docs/guides/authentication/ServerToServerAuthentication/#service-account-jwt-credential-deprecated), you will need to provide the following properties:
* `aio_client_secret` your Adobe Developer Console jwt credential client secret (`project.workspace.details.credentials[i].jwt.client_secret`)
* `aio_api_key` your Adobe Developer Console jwt credential API Key (or Client ID) (`project.workspace.details.credentials[i].jwt.client_id`)
* `aio_meta_scopes` a comma separated list of metascopes associated with your API, see your Adobe Developer Console jwt credential metascopes (`project.workspace.details.credentials[i].jwt.meta_scopes`)
* `aio_technical_account_id` your Adobe Developer Console jwt credential technical account id (`project.workspace.details.credentials[i].jwt.technical_account_id`)
* `aio_encoded_pkcs8` your privateKey (associated with the public key set in your Adobe Developer Console workspace) in a base64 encoded pkcs8 format



## Builds

Expand Down
153 changes: 0 additions & 153 deletions core/src/main/java/com/adobe/aio/auth/JwtContext.java
View file
Open in desktop

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@


import com.adobe.aio.auth.Context;
import com.adobe.aio.auth.JwtContext;
import com.adobe.aio.auth.OAuthContext;
import com.adobe.aio.util.Constants;
import java.util.Map;
Expand Down Expand Up @@ -58,8 +57,8 @@ public static Builder builder() {

public void validateAll() {
validateWorkspaceContext();
if (!isAuthOAuth() && !isAuthJWT()) {
throw new IllegalStateException("Missing auth configuration, set either jwt or oauth...");
if (!isAuthOAuth()) {
throw new IllegalStateException("Missing auth configuration, set oauth properties...");
}
authContext.validate();
}
Expand Down Expand Up @@ -139,10 +138,6 @@ public boolean isAuthOAuth() {
return authContext!=null && authContext instanceof OAuthContext;
}

public boolean isAuthJWT() {
return authContext!=null && authContext instanceof JwtContext;
}


@Override
public boolean equals(Object o) {
Expand Down
62 changes: 0 additions & 62 deletions core/src/test/java/com/adobe/aio/auth/JwtContextTest.java
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ aio_credential_id=aio_credential_id_changeMe

# aio_api_key = your Adobe Developer Console credential API Key (or Client ID) (project.workspace.details.credentials[i].oauth_server_to_server.client_id)
aio_api_key=aio_api_key_changeMe
# aio_client_secret = your Adobe Developer Console jwt credential client secret (project.workspace.details.credentials[i].oauth_server_to_server.client_secrets[0])
# aio_client_secret = your Adobe Developer Console oauth credential client secret (project.workspace.details.credentials[i].oauth_server_to_server.client_secrets[0])
aio_client_secret=aio_client_secret_changeMe
# aio_oauth_scopes : comma separated list of oauth associated with your API, see your Adobe Developer Console oauth scopes (project.workspace.details.credentials[i].oauth_server_to_server.scopes)
# sample aio_oauth_scopes: aio_oauth_scopes= AdobeID,openid,read_organizations,additional_info.projectedProductContext,additional_info.roles,adobeio_api,read_client_secret,manage_client_secrets
Expand Down
Loading