Skip to content

Commit 0467d4b

Browse files
bernardodemarcobernardodemarco
committed
add procedures calls
1 parent a1f2a73 commit 0467d4b

File tree

2 files changed

+11
-151
lines changed

2 files changed

+11
-151
lines changed

‎engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_update_api_permission.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ BEGIN
4747

4848
INSERT INTO `cloud`.`role_permissions`
4949
(uuid, role_id, rule, permission, sort_order)
50-
VALUES (uuid(), role_id, rule, permission, max_sort_order - 1);
50+
VALUES (uuid(), role_id, rule, permission, max_sort_order);
5151
END IF;
5252
END;

‎engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql‎

Lines changed: 10 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -34,162 +34,22 @@ AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.r
3434

3535
-- Grant access to 2FA APIs for the "Read-Only User - Default" role
3636

37-
UPDATE `cloud`.`role_permissions` `rp`
38-
SET `rp`.`sort_order` = `rp`.`sort_order` + 3
39-
WHERE `rp`.`rule` = '*'
40-
AND `rp`.`permission` = 'DENY'
41-
AND `rp`.`role_id` IN (
42-
SELECT `r`.`id`
43-
FROM `cloud`.`roles` `r`
44-
WHERE `r`.`name` = 'Read-Only User - Default'
45-
AND `r`.`is_default` = 1
46-
);
47-
48-
INSERT INTO `cloud`.`role_permissions`
49-
(uuid, role_id, rule, permission, sort_order)
50-
SELECT uuid(), role_id, 'setupUserTwoFactorAuthentication','ALLOW',MAX(sort_order) - 3
51-
FROM `cloud`.`role_permissions`
52-
WHERE role_id = (
53-
SELECT `r`.`id`
54-
FROM `cloud`.`roles` `r`
55-
WHERE `r`.`name` = 'Read-Only User - Default'
56-
AND `r`.`is_default` = 1
57-
);
58-
59-
INSERT INTO `cloud`.`role_permissions`
60-
(uuid, role_id, rule, permission, sort_order)
61-
SELECT uuid(), role_id, 'validateUserTwoFactorAuthenticationCode','ALLOW',MAX(sort_order) - 2
62-
FROM `cloud`.`role_permissions`
63-
WHERE role_id = (
64-
SELECT `r`.`id`
65-
FROM `cloud`.`roles` `r`
66-
WHERE `r`.`name` = 'Read-Only User - Default'
67-
AND `r`.`is_default` = 1
68-
);
69-
70-
INSERT INTO `cloud`.`role_permissions`
71-
(uuid, role_id, rule, permission, sort_order)
72-
SELECT uuid(), role_id, 'listUserTwoFactorAuthenticatorProviders','ALLOW',MAX(sort_order) - 1
73-
FROM `cloud`.`role_permissions`
74-
WHERE role_id = (
75-
SELECT `r`.`id`
76-
FROM `cloud`.`roles` `r`
77-
WHERE `r`.`name` = 'Read-Only User - Default'
78-
AND `r`.`is_default` = 1
79-
);
37+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only User - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
38+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only User - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');
39+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only User - Default', 'listUserTwoFactorAuthenticatorProviders', 'ALLOW');
8040

8141
-- Grant access to 2FA APIs for the "Support User - Default" role
8242

83-
UPDATE `cloud`.`role_permissions` `rp`
84-
SET `rp`.`sort_order` = `rp`.`sort_order` + 3
85-
WHERE `rp`.`rule` = '*'
86-
AND `rp`.`permission` = 'DENY'
87-
AND `rp`.`role_id` IN (
88-
SELECT `r`.`id`
89-
FROM `cloud`.`roles` `r`
90-
WHERE `r`.`name` = 'Support User - Default'
91-
AND `r`.`is_default` = 1
92-
);
93-
94-
INSERT INTO `cloud`.`role_permissions`
95-
(uuid, role_id, rule, permission, sort_order)
96-
SELECT uuid(), role_id, 'setupUserTwoFactorAuthentication','ALLOW',MAX(sort_order) - 3
97-
FROM `cloud`.`role_permissions`
98-
WHERE role_id = (
99-
SELECT `r`.`id`
100-
FROM `cloud`.`roles` `r`
101-
WHERE `r`.`name` = 'Support User - Default'
102-
AND `r`.`is_default` = 1
103-
);
104-
105-
INSERT INTO `cloud`.`role_permissions`
106-
(uuid, role_id, rule, permission, sort_order)
107-
SELECT uuid(), role_id, 'validateUserTwoFactorAuthenticationCode','ALLOW',MAX(sort_order) - 2
108-
FROM `cloud`.`role_permissions`
109-
WHERE role_id = (
110-
SELECT `r`.`id`
111-
FROM `cloud`.`roles` `r`
112-
WHERE `r`.`name` = 'Support User - Default'
113-
AND `r`.`is_default` = 1
114-
);
115-
116-
INSERT INTO `cloud`.`role_permissions`
117-
(uuid, role_id, rule, permission, sort_order)
118-
SELECT uuid(), role_id, 'listUserTwoFactorAuthenticatorProviders','ALLOW',MAX(sort_order) - 1
119-
FROM `cloud`.`role_permissions`
120-
WHERE role_id = (
121-
SELECT `r`.`id`
122-
FROM `cloud`.`roles` `r`
123-
WHERE `r`.`name` = 'Support User - Default'
124-
AND `r`.`is_default` = 1
125-
);
43+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support User - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
44+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support User - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');
45+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support User - Default', 'listUserTwoFactorAuthenticatorProviders', 'ALLOW');
12646

