feat(admin-ui): show trial license screen when no valid license key f…

…ound
GluuFederation · Aug 17, 2023 · 2871a53 · 2871a53
1 parent 64386ae
commit 2871a53
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/admin-ui/app/redux/features/licenseSlice.js b/admin-ui/app/redux/features/licenseSlice.js
@@ -77,6 +77,9 @@ const licenseSlice = createSlice({
     },
     setValidatingFlow: (state, action) => {
       state.isValidatingFlow = action.payload.isValidatingFlow
+    },
+    setLicenseError: (state, action) => {
+      state.error = action.payload
     }
   },
 })
@@ -96,7 +99,8 @@ export const {
   retrieveLicenseKey,
   retrieveLicenseKeyResponse,
   checkThresholdLimit,
-  setValidatingFlow
+  setValidatingFlow,
+  setLicenseError
 } = licenseSlice.actions
 
 export default licenseSlice.reducer

diff --git a/admin-ui/app/redux/sagas/LicenseSaga.js b/admin-ui/app/redux/sagas/LicenseSaga.js
@@ -13,7 +13,8 @@ import {
   retrieveLicenseKeyResponse,
   checkThresholdLimit,
   setValidatingFlow,
-  setApiDefaultToken
+  setApiDefaultToken,
+  setLicenseError
 } from '../actions'
 import LicenseApi from 'Redux/api/LicenseApi'
 import { getClientWithToken, getClient } from 'Redux/api/base'
@@ -71,11 +72,11 @@ function* retrieveLicenseKey() {
     const licenseApi = yield* getApiTokenWithDefaultScopes()
     const response = yield call(licenseApi.retrieveLicense)
 
-    if (response?.['license_key']) {
+    if (response?.responseObject?.['licenseKey']) {
       try {
         const activateLicense = yield call(licenseApi.submitLicenseKey, {
           payload: {
-            licenseKey: response['license_key']
+            licenseKey: response.responseObject['licenseKey']
           }
         })
 
@@ -96,6 +97,8 @@ function* retrieveLicenseKey() {
   } catch (error) {
     console.log('Error in generating key.', error)
     yield put(retrieveLicenseKeyResponse({ isNoValidLicenseKeyFound: true }))
+    yield put(checkLicensePresentResponse({ isLicenseValid: false }))
+    yield put(generateTrialLicenseResponse(null))
   }
 }
 
@@ -153,6 +156,9 @@ function* generateTrailLicenseKey() {
     }
   } catch (error) {
     console.log('Error in generating key.', error)
+    yield put(checkLicensePresentResponse({ isLicenseValid: false }))
+    yield put(generateTrialLicenseResponse(null))
+    yield put(setLicenseError(error.message))
   }
 }
 

diff --git a/admin-ui/app/utils/ApiKeyRedirect.js b/admin-ui/app/utils/ApiKeyRedirect.js
@@ -23,9 +23,9 @@ function ApiKeyRedirect({
       <Container>
         {isConfigValid == false ? (
           <UploadSSA />
-        ) : !isTimeout && !isNoValidLicenseKeyFound && isUnderThresholdLimit && (
+        ) : !isTimeout && isUnderThresholdLimit && (
           <>
-            {!isLicenseValid && islicenseCheckResultLoaded && isConfigValid && !isValidatingFlow && !isNoValidLicenseKeyFound ? (
+            {!isLicenseValid && islicenseCheckResultLoaded && isConfigValid && !isValidatingFlow && isNoValidLicenseKeyFound ? (
               <ApiKey />
             ) : (
               <div
@@ -71,14 +71,6 @@ function ApiKeyRedirect({
           />
         )}
 
-        {(isLicenseActivationResultLoaded && !isLicenseValid) || isNoValidLicenseKeyFound && (
-          <GluuErrorModal
-            message={t('Invalid License')}
-            description={
-              'License has been not enabled for this application. Please contact support and confirm if license-key is correct.'
-            }
-          />
-        )}
       </Container>
     </React.Fragment>
   )