Skip to content

Commit

Permalink
Add new authenticator property: authenticationType.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thisara-Welmilla
Thisara-Welmilla committed Oct 3, 2024
1 parent 86e184d commit 7a4311d
Show file tree
Hide file tree
Showing 15 changed files with 622 additions and 11 deletions.
3 changes: 0 additions & 3 deletions ...er/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.wso2.carbon.identity.application.common.model.ServiceProvider;
import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig;
import org.wso2.carbon.identity.application.mgt.ApplicationConstants;
import org.wso2.carbon.identity.base.IdentityConstants;

import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -161,13 +160,11 @@ private AuthenticationStep buildAuthenticationStep(AuthenticationStepModel stepM
LocalAuthenticatorConfig localAuthOption = new LocalAuthenticatorConfig();
localAuthOption.setEnabled(true);
localAuthOption.setName(option.getAuthenticator());
localAuthOption.setDefinedByType(IdentityConstants.DefinedByType.SYSTEM);
localAuthOptions.add(localAuthOption);
} else {
FederatedAuthenticatorConfig federatedAuthConfig = new FederatedAuthenticatorConfig();
federatedAuthConfig.setEnabled(true);
federatedAuthConfig.setName(option.getAuthenticator());
federatedAuthConfig.setDefinedByType(IdentityConstants.DefinedByType.SYSTEM);

IdentityProvider federatedIdp = new IdentityProvider();
federatedIdp.setIdentityProviderName(option.getIdp());
Expand Down
56 changes: 55 additions & 1 deletion ...c/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/model/Authenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,40 @@ public static DefinedByEnum fromValue(String value) {

private DefinedByEnum definedBy;

@XmlType(name="AuthenticationTypeEnum")
@XmlEnum(String.class)
public enum AuthenticationTypeEnum {

@XmlEnumValue("IDENTIFICATION") IDENTIFICATION(String.valueOf("IDENTIFICATION")), @XmlEnumValue("VERIFICATION_ONLY") VERIFICATION_ONLY(String.valueOf("VERIFICATION_ONLY"));


private String value;

AuthenticationTypeEnum(String v) {
value = v;
}

public String value() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static AuthenticationTypeEnum fromValue(String value) {
for (AuthenticationTypeEnum b : AuthenticationTypeEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}

private AuthenticationTypeEnum authenticationType;

@XmlType(name="TypeEnum")
@XmlEnum(String.class)
public enum TypeEnum {
Expand Down Expand Up @@ -200,6 +234,24 @@ public void setDefinedBy(DefinedByEnum definedBy) {
this.definedBy = definedBy;
}

/**
**/
public Authenticator authenticationType(AuthenticationTypeEnum authenticationType) {

this.authenticationType = authenticationType;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("authenticationType")
@Valid
public AuthenticationTypeEnum getAuthenticationType() {
return authenticationType;
}
public void setAuthenticationType(AuthenticationTypeEnum authenticationType) {
this.authenticationType = authenticationType;
}

/**
**/
public Authenticator type(TypeEnum type) {
Expand Down Expand Up @@ -315,6 +367,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.displayName, authenticator.displayName) &&
Objects.equals(this.isEnabled, authenticator.isEnabled) &&
Objects.equals(this.definedBy, authenticator.definedBy) &&
Objects.equals(this.authenticationType, authenticator.authenticationType) &&
Objects.equals(this.type, authenticator.type) &&
Objects.equals(this.image, authenticator.image) &&
Objects.equals(this.description, authenticator.description) &&
Expand All @@ -324,7 +377,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(id, name, displayName, isEnabled, definedBy, type, image, description, tags, self);
return Objects.hash(id, name, displayName, isEnabled, definedBy, authenticationType, type, image, description, tags, self);
}

@Override
Expand All @@ -338,6 +391,7 @@ public String toString() {
sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n");
sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n");
sb.append(" definedBy: ").append(toIndentedString(definedBy)).append("\n");
sb.append(" authenticationType: ").append(toIndentedString(authenticationType)).append("\n");
sb.append(" type: ").append(toIndentedString(type)).append("\n");
sb.append(" image: ").append(toIndentedString(image)).append("\n");
sb.append(" description: ").append(toIndentedString(description)).append("\n");
Expand Down
3 changes: 3 additions & 0 deletions ...rbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ private void addIdp(IdentityProvider identityProvider, List<Authenticator> authe
} else {
authenticator.setDisplayName(identityProvider.getIdentityProviderName());
}
authenticator.setAuthenticationType(Authenticator.AuthenticationTypeEnum.IDENTIFICATION);
authenticator.setIsEnabled(identityProvider.isEnable());
authenticator.setType(Authenticator.TypeEnum.FEDERATED);
authenticator.setImage(identityProvider.getImageUrl());
Expand Down Expand Up @@ -521,6 +522,8 @@ private Authenticator addLocalAuthenticator(LocalAuthenticatorConfig config) {
authenticator.setIsEnabled(config.isEnabled());
authenticator.setType(Authenticator.TypeEnum.LOCAL);
authenticator.definedBy(Authenticator.DefinedByEnum.valueOf(config.getDefinedByType().toString()));
authenticator.setAuthenticationType(
Authenticator.AuthenticationTypeEnum.valueOf(config.getAuthenticationType().toString()));
String[] tags = config.getTags();
if (ArrayUtils.isNotEmpty(tags)) {
authenticator.setTags(Arrays.asList(tags));
Expand Down
6 changes: 6 additions & 0 deletions ....wso2.carbon.identity.api.server.authenticators.v1/src/main/resources/authenticators.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@ components:
enum:
- SYSTEM
- USER
authenticationType:
type: string
enum:
- IDENTIFICATION
- VERIFICATION_ONLY
- REQUEST_PATH
type:
type: string
enum:
Expand Down
56 changes: 55 additions & 1 deletion ...s.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/Authenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,40 @@ public static DefinedByEnum fromValue(String value) {

private DefinedByEnum definedBy;

@XmlType(name="AuthenticationTypeEnum")
@XmlEnum(String.class)
public enum AuthenticationTypeEnum {

@XmlEnumValue("IDENTIFICATION") IDENTIFICATION(String.valueOf("IDENTIFICATION")), @XmlEnumValue("VERIFICATION_ONLY") VERIFICATION_ONLY(String.valueOf("VERIFICATION_ONLY")), @XmlEnumValue("REQUEST_PATH") REQUEST_PATH(String.valueOf("REQUEST_PATH"));


private String value;

AuthenticationTypeEnum(String v) {
value = v;
}

public String value() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static AuthenticationTypeEnum fromValue(String value) {
for (AuthenticationTypeEnum b : AuthenticationTypeEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}

private AuthenticationTypeEnum authenticationType;

@XmlType(name="TypeEnum")
@XmlEnum(String.class)
public enum TypeEnum {
Expand Down Expand Up @@ -204,6 +238,24 @@ public void setDefinedBy(DefinedByEnum definedBy) {
this.definedBy = definedBy;
}

/**
**/
public Authenticator authenticationType(AuthenticationTypeEnum authenticationType) {

this.authenticationType = authenticationType;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("authenticationType")
@Valid
public AuthenticationTypeEnum getAuthenticationType() {
return authenticationType;
}
public void setAuthenticationType(AuthenticationTypeEnum authenticationType) {
this.authenticationType = authenticationType;
}

/**
**/
public Authenticator type(TypeEnum type) {
Expand Down Expand Up @@ -291,14 +343,15 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.displayName, authenticator.displayName) &&
Objects.equals(this.isEnabled, authenticator.isEnabled) &&
Objects.equals(this.definedBy, authenticator.definedBy) &&
Objects.equals(this.authenticationType, authenticator.authenticationType) &&
Objects.equals(this.type, authenticator.type) &&
Objects.equals(this.tags, authenticator.tags) &&
Objects.equals(this.properties, authenticator.properties);
}

@Override
public int hashCode() {
return Objects.hash(id, name, displayName, isEnabled, definedBy, type, tags, properties);
return Objects.hash(id, name, displayName, isEnabled, definedBy, authenticationType, type, tags, properties);
}

@Override
Expand All @@ -312,6 +365,7 @@ public String toString() {
sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n");
sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n");
sb.append(" definedBy: ").append(toIndentedString(definedBy)).append("\n");
sb.append(" authenticationType: ").append(toIndentedString(authenticationType)).append("\n");
sb.append(" type: ").append(toIndentedString(type)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append(" properties: ").append(toIndentedString(properties)).append("\n");
Expand Down
110 changes: 109 additions & 1 deletion .../gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/AuthenticatorListItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,74 @@ public class AuthenticatorListItem {
private String displayName;
private Boolean isEnabled = true;

@XmlType(name="DefinedByEnum")
@XmlEnum(String.class)
public enum DefinedByEnum {

@XmlEnumValue("SYSTEM") SYSTEM(String.valueOf("SYSTEM")), @XmlEnumValue("USER") USER(String.valueOf("USER"));


private String value;

DefinedByEnum(String v) {
value = v;
}

public String value() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static DefinedByEnum fromValue(String value) {
for (DefinedByEnum b : DefinedByEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}

private DefinedByEnum definedBy;

@XmlType(name="AuthenticationTypeEnum")
@XmlEnum(String.class)
public enum AuthenticationTypeEnum {

@XmlEnumValue("IDENTIFICATION") IDENTIFICATION(String.valueOf("IDENTIFICATION")), @XmlEnumValue("VERIFICATION_ONLY") VERIFICATION_ONLY(String.valueOf("VERIFICATION_ONLY")), @XmlEnumValue("REQUEST_PATH") REQUEST_PATH(String.valueOf("REQUEST_PATH"));


private String value;

AuthenticationTypeEnum(String v) {
value = v;
}

public String value() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static AuthenticationTypeEnum fromValue(String value) {
for (AuthenticationTypeEnum b : AuthenticationTypeEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}

private AuthenticationTypeEnum authenticationType;

@XmlType(name="TypeEnum")
@XmlEnum(String.class)
public enum TypeEnum {
Expand Down Expand Up @@ -146,6 +214,42 @@ public void setIsEnabled(Boolean isEnabled) {
this.isEnabled = isEnabled;
}

/**
**/
public AuthenticatorListItem definedBy(DefinedByEnum definedBy) {

this.definedBy = definedBy;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("definedBy")
@Valid
public DefinedByEnum getDefinedBy() {
return definedBy;
}
public void setDefinedBy(DefinedByEnum definedBy) {
this.definedBy = definedBy;
}

/**
**/
public AuthenticatorListItem authenticationType(AuthenticationTypeEnum authenticationType) {

this.authenticationType = authenticationType;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("authenticationType")
@Valid
public AuthenticationTypeEnum getAuthenticationType() {
return authenticationType;
}
public void setAuthenticationType(AuthenticationTypeEnum authenticationType) {
this.authenticationType = authenticationType;
}

/**
**/
public AuthenticatorListItem type(TypeEnum type) {
Expand Down Expand Up @@ -224,14 +328,16 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.name, authenticatorListItem.name) &&
Objects.equals(this.displayName, authenticatorListItem.displayName) &&
Objects.equals(this.isEnabled, authenticatorListItem.isEnabled) &&
Objects.equals(this.definedBy, authenticatorListItem.definedBy) &&
Objects.equals(this.authenticationType, authenticatorListItem.authenticationType) &&
Objects.equals(this.type, authenticatorListItem.type) &&
Objects.equals(this.tags, authenticatorListItem.tags) &&
Objects.equals(this.self, authenticatorListItem.self);
}

@Override
public int hashCode() {
return Objects.hash(id, name, displayName, isEnabled, type, tags, self);
return Objects.hash(id, name, displayName, isEnabled, definedBy, authenticationType, type, tags, self);
}

@Override
Expand All @@ -244,6 +350,8 @@ public String toString() {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n");
sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n");
sb.append(" definedBy: ").append(toIndentedString(definedBy)).append("\n");
sb.append(" authenticationType: ").append(toIndentedString(authenticationType)).append("\n");
sb.append(" type: ").append(toIndentedString(type)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append(" self: ").append(toIndentedString(self)).append("\n");
Expand Down
Loading

0 comments on commit 7a4311d

Please sign in to comment.