12747
-- Grant access to 2FA APIs for the "Read-Only Admin - Default" role
12848

129-
UPDATE `cloud`.`role_permissions` `rp`
130-
SET `rp`.`sort_order` = `rp`.`sort_order` + 2
131-
WHERE `rp`.`rule` = '*'
132-
AND `rp`.`permission` = 'DENY'
133-
AND `rp`.`role_id` IN (
134-
SELECT `r`.`id`
135-
FROM `cloud`.`roles` `r`
136-
WHERE `r`.`name` = 'Read-Only Admin - Default'
137-
AND `r`.`is_default` = 1
138-
);
139-
140-
INSERT INTO `cloud`.`role_permissions`
141-
(uuid, role_id, rule, permission, sort_order)
142-
SELECT uuid(), role_id, 'setupUserTwoFactorAuthentication','ALLOW',MAX(sort_order) - 2
143-
FROM `cloud`.`role_permissions`
144-
WHERE role_id = (
145-
SELECT `r`.`id`
146-
FROM `cloud`.`roles` `r`
147-
WHERE `r`.`name` = 'Read-Only Admin - Default'
148-
AND `r`.`is_default` = 1
149-
);
150-
151-
INSERT INTO `cloud`.`role_permissions`
152-
(uuid, role_id, rule, permission, sort_order)
153-
SELECT uuid(), role_id, 'validateUserTwoFactorAuthenticationCode','ALLOW',MAX(sort_order) - 1
154-
FROM `cloud`.`role_permissions`
155-
WHERE role_id = (
156-
SELECT `r`.`id`
157-
FROM `cloud`.`roles` `r`
158-
WHERE `r`.`name` = 'Read-Only Admin - Default'
159-
AND `r`.`is_default` = 1
160-
);
49+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only Admin - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
50+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only Admin - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');
16151

16252
-- Grant access to 2FA APIs for the "Support Admin - Default" role
16353

164-
UPDATE `cloud`.`role_permissions` `rp`
165-
SET `rp`.`sort_order` = `rp`.`sort_order` + 2
166-
WHERE `rp`.`rule` = '*'
167-
AND `rp`.`permission` = 'DENY'
168-
AND `rp`.`role_id` IN (
169-
SELECT `r`.`id`
170-
FROM `cloud`.`roles` `r`
171-
WHERE `r`.`name` = 'Support Admin - Default'
172-
AND `r`.`is_default` = 1
173-
);
174-
175-
INSERT INTO `cloud`.`role_permissions`
176-
(uuid, role_id, rule, permission, sort_order)
177-
SELECT uuid(), role_id, 'setupUserTwoFactorAuthentication','ALLOW',MAX(sort_order) - 2
178-
FROM `cloud`.`role_permissions`
179-
WHERE role_id = (
180-
SELECT `r`.`id`
181-
FROM `cloud`.`roles` `r`
182-
WHERE `r`.`name` = 'Support Admin - Default'
183-
AND `r`.`is_default` = 1
184-
);
185-
186-
INSERT INTO `cloud`.`role_permissions`
187-
(uuid, role_id, rule, permission, sort_order)
188-
SELECT uuid(), role_id, 'validateUserTwoFactorAuthenticationCode','ALLOW',MAX(sort_order) - 1
189-
FROM `cloud`.`role_permissions`
190-
WHERE role_id = (
191-
SELECT `r`.`id`
192-
FROM `cloud`.`roles` `r`
193-
WHERE `r`.`name` = 'Support Admin - Default'
194-
AND `r`.`is_default` = 1
195-
);
54+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
55+
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');

0 commit comments

Comments
 (0)