Skip to content

Commit 100a706

Browse files
syntrydysyntrydy
committed
fix(admin-ui): resolve all bugs displayed for admin-ui #308 
1 parent 18ac6f8 commit 100a706

File tree

16 files changed

+179
-308
lines changed

16 files changed

+179
-308
lines changed

‎app/redux/api/FidoApi.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ export default class FidoApi {
66
getFidoConfig = () => {
77
return new Promise((resolve, reject) => {
88
this.api.getPropertiesFido2((error, data) => {
9-
if (error) {
10-
reject(error)
11-
} else {
12-
resolve(data)
13-
}
9+
this.handleResponse(error, reject, resolve, data)
1410
})
1511
})
1612
}
@@ -19,11 +15,7 @@ export default class FidoApi {
1915
updateFidoConfig = (input) => {
2016
return new Promise((resolve, reject) => {
2117
this.api.putPropertiesFido2(input, (error, data) => {
22-
if (error) {
23-
reject(error)
24-
} else {
25-
resolve(data)
26-
}
18+
this.handleResponse(error, reject, resolve, data)
2719
})
2820
})
2921
}

‎app/redux/api/InitApi.js

+12-20
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,40 @@ export default class InitApi {
66
getScopes = (options) => {
77
return new Promise((resolve, reject) => {
88
this.api.getOauthScopes(options, (error, data) => {
9-
if (error) {
10-
reject(error)
11-
} else {
12-
resolve(data)
13-
}
9+
this.handleResponse(error, reject, resolve, data)
1410
})
1511
})
1612
}
1713

1814
getScripts = () => {
1915
return new Promise((resolve, reject) => {
2016
this.api.getConfigScripts((error, data) => {
21-
if (error) {
22-
reject(error)
23-
} else {
24-
resolve(data)
25-
}
17+
this.handleResponse(error, reject, resolve, data)
2618
})
2719
})
2820
}
2921

3022
getAttributes = (options) => {
3123
return new Promise((resolve, reject) => {
3224
this.api.getAttributes(options, (error, data) => {
33-
if (error) {
34-
reject(error)
35-
} else {
36-
resolve(data)
37-
}
25+
this.handleResponse(error, reject, resolve, data)
3826
})
3927
})
4028
}
4129

4230
getClients = (options) => {
4331
return new Promise((resolve, reject) => {
4432
this.api.getOauthOpenidClients(options, (error, data) => {
45-
if (error) {
46-
reject(error)
47-
} else {
48-
resolve(data)
49-
}
33+
this.handleResponse(error, reject, resolve, data)
5034
})
5135
})
5236
}
37+
38+
handleResponse(error, reject, resolve, data) {
39+
if (error) {
40+
reject(error)
41+
} else {
42+
resolve(data)
43+
}
44+
}
5345
}

‎app/redux/api/backend-api.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ export const postUserAction = async (userAction) => {
4747
return axios
4848
.post('/logging/audit', {
4949
headers: {
50-
'Content-Type': 'application/json',
51-
}, userAction})
50+
'Content-Type': 'application/json',
51+
},
52+
userAction,
53+
})
5254
.then((response) => response)
5355
.catch((e) => {
5456
return -1
@@ -82,15 +84,16 @@ export const checkLicensePresent = async () => {
8284

8385
// Activate license using key
8486
export const activateLicense = async (licenseKey) => {
85-
let data = {licenseKey: licenseKey}
87+
let data = { licenseKey: licenseKey }
8688
return axios
8789
.post('/license/activateLicense', data, {
8890
headers: {
89-
'Content-Type': 'application/json',
90-
}})
91+
'Content-Type': 'application/json',
92+
},
93+
})
9194
.then((response) => response.data)
9295
.catch((e) => {
9396
console.error('Error in activating license of admin-ui', e)
9497
return false
9598
})
96-
}
99+
}

‎app/routes/Apps/Gluu/GluuErrorFallBack.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22

