feat(admin-ui): get scope by inum api not triggered

GluuFederation · Aug 17, 2022 · a1b568c · a1b568c
1 parent 6c1db7b
commit a1b568c
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 24 deletions.
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import Box from '@material-ui/core/Box'
 import { Link } from 'react-router-dom'
 import {
@@ -22,11 +22,11 @@ import { FormControlLabel, Radio, RadioGroup } from '@material-ui/core'
 import GluuTypeAheadForDn from 'Routes/Apps/Gluu/GluuTypeAheadForDn'
 import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 import { deleteUMAResource } from 'Plugins/auth-server/redux/actions/UMAResourceActions'
+import { getScope } from 'Plugins/auth-server/redux/actions/ScopeActions'
 import GluuDialog from 'Routes/Apps/Gluu/GluuDialog'
-import { buildPayload } from 'Utils/PermChecker'
 const DOC_CATEGORY = 'openid_client'
 
-function ClientCibaParUmaPanel({ client, dispatch, umaResources, scripts, formik }) {
+function ClientCibaParUmaPanel({ client, dispatch, umaResources, scope, scripts, formik }) {
   const { t } = useTranslation()
   const claim_uri_id = 'claim_uri_id'
   const cibaDeliveryModes = ['poll', 'push', 'ping']
@@ -68,11 +68,26 @@ function ClientCibaParUmaPanel({ client, dispatch, umaResources, scripts, formik
   }
 
   const onDeletionConfirmed = (message) => {
-    buildPayload({}, message, selectedUMA.id)
-    dispatch(deleteUMAResource(selectedUMA.id))
+    const params = {
+      id: selectedUMA.id,
+      message
+    }
+    dispatch(deleteUMAResource(params))
     setConfirmModal(false)
   }
 
+  useEffect(() => {
+    if(!isEmpty(selectedUMA) && !isEmpty(selectedUMA.scopes) && selectedUMA.scopes?.length > 0) {
+      selectedUMA.scopes.map(scope => {
+        // scope data example [string] inum=9bc94613-f678-4bb9-a19d-ed026b492247,ou=scopes,o=jans
+        const getInum = scope.split(',')[0]
+        const inum = getInum.split('=')[1]
+
+        dispatch(getScope(inum))
+      })
+    }
+  }, [selectedUMA])
+
   return (
     <Container>
       <h2>{t(`titles.CIBA`)}</h2>
@@ -255,16 +270,16 @@ function ClientCibaParUmaPanel({ client, dispatch, umaResources, scripts, formik
               <Col sm={9} className="top-5">
                 {showScopeSection === 'scope' ? (
                   <React.Fragment>
-                    {!isEmpty(selectedUMA) && selectedUMA?.scopes?.map((scope, key) => {
-                      const getInum = scope.split(',')[0]
+                    {!isEmpty(selectedUMA) && selectedUMA?.scopes?.map((scopeString, key) => {
+                      const getInum = scopeString.split(',')[0]
                       const inum = getInum.length > 0 ? getInum.split('=')[1] : null
 
-                      if (inum) {
+                      if (!isEmpty(scope[inum])) {
                         return (
                           <Box key={key}>
                             <Box display="flex">
-                              <Link to={`/auth-server/scope/edit:${inum}`} className="common-link">
-                                {scope}
+                              <Link to={`/auth-server/scope/edit:${scope[inum]?.inum}`} className="common-link">
+                                {scope[inum]?.displayName}
                               </Link>
                             </Box>
                           </Box>

diff --git a/admin-ui/plugins/auth-server/redux/actions/ScopeActions.js b/admin-ui/plugins/auth-server/redux/actions/ScopeActions.js
@@ -80,7 +80,10 @@ export const deleteScopeResponse = (data) => ({
   payload: { data },
 })
 
-export const setCurrentItem = (item) => ({
-  type: SET_ITEM,
-  payload: { item },
-})
+export const setCurrentItem = (item, inum) => {
+  console.log(item, inum)
+  return ({
+    type: SET_ITEM,
+    payload: { item, inum },
+  })
+}
diff --git a/admin-ui/plugins/auth-server/redux/api/ScopeApi.js b/admin-ui/plugins/auth-server/redux/api/ScopeApi.js
@@ -19,7 +19,7 @@ export default class ScopeApi {
     })
   }
 
-  getScope = async (id) => {
+  patchScope = async (id) => {
     return new Promise((resolve, reject) => {
       this.api.patchOauthScopesById(id, (error, data) => {
         this.handleResponse(error, reject, resolve, data)

diff --git a/admin-ui/plugins/auth-server/redux/api/UMAResourceApi.js b/admin-ui/plugins/auth-server/redux/api/UMAResourceApi.js
@@ -11,9 +11,10 @@ export default class UMAResourceApi {
     })
   }
 
-  deteleUMAResources = async (id) => {
+  deteleUMAResource = async (id) => {
     return new Promise((resolve, reject) => {
       this.api.deleteOauthUmaResourcesById(id, (error, data) => {
+        console.log('delete uma')
         this.handleResponse(error, reject, resolve, data)
       })
     })

diff --git a/admin-ui/plugins/auth-server/redux/reducers/ScopeReducer.js b/admin-ui/plugins/auth-server/redux/reducers/ScopeReducer.js
@@ -121,11 +121,7 @@ export default function scopeReducer(state = INIT_STATE, action) {
       }
 
     case SET_ITEM:
-      return {
-        ...state,
-        item: action.payload.item,
-        loading: false,
-      }
+      return setItem()
     case RESET:
       return {
         ...state,
@@ -135,6 +131,18 @@ export default function scopeReducer(state = INIT_STATE, action) {
     default:
       return handleDefault()
   }
+  function setItem() {
+    const currentItem = state.item
+    const newItem = { ...currentItem, [action.payload.inum]: action.payload.item }
+
+    console.log('newItem', newItem)
+
+    return {
+      ...state,
+      item: newItem,
+      loading: false,
+    }
+  }
   function handleLoading() {
     return {
       ...state,

diff --git a/admin-ui/plugins/auth-server/redux/sagas/OAuthScopeSaga.js b/admin-ui/plugins/auth-server/redux/sagas/OAuthScopeSaga.js
@@ -58,7 +58,8 @@ export function* getScopeByInum({ payload }) {
     addAdditionalData(audit, FETCH, SCOPE, {})
     const scopeApi = yield* newFunction()
     const data = yield call(scopeApi.getScope, payload.action)
-    yield put(setCurrentItem(data))
+    console.log('data', data)
+    yield put(setCurrentItem(data, payload.action))
     yield call(postUserAction, audit)
   } catch (e) {
     yield put(deleteScopeResponse(null))

diff --git a/admin-ui/plugins/auth-server/redux/sagas/UMAResourceSaga.js b/admin-ui/plugins/auth-server/redux/sagas/UMAResourceSaga.js
@@ -56,8 +56,8 @@ export function* deleteUMAResourceById({ payload }) {
   try {
     addAdditionalData(audit, DELETION, UMA, payload)
     const api = yield* newFunction()
-    yield call(api.deleteUMAResourceById, payload.action.action_data)
-    yield put(deleteUMAResourceResponse(payload.action.action_data))
+    yield call(api.deteleUMAResource, payload.action.id)
+    yield put(deleteUMAResourceResponse(payload.action.id))
     yield call(postUserAction, audit)
   } catch (e) {
     yield put(deleteUMAResourceResponse(null))