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

Commit 67cb940

Browse files
dfcoffindfcoffin
committed
Merge pull request #218 from dfcoffin/master
1)Add 'client_credentials' to 'application_information_scope table' entries for 'third_party' applicationinformation structure in all prepopulatesql_applicationinformation_dc_xxxxx.sql files, 2) add 'client_credentials' to oauth_client_details table for 'third_party' in all prepopulatesql_tokenstore_xxxx.sql files
2 parents fbf68a6 + a87f91a commit 67cb940

7 files changed

+7
-3
lines changed

‎etc/prepopulatesql_applicationinformation_dc_localhost443.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
1616
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
1717
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
1818
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
19+
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
1920
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
2021

2122
/* Add predefined authorizations */

‎etc/prepopulatesql_applicationinformation_dc_localhost8080.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
1616
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
1717
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
1818
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
19+
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
1920
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
2021

2122
/* Add predefined authorizations */

‎etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
1616
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
1717
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
1818
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
19+
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
1920
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
2021

2122
/* Add predefined authorizations */

‎etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
1616
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
1717
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
1818
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
19+
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
1920
INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
2021

2122
/* Add predefined authorizations */

‎etc/prepopulatesql_tokenstore_localhost8080.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ UNLOCK TABLES;
5353
LOCK TABLES `oauth_client_details` WRITE;
5454
/*!40000 ALTER TABLE `oauth_client_details` DISABLE KEYS */;
5555
INSERT INTO `oauth_client_details` VALUES ('data_custodian_admin', NULL, 'secret', 'FB=3_19_32_33_34_35_36_37_38_41_44_45', 'client_credentials', NULL, 'ROLE_DC_ADMIN', '31536000', NULL, NULL, 'FALSE');
56-
INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token', 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
56+
INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token,client_credentials', 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
5757
INSERT INTO `oauth_client_details` VALUES ('third_party_admin', NULL, 'secret', 'FB=34_35', 'client_credentials', NULL, 'ROLE_TP_ADMIN', '31536000', NULL, NULL, 'FALSE');
5858
INSERT INTO `oauth_client_details` VALUES ('upload_admin', NULL, 'secret', 'FB=45', 'client_credentials', NULL, 'ROLE_UL_ADMIN', '31536000', NULL, NULL, 'FALSE');
5959
INSERT INTO `oauth_client_details` VALUES ('REGISTRATION_third_party', NULL, 'secret', 'FB=36_40', 'client_credentials', NULL, 'ROLE_TP_REGISTRATION', '31536000', NULL, NULL, 'FALSE');

‎etc/prepopulatesql_tokenstore_services_greenbuttondata_org80.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ UNLOCK TABLES;
5050
LOCK TABLES `oauth_client_details` WRITE;
5151
/*!40000 ALTER TABLE `oauth_client_details` DISABLE KEYS */;
5252
INSERT INTO `oauth_client_details` VALUES ('data_custodian_admin', NULL, 'secret', 'FB=3_19_32_33_34_35_36_37_38_41_44_45', 'client_credentials', NULL, 'ROLE_DC_ADMIN', '31536000', NULL, NULL, 'FALSE');
53-
INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
53+
INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token,client_credentials', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
5454
INSERT INTO `oauth_client_details` VALUES ('third_party_admin', NULL, 'secret', 'FB=34_35', 'client_credentials', NULL, 'ROLE_TP_ADMIN', '31536000', NULL, NULL, 'FALSE');
5555
INSERT INTO `oauth_client_details` VALUES ('upload_admin', NULL, 'secret', 'FB=45', 'client_credentials', NULL, 'ROLE_UL_ADMIN', '31536000', NULL, NULL, 'FALSE');
5656
INSERT INTO `oauth_client_details` VALUES ('REGISTRATION_third_party', NULL, 'secret', 'FB=36_40', 'client_credentials', NULL, 'ROLE_TP_REGISTRATION', '31536000', NULL, NULL, 'FALSE');

‎etc/prepopulatesql_tokenstore_testthirdparty.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ UNLOCK TABLES;
5353
LOCK TABLES `oauth_client_details` WRITE;
5454
/*!40000 ALTER TABLE `oauth_client_details` DISABLE KEYS */;
5555
INSERT INTO `oauth_client_details` VALUES ('data_custodian_admin', NULL, 'secret', 'FB=3_19_32_33_34_35_36_37_38_41_44_45', 'client_credentials', NULL, 'ROLE_DC_ADMIN', '31536000', NULL, NULL, 'FALSE');
56-
INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token', 'http://localhost:8081/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
56+
INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token,client_credentials', 'http://localhost:8081/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
5757
INSERT INTO `oauth_client_details` VALUES ('third_party_admin', NULL, 'secret', 'FB=34_35', 'client_credentials', NULL, 'ROLE_TP_ADMIN', '31536000', NULL, NULL, 'FALSE');
5858
INSERT INTO `oauth_client_details` VALUES ('upload_admin', NULL, 'secret', 'FB=45', 'client_credentials', NULL, 'ROLE_UL_ADMIN', '31536000', NULL, NULL, 'FALSE');
5959
INSERT INTO `oauth_client_details` VALUES ('REGISTRATION_third_party', NULL, 'secret', 'FB=36_40', 'client_credentials', NULL, 'ROLE_TP_REGISTRATION', '31536000', NULL, NULL, 'FALSE');

0 commit comments

Comments
 (0)