feat(admin-ui): create redux for uma

admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js

@@ -58,7 +58,10 @@ function ClientCibaParUmaPanel({ client, dispatch, scope, umaResources, scripts,
     if (!isEmpty(uma)) {
       setSelectedUMA(uma)
       setScopeExpression(JSON.parse(uma.scopeExpression)?.data)
-      dispatch(getScope(uma.inum))
+      console.log('uma', uma)
+      const getClientInum = uma?.clients[0].split(',')[0]
+      const inum = getClientInum.split('=')[1]
+      dispatch(getScope(inum))
     }
 
     setOpen(true)
@@ -284,7 +287,6 @@ const mapStateToProps = (state) => {
     clientData: state.oidcReducer.item,
     loading: state.oidcReducer.loading,
     scope: state.scopeReducer.item,
-    umaResources: state.oidcReducer.umaResources,
   }
 }
 export default connect(mapStateToProps)(ClientCibaParUmaPanel)

admin-ui/plugins/auth-server/components/Clients/ClientEditPage.js

@@ -3,7 +3,8 @@ import ClientWizardForm from './ClientWizardForm'
 import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
 import { useHistory } from 'react-router-dom'
 import { connect } from 'react-redux'
-import { editClient, getUMAResourcesByClient } from 'Plugins/auth-server/redux/actions/OIDCActions'
+import { editClient } from 'Plugins/auth-server/redux/actions/OIDCActions'
+import { getUMAResourcesByClient } from 'Plugins/auth-server/redux/actions/UMAResourceActions'
 import { getScopes } from 'Plugins/auth-server/redux/actions/ScopeActions'
 import { getOidcDiscovery } from 'Redux/actions/OidcDiscoveryActions'
 import { getScripts } from 'Redux/actions/InitActions'
@@ -92,7 +93,7 @@ const mapStateToProps = (state) => {
     oidcConfiguration: state.oidcDiscoveryReducer.configuration,
     saveOperationFlag: state.oidcReducer.saveOperationFlag,
     errorInSaveOperationFlag: state.oidcReducer.errorInSaveOperationFlag,
-    umaResources: state.oidcReducer.umaResources,
+    umaResources: state.umaResourceReducer.items,
   }
 }
 export default connect(mapStateToProps)(ClientEditPage)

admin-ui/plugins/auth-server/plugin-metadata.js

@@ -18,13 +18,15 @@ import jsonReducer from './redux/reducers/JsonConfigReducer'
 import jwksReducer from './redux/reducers/JwksReducer'
 import acrReducer from './redux/reducers/AcrReducer'
 import loggingReducer from './redux/reducers/LoggingReducer'
+import umaResourceReducer from './redux/reducers/UMAResourceReducer'
 
 import scopesSaga from './redux/sagas/OAuthScopeSaga'
 import oidcSaga from './redux/sagas/OIDCSaga'
 import jsonSaga from './redux/sagas/JsonConfigSaga'
 import jwksSaga from './redux/sagas/JwksSaga'
 import acrSaga from './redux/sagas/AcrsSaga'
 import loggingSaga from './redux/sagas/LoggingSaga'