3-
function GluuErrorFallBack({ error}) {
3+
function GluuErrorFallBack({ error }) {
44
return (
55
<div role="alert">
66
<pre>{error.message}</pre>

‎app/routes/components/LogoThemed/LogoThemed.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const logos = {
1010
};
1111

1212
const getLogoUrl = () => {
13-
//return logos[color];
1413
return logos['default'];
1514
};
1615

‎plugins/auth-server/redux/api/AcrApi.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ export default class AcrApi {
77
getAcrsConfig = () => {
88
return new Promise((resolve, reject) => {
99
this.api.getAcrs((error, data) => {
10-
if (error) {
11-
reject(error)
12-
} else {
13-
resolve(data)
14-
}
10+
this.handleResponse(error, reject, resolve, data)
1511
})
1612
})
1713
}
@@ -20,12 +16,16 @@ export default class AcrApi {
2016
updateAcrsConfig = (input) => {
2117
return new Promise((resolve, reject) => {
2218
this.api.putAcrs(input, (error, data) => {
23-
if (error) {
24-
reject(error)
25-
} else {
26-
resolve(data)
27-
}
19+
this.handleResponse(error, reject, resolve, data)
2820
})
2921
})
3022
}
23+
24+
handleResponse(error, reject, resolve, data) {
25+
if (error) {
26+
reject(error)
27+
} else {
28+
resolve(data)
29+
}
30+
}
3131
}

‎plugins/auth-server/redux/api/JsonConfigApi.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ export default class JsonConfigApi {
77
fetchJsonConfig = () => {
88
return new Promise((resolve, reject) => {
99
this.api.getProperties((error, data) => {
10-
if (error) {
11-
reject(error)
12-
} else {
13-
resolve(data)
14-
}
10+
this.handleResponse(error, reject, resolve, data)
1511
})
1612
})
1713
}
1814
// patch json Config
1915
patchJsonConfig = (options) => {
2016
return new Promise((resolve, reject) => {
2117
this.api.patchProperties(options, (error, data) => {
22-
if (error) {
23-
reject(error)
24-
} else {
25-
resolve(data)
26-
}
18+
this.handleResponse(error, reject, resolve, data)
2719
})
2820
})
2921
}
22+
23+
handleResponse(error, reject, resolve, data) {
24+
if (error) {
25+
reject(error)
26+
} else {
27+
resolve(data)
28+
}
29+
}
3030
}

‎plugins/auth-server/redux/api/LoggingApi.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ export default class LoggingApi {
77
getLoggingConfig = () => {
88
return new Promise((resolve, reject) => {
99
this.api.getConfigLogging((error, data) => {
10-
if (error) {
11-
reject(error)
12-
} else {
13-
resolve(data)
14-
}
10+
this.handleResponse(error, reject, resolve, data)
1511
})
1612
})
1713
}
@@ -20,12 +16,16 @@ export default class LoggingApi {
2016
editLoggingConfig = (input) => {
2117
return new Promise((resolve, reject) => {
2218
this.api.putConfigLogging(input, (error, data) => {
23-
if (error) {
24-
reject(error)
25-
} else {
26-
resolve(data)
27-
}
19+
this.handleResponse(error, reject, resolve, data)
2820
})
2921
})
3022
}
23+
24+
handleResponse(error, reject, resolve, data) {
25+
if (error) {
26+
reject(error)
27+
} else {
28+
resolve(data)
29+
}
30+
}
3131
}

‎plugins/auth-server/redux/api/OIDCApi.js

+11-15
Original file line numberDiff line numberDiff line change
@@ -83,36 +83,32 @@ export default class OIDCApi {
8383
return new Promise((resolve, reject) => {
8484
// data['client'] = client
8585
this.api.postOauthOpenidClients(data, (error, res) => {
86-
if (error) {
87-
reject(error)
88-
} else {
89-
resolve(res)
90-
}
86+
this.handleResponse(error, reject, resolve, data)
9187
})
9288
})
9389
}
9490

9591
editAClient = (data) => {
9692
return new Promise((resolve, reject) => {
9793
this.api.putOauthOpenidClients(data, (error, res) => {
98-
if (error) {
99-
reject(error)
100-
} else {
101-
resolve(res)
102-
}
94+
this.handleResponse(error, reject, resolve, data)
10395
})
10496
})
10597
}
10698

10799
deleteAClient = async (inum) => {
108100
return new Promise((resolve, reject) => {
109101
this.api.deleteOauthOpenidClientsByInum(inum, (error, data) => {
110-
if (error) {
111-
reject(error)
112-
} else {
113-
resolve(data)
114-
}
102+
this.handleResponse(error, reject, resolve, data)
115103
})
116104
})
117105
}
106+
107+
handleResponse(error, reject, resolve, data) {
108+
if (error) {
109+
reject(error)
110+
} else {
111+
resolve(data)
112+
}
113+
}
118114
}

‎plugins/auth-server/redux/api/ScopeApi.js

+15-35
Original file line numberDiff line numberDiff line change
@@ -6,83 +6,63 @@ export default class ScopeApi {
66
getAllScopes = (options) => {
77
return new Promise((resolve, reject) => {
88
this.api.getOauthScopes(options, (error, data) => {
9-
if (error) {
10-
reject(error)
11-
} else {
12-
resolve(data)
13-
}
9+
this.handleResponse(error, reject, resolve, data)
1410
})
1511
})
1612
}
1713

1814
getScope = async (inum) => {
1915
return new Promise((resolve, reject) => {
2016
this.api.getOauthScopesByInum(inum, (error, data) => {
21-
if (error) {
22-
reject(error)
23-
} else {
24-
resolve(data)
25-
}
17+
this.handleResponse(error, reject, resolve, data)
2618
})
2719
})
2820
}
2921

3022
getScope = async (id) => {
3123
return new Promise((resolve, reject) => {
3224
this.api.patchOauthScopesById(id, (error, data) => {
33-
if (error) {
34-
reject(error)
35-
} else {
36-
resolve(data)
37-
}
25+
this.handleResponse(error, reject, resolve, data)
3826
})
3927
})
4028
}
4129

4230
getScopeByOpts = (opts) => {
4331
return new Promise((resolve, reject) => {
4432
this.api.getOauthScopes(opts, (error, data, response) => {
45-
if (error) {
46-
reject(error)
47-
} else {
48-
resolve(data)
49-
}
33+
this.handleResponse(error, reject, resolve, data)
5034
})
5135
})
5236
}
5337
addNewScope = (input) => {
5438
return new Promise((resolve, reject) => {
5539
this.api.postOauthScopes(input, (error, data) => {
56-
if (error) {
57-
reject(error)
58-
} else {
59-
resolve(data)
60-
}
40+
this.handleResponse(error, reject, resolve, data)
6141
})
6242
})
6343
}
6444

6545
editAScope = (input) => {
6646
return new Promise((resolve, reject) => {
6747
this.api.putOauthScopes(input, (error, data) => {
68-
if (error) {
69-
reject(error)
70-
} else {
71-
resolve(data)
72-
}
48+
this.handleResponse(error, reject, resolve, data)
7349
})
7450
})
7551
}
7652

7753
deleteAScope = async (inum) => {
7854
return new Promise((resolve, reject) => {
7955
this.api.deleteOauthScopesByInum(inum, (error, data) => {
80-
if (error) {
81-
reject(error)
82-
} else {
83-
resolve(data)
84-
}
56+
this.handleResponse(error, reject, resolve, data)
8557
})
8658
})
8759
}
60+
61+
handleResponse(error, reject, resolve, data) {
62+
if (error) {
63+
reject(error)
64+
} else {
65+
resolve(data)
66+
}
67+
}
8868
}

0 commit comments

Comments
 (0)