Skip to content
This repository was archived by the owner on Jul 1, 2025. It is now read-only.

Commit 4ce7939

Browse files
committed
Modify authorization records in prepopulatesql_xx_xxxxx.sql files to use proper scope paramaters for 'data_custodian_', 'client_', 'upload_' and 'registration_' based access_tokens
1 parent e2e0a0d commit 4ce7939

9 files changed

+28
-28
lines changed

etc/prepopulatesql_applicationinformation_dc.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ INSERT INTO application_information_grant_types (application_information_id, gra
2020

2121
/* Add predefined authorizations */
2222
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
23-
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
23+
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
2424
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
25-
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
25+
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
2626
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
27-
VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
27+
VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
2828
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
29-
VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
29+
VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
3030
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)
3131
VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
3232
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)

etc/prepopulatesql_applicationinformation_dc_localhost443.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ INSERT INTO application_information_grant_types (application_information_id, gra
2020

2121
/* Add predefined authorizations */
2222
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
23-
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','https://localhost/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
23+
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','https://localhost/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
2424
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
25-
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
25+
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
2626
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
27-
VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','https://localhost/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
27+
VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','https://localhost/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
2828
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
29-
VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
29+
VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
3030
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)
3131
VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
3232
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)

etc/prepopulatesql_applicationinformation_dc_localhost8080.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ INSERT INTO application_information_grant_types (application_information_id, gra
2020

2121
/* Add predefined authorizations */
2222
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
23-
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
23+
VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
2424
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
25-
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
25+
VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
2626
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
27-
VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
27+
VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
2828
INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id)
29-
VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
29+
VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
3030
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)
3131
VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
3232
INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id)

0 commit comments

Comments
 (0)