Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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

This file was deleted.

9 changes: 2 additions & 7 deletions core/src/main/java/com/adobe/aio/workspace/Workspace.java
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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

This file was deleted.

35 changes: 0 additions & 35 deletions core/src/test/resources/workspace.jwt.properties

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/test/resources/workspace.oauth.properties
Original file line numberDiff line numberDiff 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