+import umaResourceSaga from './redux/sagas/UMAResourceSaga'
 
 import {
   ACR_READ,
@@ -135,6 +137,7 @@ const pluginMetadata = {
     { name: 'jwksReducer', reducer: jwksReducer },
     { name: 'acrReducer', reducer: acrReducer },
     { name: 'loggingReducer', reducer: loggingReducer },
+    { name: 'umaResourceReducer', reducer: umaResourceReducer },
   ],
   sagas: [
     scopesSaga(),
@@ -143,6 +146,7 @@ const pluginMetadata = {
     jwksSaga(),
     acrSaga(),
     loggingSaga(),
+    umaResourceSaga(),
   ],
 }
 

admin-ui/plugins/auth-server/redux/actions/OIDCActions.js

@@ -9,9 +9,7 @@ import {
   DELETE_CLIENT_RESPONSE,
   SET_CLIENT_ITEM,
   SET_VIEW,
-  SEARCH_CLIENTS,
-  GET_UMA_RESOURCES,
-  GET_UMA_RESOURCES_RESPONSE
+  SEARCH_CLIENTS
 } from './types'
 
 export const getOpenidClients = (action) => ({
@@ -67,13 +65,3 @@ export const viewOnly = (view) => ({
   type: SET_VIEW,
   payload: { view },
 })
-
-export const getUMAResourcesByClient = (inum) => ({
-  type: GET_UMA_RESOURCES,
-  payload: { inum },
-})
-
-export const getUMAResourcesByClientResponse = (data) => ({
-  type: GET_UMA_RESOURCES_RESPONSE,
-  payload: { data },
-})

admin-ui/plugins/auth-server/redux/actions/UMAResourceActions.js

@@ -0,0 +1,14 @@
+import {
+  GET_UMA_RESOURCES,
+  GET_UMA_RESOURCES_RESPONSE
+} from './types'
+
+export const getUMAResourcesByClient = (inum) => ({
+  type: GET_UMA_RESOURCES,
+  payload: { inum },
+})
+
+export const getUMAResourcesByClientResponse = (data) => ({
+  type: GET_UMA_RESOURCES_RESPONSE,
+  payload: { data },
+})

admin-ui/plugins/auth-server/redux/actions/types.js

@@ -37,6 +37,8 @@ export const DELETE_CLIENT = 'DELETE_CLIENT'
 export const DELETE_CLIENT_RESPONSE = 'DELETE_CLIENT_RESPONSE'
 export const SET_CLIENT_ITEM = 'SET_CLIENT_ITEM'
 export const SET_VIEW = 'SET_VIEW'
+
+// UMA Resources
 export const GET_UMA_RESOURCES = 'GET_UMA_RESOURCES'
 export const GET_UMA_RESOURCES_RESPONSE = 'GET_UMA_RESOURCES_RESPONSE'
 

admin-ui/plugins/auth-server/redux/api/OIDCApi.js

@@ -35,14 +35,6 @@ export default class OIDCApi {
     })
   }
 
-  getUMAResources = async (clientId) => {
-    return new Promise((resolve, reject) => {
-      this.api.getOauthUmaResourcesByClientid(clientId, (error, data) => {
-        this.handleResponse(error, reject, resolve, data)
-      })
-    })
-  }
-
   handleResponse(error, reject, resolve, data) {
     if (error) {
       reject(error)

admin-ui/plugins/auth-server/redux/api/UMAResourceApi.js

@@ -0,0 +1,21 @@
+export default class UMAResourceApi {
+  constructor(api) {
+    this.api = api
+  }
+
+  getUMAResources = async (clientId) => {
+    return new Promise((resolve, reject) => {
+      this.api.getOauthUmaResourcesByClientid(clientId, (error, data) => {
+        this.handleResponse(error, reject, resolve, data)
+      })
+    })
+  }
+
+  handleResponse(error, reject, resolve, data) {
+    if (error) {
+      reject(error)
+    } else {
+      resolve(data)
+    }
+  }
+}

admin-ui/plugins/auth-server/redux/audit/Resources.js

@@ -1,3 +1,4 @@
 export const OIDC = 'openid-client'
 export const SCOPE = 'scope'
+export const UMA = 'uma'
 export const JSON_CONFIG = 'json-configuration'

admin-ui/plugins/auth-server/redux/reducers/OIDCReducer.js

@@ -11,8 +11,6 @@ import {
   RESET,
   SEARCH_CLIENTS,
   SET_VIEW,
-  GET_UMA_RESOURCES,
-  GET_UMA_RESOURCES_RESPONSE
 } from '../actions/types'
 import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 
@@ -23,7 +21,6 @@ const INIT_STATE = {
   loading: false,
   saveOperationFlag: false,
   errorInSaveOperationFlag: false,
-  umaResources: {},
 }
 
 const reducerName = 'oidcReducer'
@@ -130,19 +127,6 @@ export default function oidcReducer(state = INIT_STATE, action) {
       } else {
         return handleDefault()
       }
-    case GET_UMA_RESOURCES: 
-      return handleLoading()
-
-    case GET_UMA_RESOURCES_RESPONSE: 
-      if (action.payload.data) {
-        return {
-          ...state,
-          umaResources: action.payload.data,
-          loading: false,
-        }
-      } else {
-        return handleDefault()
-      }
     case RESET:
       return {
         ...state,

admin-ui/plugins/auth-server/redux/reducers/UMAResourceReducer.js

@@ -0,0 +1,57 @@
+import {
+  RESET,
+  GET_UMA_RESOURCES,
+  GET_UMA_RESOURCES_RESPONSE
+} from '../actions/types'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
+
+const INIT_STATE = {
+  items: [],
+  loading: false,
+}
+
+const reducerName = 'UMAResourceReducer'
+
+export default function UMAResourceReducer(state = INIT_STATE, action) {
+  switch (action.type) {
+
+    case GET_UMA_RESOURCES: 
+      return handleLoading()
+
+    case GET_UMA_RESOURCES_RESPONSE: 
+      if (action.payload.data) {
+        return {
+          ...state,
+          items: action.payload.data,
+          loading: false,
+        }
+      } else {
+        return handleDefault()
+      }
+
+    case RESET:
+      return {
+        ...state,
+        items: INIT_STATE.items,
+        loading: INIT_STATE.loading,
+      }
+
+    default:
+      return handleDefault()
+  }
+
+  function handleDefault() {
+    return {
+      ...state,
+      loading: false,
+    }
+  }
+  function handleLoading() {
+    return {
+      ...state,
+      loading: true,
+    }
+  }
+}
+
+reducerRegistry.register(reducerName, UMAResourceReducer)

admin-ui/plugins/auth-server/redux/sagas/OIDCSaga.js

@@ -8,8 +8,7 @@ import {
   getOpenidClientsResponse,
   addClientResponse,
   editClientResponse,
-  deleteClientResponse,
-  getUMAResourcesByClientResponse,
+  deleteClientResponse
 } from '../actions/OIDCActions'
 import { getAPIAccessToken } from '../actions/AuthActions'
 import { OIDC } from '../audit/Resources'
@@ -24,8 +23,7 @@ import {
   ADD_NEW_CLIENT,
   EDIT_CLIENT,
   DELETE_CLIENT,
-  SEARCH_CLIENTS,
-  GET_UMA_RESOURCES
+  SEARCH_CLIENTS
 } from '../actions/types'
 import OIDCApi from '../api/OIDCApi'
 import { getClient } from 'Redux/api/base'
@@ -47,21 +45,6 @@ function* newFunction() {
   return new OIDCApi(api)
 }
 
-function* newUMAFunction() {
-  const wholeToken = yield select((state) => state.authReducer.token)
-  let token = null
-  if (wholeToken) {
-    token = yield select((state) => state.authReducer.token.access_token)
-  } else {
-    token = null
-  }
-  const issuer = yield select((state) => state.authReducer.issuer)
-  const api = new JansConfigApi.OAuthUMAResourcesApi(
-    getClient(JansConfigApi, token, issuer),
-  )
-  return new OIDCApi(api)
-}
-
 export function* getOauthOpenidClients({ payload }) {
   const audit = yield* initAudit()
   try {
@@ -139,28 +122,6 @@ export function* deleteAClient({ payload }) {
   }
 }
 
-export function* getUMAResourcesByClient({ payload }) {
-  const audit = yield* initAudit()
-  try {
-    payload = payload ? payload : {}
-    addAdditionalData(audit, FETCH, GET_UMA_RESOURCES, payload)
-    const openIdApi = yield* newUMAFunction()
-    const data = yield call(
-      openIdApi.getUMAResources,
-      payload.inum,
-    )
-    yield put(getUMAResourcesByClientResponse(data))
-    yield call(postUserAction, audit)
-  } catch (e) {
-    console.log(e)
-    yield put(getUMAResourcesByClientResponse(null))
-    if (isFourZeroOneError(e)) {
-      const jwt = yield select((state) => state.authReducer.userinfo_jwt)
-      yield put(getAPIAccessToken(jwt))
-    }
-  }
-}
-
 export function* getOpenidClientsWatcher() {
   yield takeLatest(GET_OPENID_CLIENTS, getOauthOpenidClients)
 }
@@ -179,9 +140,6 @@ export function* editClientWatcher() {
 export function* deleteClientWatcher() {
   yield takeLatest(DELETE_CLIENT, deleteAClient)
 }
-export function* getUMAResourcesByClientWatcher() {
-  yield takeLatest(GET_UMA_RESOURCES, getUMAResourcesByClient)
-}
 
 export default function* rootSaga() {
   yield all([
@@ -190,6 +148,5 @@ export default function* rootSaga() {
     fork(addClientWatcher),
     fork(editClientWatcher),
     fork(deleteClientWatcher),
-    fork(getUMAResourcesByClientWatcher),
   ])
 }