Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
69ae0e0
fix(admin-ui): unable to add Custom and Module properties in Scripts …
faisalsiddique4400 Oct 30, 2025
38a4851
code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
a7c8332
code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
5a84bf4
code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
4809e95
pagination count issues fixed
faisalsiddique4400 Oct 30, 2025
eae25f9
fix(admin-ui): unable to map permission to a role using GUI (#2400)
faisalsiddique4400 Oct 30, 2025
94b105b
fix(admin-ui): adding uniformity in cancel and back buttons present …
faisalsiddique4400 Oct 30, 2025
4317ea8
Merge branch 'main' of github-faisal:GluuFederation/flex into admin-u…
faisalsiddique4400 Oct 30, 2025
b9fd682
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
9bc53ff
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
847a607
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
793a56a
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
7181998
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
241e9c6
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
5dc0919
Code rabbit suggestions
faisalsiddique4400 Oct 30, 2025
68f742d
buttons swapping
faisalsiddique4400 Oct 31, 2025
ea5aa6b
Code Rabbit fixes
faisalsiddique4400 Oct 31, 2025
0cd0df3
Code Rabbit fixes
faisalsiddique4400 Oct 31, 2025
7af2074
Code Rabbit fixes
faisalsiddique4400 Oct 31, 2025
4e86e97
Code Rabbit fixes
faisalsiddique4400 Oct 31, 2025
1bff777
Code Rabbit fixes
faisalsiddique4400 Oct 31, 2025
a288f10
Code Rabbit fixes
faisalsiddique4400 Oct 31, 2025
cb7b80e
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Oct 31, 2025
4c5e6d3
Merge branch 'main' into admin-ui-issue-2361-scim
faisalsiddique4400 Oct 31, 2025
89271ec
Saperating footer components
faisalsiddique4400 Nov 3, 2025
75b0358
Code rabbit changes
faisalsiddique4400 Nov 3, 2025
c90eec1
Code rabbit changes
faisalsiddique4400 Nov 3, 2025
b2b52b0
Code rabbit changes
faisalsiddique4400 Nov 3, 2025
8aba204
Code rabbit changes
faisalsiddique4400 Nov 3, 2025
f5fc2be
file notations fixes
faisalsiddique4400 Nov 3, 2025
00b2d45
file notations fixes
faisalsiddique4400 Nov 3, 2025
b9dad66
Rename Gluuformfooter.tsx to GluuFormFooter.tsx
faisalsiddique4400 Nov 3, 2025
d14e1b6
code rabbit fixes
faisalsiddique4400 Nov 3, 2025
1376956
code rabbit fixes
faisalsiddique4400 Nov 3, 2025
a838993
code rabbit fixes
faisalsiddique4400 Nov 3, 2025
820046c
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 3, 2025
885a512
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 3, 2025
3c45274
code rabbit changes
faisalsiddique4400 Nov 3, 2025
477a8f9
code rabbit changes
faisalsiddique4400 Nov 3, 2025
c9bfbd9
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 3, 2025
d8957fd
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 3, 2025
f832c3e
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 3, 2025
7222454
commit text not getting rollover issue
faisalsiddique4400 Nov 3, 2025
3a48972
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 3, 2025
254c9fe
feat(admin): adding uniformity in cancel and back buttons present in …
faisalsiddique4400 Nov 4, 2025
0ab196c
Merge branch 'admin-ui-issue-2361-fido' into admin-ui-issue-2361-scripts
faisalsiddique4400 Nov 4, 2025
a85d632
Code rabbit changes
faisalsiddique4400 Nov 4, 2025
78bccda
Code rabbit changes
faisalsiddique4400 Nov 4, 2025
d69d7ef
Code rabbit changes
faisalsiddique4400 Nov 4, 2025
4dbdc82
Code rabbit changes
faisalsiddique4400 Nov 4, 2025
acb2273
Merge branch 'main' into admin-ui-issue-2361-scim
faisalsiddique4400 Nov 5, 2025
c131426
Code rabbit changes
faisalsiddique4400 Nov 5, 2025
b99c7d7
Merge branch 'admin-ui-issue-2361-scim' into admin-ui-issue-2361-fido
faisalsiddique4400 Nov 5, 2025
093b231
Merge branch 'admin-ui-issue-2361-fido' into admin-ui-issue-2361-scripts
faisalsiddique4400 Nov 5, 2025
2ea443e
Code rabbit changes
faisalsiddique4400 Nov 5, 2025
e993a85
Code rabbit changes
faisalsiddique4400 Nov 5, 2025
b17c0a3
Merge branch 'admin-ui-issue-2361-fido' into admin-ui-issue-2361-scripts
faisalsiddique4400 Nov 5, 2025
4b25dea
Comments on the PR resolved
faisalsiddique4400 Nov 6, 2025
48718a7
Merge branch 'main' into admin-ui-issue-2361-scripts
faisalsiddique4400 Nov 7, 2025
1acac87
Comments on the PR resolved
faisalsiddique4400 Nov 7, 2025
35fccb2
Merge conflicts resolved
faisalsiddique4400 Nov 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 104 additions & 31 deletions admin-ui/app/utils/TokenController.ts
Original file line number Diff line number Diff line change
@@ -1,60 +1,133 @@
// @ts-nocheck
import { BasicQueryStringUtils } from '@openid/appauth'

export const isFourZeroOneError = (error) => {
return error.status === 401 ? true : false
type GenericRecord = Record<string, unknown>

type AdditionalActionData = GenericRecord & {
modifiedFields?: unknown
performedOn?: unknown
}

export const hasApiToken = () => {
if (localStorage.getItem('gluu.api.token')) {
return true
type AdditionalPayload = GenericRecord & {
action?: {
action_message?: string
action_data?: AdditionalActionData
}
return false
action_message?: string
message?: string
modifiedFields?: unknown
performedOn?: unknown
tableData?: unknown
omitPayload?: boolean
}

export const isFourZeroOneError = (error?: { status?: number } | null): boolean => {
return error?.status === 401
}

export const saveState = (state) => {
export const hasApiToken = (): boolean => {
return Boolean(localStorage.getItem('gluu.api.token'))
}

export const saveState = (state?: string | null): void => {
if (state) {
localStorage.setItem('gluu.flow.state', state)
}
}

export const saveIssuer = (issuer) => {
export const saveIssuer = (issuer: string): void => {
localStorage.setItem('issuer', issuer)
}

export const getIssuer = () => {
export const getIssuer = (): string | null => {
return localStorage.getItem('issuer')
}

export const isValidState = (newState) => {
return localStorage.getItem('gluu.flow.state') === newState ? true : false
export const isValidState = (newState?: string | null): boolean => {
return localStorage.getItem('gluu.flow.state') === newState
}

export const addAdditionalData = (audit, action, resource, payload) => {
audit['action'] = action
audit['resource'] = resource
audit['message'] = payload?.action?.action_message || payload.action_message || payload.message
if (payload.action?.action_data?.modifiedFields || payload?.modifiedFields) {
audit['modifiedFields'] = payload.action
? payload.action?.action_data?.modifiedFields
: payload?.modifiedFields
export const addAdditionalData = (
audit: GenericRecord,
action: string,
resource: string,
payload: AdditionalPayload = {},
): void => {
const sanitizedPayload: AdditionalPayload = { ...payload }

if (payload.action) {
sanitizedPayload.action = { ...payload.action }
if (payload.action.action_data) {
sanitizedPayload.action.action_data = { ...payload.action.action_data }
}
}

const shouldOmitPayload = Boolean(sanitizedPayload.omitPayload)
if ('omitPayload' in sanitizedPayload) {
delete sanitizedPayload.omitPayload
}

audit.action = action
audit.resource = resource

const message =
sanitizedPayload.action?.action_message ??
sanitizedPayload.action_message ??
sanitizedPayload.message
if (message !== undefined) {
audit.message = message
}

const actionData = sanitizedPayload.action?.action_data

if (actionData?.modifiedFields !== undefined || sanitizedPayload.modifiedFields !== undefined) {
audit.modifiedFields =
actionData?.modifiedFields !== undefined
? actionData.modifiedFields
: sanitizedPayload.modifiedFields
}
if (payload.action?.action_data?.performedOn || payload?.performedOn) {
audit['performedOn'] = payload.action
? payload.action?.action_data?.performedOn
: payload?.performedOn

if (actionData?.performedOn !== undefined || sanitizedPayload.performedOn !== undefined) {
audit.performedOn =
actionData?.performedOn !== undefined ? actionData.performedOn : sanitizedPayload.performedOn
}

if (actionData) {
if ('modifiedFields' in actionData) {
delete actionData.modifiedFields
}
if ('performedOn' in actionData) {
delete actionData.performedOn
}
}

if ('modifiedFields' in sanitizedPayload) {
delete sanitizedPayload.modifiedFields
}

if ('performedOn' in sanitizedPayload) {
delete sanitizedPayload.performedOn
}

if ('action_message' in sanitizedPayload) {
delete sanitizedPayload.action_message
}

if ('tableData' in sanitizedPayload) {
delete sanitizedPayload.tableData
}

if (!shouldOmitPayload) {
audit.payload = sanitizedPayload.action ? sanitizedPayload.action.action_data : sanitizedPayload
}
delete payload.action?.action_data?.modifiedFields
delete payload?.modifiedFields
delete payload.action_message
delete payload.tableData

audit['payload'] = payload.action ? payload.action.action_data : payload || {}
audit['date'] = new Date()
audit.date = new Date()
}

export class NoHashQueryStringUtils extends BasicQueryStringUtils {
parse(input, useHash) {
parse(
input: Parameters<BasicQueryStringUtils['parse']>[0],
_useHash?: Parameters<BasicQueryStringUtils['parse']>[1],
): ReturnType<BasicQueryStringUtils['parse']> {
return super.parse(input, false)
}
}
Loading
Loading