fix(admin-ui): remove generation of specific access_token #1477

Signed-off-by: Jeet Viramgama <jviramgama5@gmail.com>
GluuFederation · Nov 27, 2023 · b927d1a · b927d1a
1 parent 6b7e231
commit b927d1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 45 deletions.
diff --git a/admin-ui/app/redux/features/attributesSlice.js b/admin-ui/app/redux/features/attributesSlice.js
@@ -6,16 +6,12 @@ const initialState = {
   items: [],
   loading: false,
   initLoading: true,
-  accessToken: null
 }
 
 const attributesSlice = createSlice({
   name: 'attributes',
   initialState,
   reducers: {
-    setAccessToken: (state, action) => {
-      state.accessToken = action.payload
-    },
     getAttributesRoot: (state, action) => {
       state.loading = true
     },
@@ -32,7 +28,7 @@ const attributesSlice = createSlice({
   }
 })
 
-export const { getAttributesRoot, getAttributesResponseRoot, toggleInitAttributeLoader, setAccessToken } =
+export const { getAttributesRoot, getAttributesResponseRoot, toggleInitAttributeLoader } =
   attributesSlice.actions
 
 export default attributesSlice.reducer

diff --git a/admin-ui/app/redux/sagas/AttributesSaga.js b/admin-ui/app/redux/sagas/AttributesSaga.js
@@ -2,7 +2,6 @@ import { call, all, put, fork, takeLatest, select } from 'redux-saga/effects'
 import { isFourZeroOneError, addAdditionalData } from 'Utils/TokenController'
 import {
   getAttributesResponseRoot,
-  setAccessToken,
   toggleInitAttributeLoader
 } from '../features/attributesSlice'
 import { getAPIAccessToken } from 'Redux/features/authSlice'
@@ -14,28 +13,13 @@ import {
 import AttributeApi from '../api/AttributeApi'
 import { getClient } from 'Redux/api/base'
 import { initAudit } from 'Redux/sagas/SagaUtils'
-import { ATTRIBUTES_TAG } from 'Utils/PermChecker'
 
 const PERSON_SCHEMA = 'person schema'
 
 const JansConfigApi = require('jans_config_api')
 
 function* newFunction() {
-  let token
-  token = yield select((state) => state.attributesReducerRoot.accessToken)
-
-  if (!token) {
-    const jwt = yield select((state) => state.authReducer.userinfo_jwt)
-    const apiToken = yield call(fetchApiAccessToken, jwt, [ATTRIBUTES_TAG])
-    if (apiToken.access_token) {
-      token = apiToken.access_token
-      yield put(setAccessToken(apiToken.access_token))
-    } else {
-      token = yield select((state) => state.authReducer.token.access_token)
-    } 
-  }
-
-
+  const token = yield select((state) => state.authReducer.token.access_token)
   const issuer = yield select((state) => state.authReducer.issuer)
   const api = new JansConfigApi.AttributeApi(
     getClient(JansConfigApi, token, issuer),

diff --git a/admin-ui/plugins/auth-server/redux/features/scopeSlice.js b/admin-ui/plugins/auth-server/redux/features/scopeSlice.js
@@ -12,16 +12,12 @@ const initialState = {
   clientScopes: [],
   loadingClientScopes: false,
   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
@@ -156,7 +152,6 @@ export const {
   getClientScopes,
   emptyScopes,
   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
@@ -19,7 +19,7 @@ import {
 import ScopeApi from '../api/ScopeApi'
 import { getClient } from 'Redux/api/base'
 import { isFourZeroOneError, addAdditionalData } from 'Utils/TokenController'
-import { postUserAction, fetchApiAccessToken } from 'Redux/api/backend-api'
+import { postUserAction } from 'Redux/api/backend-api'
 
 const JansConfigApi = require('jans_config_api')
 import { initAudit } from 'Redux/sagas/SagaUtils'
@@ -32,27 +32,14 @@ import {
   addScopeResponse,
   getScopeByCreatorResponse,
   getClientScopesResponse,
-  setAccessToken
 } from '../features/scopeSlice'
-import { SCOPE_TAG } from 'Utils/PermChecker'
 
 function* newFunction() {
-  let token
-  token = yield select((state) => state.scopeReducer.accessToken)
-
-  if (!token) {
-    const jwt = yield select((state) => state.authReducer.userinfo_jwt)
-    const apiToken = yield call(fetchApiAccessToken, jwt, [SCOPE_TAG])
-    if (apiToken.access_token) {
-      token = apiToken.access_token
-      yield put(setAccessToken(apiToken.access_token))
-    } else {
-      token = yield select((state) => state.authReducer.token.access_token)
-    } 
-  }
-
+  const token = yield select((state) => state.authReducer.token.access_token)
   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)
 }