-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into customFunctionTestCases
- Loading branch information
Showing
244 changed files
with
8,145 additions
and
622 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
...rc/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/HCaptchaImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| ~ Copyright 2024 Adobe | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ | ||
| package com.adobe.cq.forms.core.components.internal.models.v1.form; | ||
|
|
||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Named; | ||
|
|
||
| import org.apache.sling.api.SlingHttpServletRequest; | ||
| import org.apache.sling.api.resource.Resource; | ||
| import org.apache.sling.api.resource.ResourceResolver; | ||
| import org.apache.sling.models.annotations.Exporter; | ||
| import org.apache.sling.models.annotations.Model; | ||
| import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy; | ||
| import org.apache.sling.models.annotations.injectorspecific.OSGiService; | ||
| import org.apache.sling.models.annotations.injectorspecific.ValueMapValue; | ||
| import org.osgi.service.component.annotations.Reference; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.adobe.aemds.guide.model.HCaptchaConfiguration; | ||
| import com.adobe.aemds.guide.service.CloudConfigurationProvider; | ||
| import com.adobe.aemds.guide.service.GuideException; | ||
| import com.adobe.cq.export.json.ComponentExporter; | ||
| import com.adobe.cq.export.json.ExporterConstants; | ||
| import com.adobe.cq.forms.core.components.internal.form.FormConstants; | ||
| import com.adobe.cq.forms.core.components.models.form.HCaptcha; | ||
| import com.adobe.cq.forms.core.components.util.AbstractCaptchaImpl; | ||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
|
|
||
| @Model( | ||
| adaptables = { SlingHttpServletRequest.class, Resource.class }, | ||
| adapters = { HCaptcha.class, | ||
| ComponentExporter.class }, | ||
| resourceType = { FormConstants.RT_FD_FORM_HCAPTCHA_V1 }) | ||
| @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION) | ||
| public class HCaptchaImpl extends AbstractCaptchaImpl implements HCaptcha { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(HCaptchaImpl.class); | ||
|
|
||
| @Inject | ||
| private ResourceResolver resourceResolver; | ||
|
|
||
| private Resource resource; | ||
|
|
||
| @Reference | ||
| @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL) | ||
| private HCaptchaConfiguration hCaptchaConfiguration; | ||
|
|
||
| @OSGiService | ||
| @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL) | ||
| private CloudConfigurationProvider cloudConfigurationProvider; | ||
|
|
||
| @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL) | ||
| @JsonIgnore | ||
| @Named("cloudServicePath") | ||
| protected String cloudServicePath; | ||
|
|
||
| @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL) | ||
| @JsonIgnore | ||
| @Named("size") | ||
| protected String size; | ||
|
|
||
| private static final String SITE_KEY = "siteKey"; | ||
| private static final String URI = "uri"; | ||
| private static final String SIZE = "size"; | ||
| private static final String THEME = "theme"; | ||
| private static final String TYPE = "type"; | ||
|
|
||
| @Override | ||
| public String getCloudServicePath() { | ||
| return cloudServicePath; | ||
| } | ||
|
|
||
| @Override | ||
| public String getProvider() { | ||
| return "hcaptcha"; | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, Object> getCaptchaProperties() throws GuideException { | ||
|
|
||
| Map<String, Object> customCaptchaProperties = new LinkedHashMap<>(); | ||
| String siteKey = null, uri = null; | ||
| resource = resourceResolver.getResource(this.getPath()); | ||
| if (cloudConfigurationProvider == null) { | ||
| LOGGER.info("[AF] [Captcha] [HCAPTCHA] Error while fetching cloud configuration, upgrade to latest release to use hCaptcha."); | ||
| } | ||
| try { | ||
| if (resource != null && cloudConfigurationProvider != null) { | ||
| hCaptchaConfiguration = cloudConfigurationProvider.getHCaptchaCloudConfiguration(resource); | ||
| if (hCaptchaConfiguration != null) { | ||
| siteKey = hCaptchaConfiguration.getSiteKey(); | ||
| uri = hCaptchaConfiguration.getClientSideJsUrl(); | ||
| } | ||
| } | ||
| } catch (GuideException e) { | ||
| LOGGER.error("[AF] [Captcha] [HCAPTCHA] Error while fetching cloud configuration, upgrade to latest release to use hCaptcha."); | ||
| } | ||
| customCaptchaProperties.put(SITE_KEY, siteKey); | ||
| customCaptchaProperties.put(URI, uri); | ||
| customCaptchaProperties.put(SIZE, this.size); | ||
| customCaptchaProperties.put(THEME, "light"); | ||
| customCaptchaProperties.put(TYPE, "image"); | ||
|
|
||
| return customCaptchaProperties; | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/HCaptcha.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| ~ Copyright 2024 Adobe | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ | ||
| package com.adobe.cq.forms.core.components.models.form; | ||
|
|
||
| import org.osgi.annotation.versioning.ConsumerType; | ||
|
|
||
| /** | ||
| * Defines the form {@code HCaptcha} Sling Model used for the {@code /apps/core/fd/components/form/hcaptcha/v1/hcaptcha} | ||
| * component. | ||
| * | ||
| * @since com.adobe.cq.forms.core.components.models.form 5.4.0 | ||
| */ | ||
| @ConsumerType | ||
| public interface HCaptcha extends Captcha {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.