Merge pull request #889 from shilmyhasan/main-masterfixes

Improve UX of role addition.
wso2 · Feb 27, 2025 · e08e3d3 · e08e3d3
2 parents bbf0d57 + 6c76752
commit e08e3d3
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 16 deletions.
diff --git a/...s/publisher/src/main/webapp/source/src/app/components/Apis/Details/Scopes/CreateScope.jsx b/...s/publisher/src/main/webapp/source/src/app/components/Apis/Details/Scopes/CreateScope.jsx
@@ -227,10 +227,25 @@ class CreateScope extends React.Component {
         const promise = APIValidation.role.validate(base64url.encode(role));
         promise
             .then(() => {
-                this.setState({
-                    roleValidity: true,
-                    validRoles: [...validRoles, role],
-                });
+                const splitRole = role.split('/', 2);
+                let validatedRole = '';
+                if (splitRole.length > 1) {
+                    const domain = splitRole.length > 0 ? splitRole[0] : '';
+                    if (domain.toUpperCase() !== 'INTERNAL') {
+                        const domainUpperCase = domain.toUpperCase().concat('/');
+                        validatedRole = domainUpperCase.concat(splitRole[1]);
+                    } else {
+                        validatedRole = role;
+                    }
+                } else {
+                    validatedRole = role;
+                }
+                if (!validRoles.includes(validatedRole)) {
+                    this.setState({
+                        roleValidity: true,
+                        validRoles: [...validRoles, validatedRole],
+                    });
+                }
             })
             .catch((error) => {
                 if (error.status === 404) {

diff --git a/...als/publisher/src/main/webapp/source/src/app/components/Apis/Details/Scopes/EditScope.jsx b/...als/publisher/src/main/webapp/source/src/app/components/Apis/Details/Scopes/EditScope.jsx
@@ -215,10 +215,25 @@ class EditScope extends React.Component {
         const promise = APIValidation.role.validate(base64url.encode(role));
         promise
             .then(() => {
-                this.setState({
-                    roleValidity: true,
-                    validRoles: [...validRoles, role],
-                });
+                const splitRole = role.split('/', 2);
+                let validatedRole = '';
+                if (splitRole.length > 1) {
+                    const domain = splitRole.length > 0 ? splitRole[0] : '';
+                    if (domain.toUpperCase() !== 'INTERNAL') {
+                        const domainUpperCase = domain.toUpperCase().concat('/');
+                        validatedRole = domainUpperCase.concat(splitRole[1]);
+                    } else {
+                        validatedRole = role;
+                    }
+                } else {
+                    validatedRole = role;
+                }
+                if (!validRoles.includes(validatedRole)) {
+                    this.setState({
+                        roleValidity: true,
+                        validRoles: [...validRoles, validatedRole],
+                    });
+                }
             })
             .catch((error) => {
                 if (error.status === 404) {

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Scopes/Create/CreateScope.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Scopes/Create/CreateScope.jsx
@@ -225,10 +225,25 @@ class CreateScope extends React.Component {
         const promise = APIValidation.role.validate(base64url.encode(role));
         promise
             .then(() => {
-                this.setState({
-                    roleValidity: true,
-                    validRoles: [...validRoles, role],
-                });
+                const splitRole = role.split('/', 2);
+                let validatedRole = '';
+                if (splitRole.length > 1) {
+                    const domain = splitRole.length > 0 ? splitRole[0] : '';
+                    if (domain.toUpperCase() !== 'INTERNAL') {
+                        const domainUpperCase = domain.toUpperCase().concat('/');
+                        validatedRole = domainUpperCase.concat(splitRole[1]);
+                    } else {
+                        validatedRole = role;
+                    }
+                } else {
+                    validatedRole = role;
+                }
+                if (!validRoles.includes(validatedRole)) {
+                    this.setState({
+                        roleValidity: true,
+                        validRoles: [...validRoles, validatedRole],
+                    });
+                }
             })
             .catch((error) => {
                 if (error.status === 404) {

diff --git a/portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx b/portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx
@@ -242,10 +242,25 @@ class EditScope extends React.Component {
         const promise = APIValidation.role.validate(base64url.encode(role));
         promise
             .then(() => {
-                this.setState({
-                    roleValidity: true,
-                    validRoles: [...validRoles, role],
-                });
+                const splitRole = role.split('/', 2);
+                let validatedRole = '';
+                if (splitRole.length > 1) {
+                    const domain = splitRole.length > 0 ? splitRole[0] : '';
+                    if (domain.toUpperCase() !== 'INTERNAL') {
+                        const domainUpperCase = domain.toUpperCase().concat('/');
+                        validatedRole = domainUpperCase.concat(splitRole[1]);
+                    } else {
+                        validatedRole = role;
+                    }
+                } else {
+                    validatedRole = role;
+                }
+                if (!validRoles.includes(validatedRole)) {
+                    this.setState({
+                        roleValidity: true,
+                        validRoles: [...validRoles, validatedRole],
+                    });
+                }
             })
             .catch((error) => {
                 if (error.status === 404) {