fix(admin-ui): large header issue #1398

Signed-off-by: Jeet Viramgama <jviramgama5@gmail.com>
GluuFederation · Oct 31, 2023 · c6d7eab · c6d7eab
1 parent 15dd362
commit c6d7eab
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 31 deletions.
diff --git a/admin-ui/app/redux/api/backend-api.js b/admin-ui/app/redux/api/backend-api.js
@@ -58,9 +58,9 @@ export const postUserAction = (userAction) => {
 }
 
 // Get API Access Token
-export const fetchApiAccessToken = (jwt) => {
+export const fetchApiAccessToken = (jwt, permissionTag) => {
   return axios
-    .get('/app/admin-ui/oauth2/api-protection-token', { params: { ujwt: jwt } })
+    .post('/app/admin-ui/oauth2/api-protection-token', { ujwt: jwt, permissionTag: permissionTag || [] })
     .then((response) => response.data)
     .catch((error) => {
       console.error(
@@ -73,7 +73,7 @@ export const fetchApiAccessToken = (jwt) => {
 
 export const fetchApiTokenWithDefaultScopes = () => {
   return axios
-    .get('/app/admin-ui/oauth2/api-protection-token')
+    .post('/app/admin-ui/oauth2/api-protection-token', {})
     .then((response) => response.data)
     .catch((error) => {
       console.error(

diff --git a/admin-ui/app/utils/PermChecker.js b/admin-ui/app/utils/PermChecker.js
@@ -104,6 +104,8 @@ export const AGAMA_DELETE = BASE_URL + '/config/agama.delete'
 export const SESSION_READ = BASE_URL + '/jans-auth-server/session.readonly'
 export const SESSION_DELETE = BASE_URL + '/jans-auth-server/session.delete'
 
+export const SCOPE_TAGS = ['scopes']
+
 export const hasPermission = (scopes, scope) => {
   let available = false
   if (scopes) {

diff --git a/admin-ui/plugins/auth-server/redux/features/scopeSlice.js b/admin-ui/plugins/auth-server/redux/features/scopeSlice.js
@@ -11,13 +11,17 @@ const initialState = {
   entriesCount: 0,
   clientScopes: [],
   loadingClientScopes: false,
-  selectedClientScopes: []
+  selectedClientScopes: [],
+  accessToken: null
 }
 
 const scopeSlice = createSlice({
   name: 'scope',
   initialState,
   reducers: {
+    setAccessToken: (state, action) => {
+      state.accessToken = action.payload
+    },
     scopeHandleLoading: (state) => {
       state.loading = true
       state.saveOperationFlag = false
@@ -115,7 +119,6 @@ const scopeSlice = createSlice({
       state.errorInSaveOperationFlag = false
     },
     getScopeByCreator: () => {},
-    getScopeByPattern: () => {},
     getScopeByInum: (state) => {
       state.loading = true
       state.saveOperationFlag = false
@@ -152,7 +155,8 @@ export const {
   getScopeByInum,
   getClientScopes,
   emptyScopes,
-  setClientSelectedScopes
+  setClientSelectedScopes,
+  setAccessToken
 } = scopeSlice.actions
 export { initialState }
 export const { actions, reducer, state } = scopeSlice

diff --git a/admin-ui/plugins/auth-server/redux/sagas/OAuthScopeSaga.js b/admin-ui/plugins/auth-server/redux/sagas/OAuthScopeSaga.js
@@ -33,13 +33,29 @@ import {
   getScopeByCreatorResponse,
   getClientScopesResponse,
 } from '../features/scopeSlice'
+import { SCOPE_TAGS } from 'Utils/PermChecker'
+import { fetchApiAccessToken } from 'Redux/api/backend-api'
+import { setAccessToken } from '../features/scopeSlice'
 
 function* newFunction() {
-  const token = yield select((state) => state.authReducer.token.access_token)
+  let token
+  const scopesToken = yield select((state) => state.scopeReducer.accessToken)
+
+  if (!scopesToken) {
+    const jwt = yield select((state) => state.authReducer.userinfo_jwt)
+    const scopeApiToken = yield call(fetchApiAccessToken, jwt, SCOPE_TAGS)
+    if (scopeApiToken.access_token) {
+      token = scopeApiToken.access_token
+      yield put(setAccessToken(scopeApiToken.access_token))
+    } else {
+      token = yield select((state) => state.authReducer.token.access_token)
+    } 
+  } else {
+    token = scopesToken;
+  }
+
   const issuer = yield select((state) => state.authReducer.issuer)
-  const api = new JansConfigApi.OAuthScopesApi(
-    getClient(JansConfigApi, token, issuer)
-  )
+  const api = new JansConfigApi.OAuthScopesApi(getClient(JansConfigApi, token, issuer))
   return new ScopeApi(api)
 }
 
@@ -113,23 +129,6 @@ export function* getClientScopes({ payload }) {
   }
 }
 
-export function* getScopeBasedOnOpts({ payload }) {
-  const audit = yield* initAudit()
-  try {
-    addAdditionalData(audit, FETCH, SCOPE, payload)
-    const scopeApi = yield* newFunction()
-    const data = yield call(scopeApi.getScopeByOpts, payload.action.action_data)
-    yield put(getScopeByPatternResponse({ data }))
-    yield call(postUserAction, audit)
-  } catch (e) {
-    yield put(getScopeByPatternResponse(null))
-    if (isFourZeroOneError(e)) {
-      const jwt = yield select((state) => state.authReducer.userinfo_jwt)
-      yield put(getAPIAccessToken(jwt))
-    }
-  }
-}
-
 export function* addAScope({ payload }) {
   const audit = yield* initAudit()
   try {
@@ -209,9 +208,6 @@ export function* watchGetClientScopes() {
 export function* watchSearchScopes() {
   yield takeLatest('scope/searchScopes', getScopes)
 }
-export function* watchGetScopeByOpts() {
-  yield takeLatest('scope/getScopeByPattern', getScopeBasedOnOpts)
-}
 export function* watchAddScope() {
   yield takeLatest('scope/addScope', addAScope)
 }
@@ -227,7 +223,6 @@ export default function* rootSaga() {
     fork(watchGetScopeByInum),
     fork(watchGetScopes),
     fork(watchSearchScopes),
-    fork(watchGetScopeByOpts),
     fork(watchAddScope),
     fork(watchEditScope),
     fork(watchDeleteScope),