diff --git a/schema/config.schema.json b/schema/config.schema.json index bb06f3fe..5855c3d7 100644 --- a/schema/config.schema.json +++ b/schema/config.schema.json @@ -117,7 +117,16 @@ }, "integration_type": { "type": "string", - "enum": [ "oauthweb", "oauthios", "oauthandroid", "service", "apikey" ] + "enum": [ + "oauthweb", + "oauthios", + "oauthandroid", + "service", + "apikey", + "oauthwebapp", + "oauthnativeapp", + "oauthsinglepageapp" + ] }, "oauth2": { "$ref": "#/definitions/oauth2" }, "jwt": { "$ref": "#/definitions/jwt" } diff --git a/test/__fixtures__/existing.merged.aio b/test/__fixtures__/existing.merged.aio index 36394a6f..004759d9 100644 --- a/test/__fixtures__/existing.merged.aio +++ b/test/__fixtures__/existing.merged.aio @@ -40,6 +40,21 @@ "id": "17950", "name": "New_Test_Intégration_8", "integration_type": "oauthandroid" + }, + { + "id": "17951", + "name": "New_Test_Intégration_9", + "integration_type": "oauthwebapp" + }, + { + "id": "17952", + "name": "New_Test_Intégration_10", + "integration_type": "oauthnativeapp" + }, + { + "id": "17953", + "name": "New_Test_Intégration_11", + "integration_type": "oauthsinglepageapp" } ], "services": [ diff --git a/test/__fixtures__/existing.merged.env b/test/__fixtures__/existing.merged.env index c79d9e7a..103ea33f 100644 --- a/test/__fixtures__/existing.merged.env +++ b/test/__fixtures__/existing.merged.env @@ -19,3 +19,15 @@ AIO_ims_contexts_New__Test__Intégration__8_client__id=XRXRXRXRXRXRXRXRXR AIO_ims_contexts_New__Test__Intégration__8_client__secret=XRXRXRXRXRXRXRXRXRX AIO_ims_contexts_New__Test__Intégration__8_redirect__uri=["https://abc123/foo"] AIO_ims_contexts_New__Test__Intégration__8_defaultRedirectUri=https://abc123/foo +AIO_ims_contexts_New__Test__Intégration__9_client__id=TYTYTYYUTYEWTEWRW +AIO_ims_contexts_New__Test__Intégration__9_client__secret=STWEGSDGEVBEGE +AIO_ims_contexts_New__Test__Intégration__9_redirect__uri=["https://abc123/foo2"] +AIO_ims_contexts_New__Test__Intégration__9_defaultRedirectUri=https://abc123/foo2 +AIO_ims_contexts_New__Test__Intégration__10_client__id=XXXTYTYTYYUTYEWTEWRW +AIO_ims_contexts_New__Test__Intégration__10_client__secret=XXXSTWEGSDGEVBEGE +AIO_ims_contexts_New__Test__Intégration__10_redirect__uri=["https://abc123/foo3"] +AIO_ims_contexts_New__Test__Intégration__10_defaultRedirectUri=https://abc123/foo3 +AIO_ims_contexts_New__Test__Intégration__11_client__id=YYYYXXXTYTYTYYUTYEWTEWRW +AIO_ims_contexts_New__Test__Intégration__11_client__secret=YYYYXXXSTWEGSDGEVBEGE +AIO_ims_contexts_New__Test__Intégration__11_redirect__uri=["https://abc123/foo4"] +AIO_ims_contexts_New__Test__Intégration__11_defaultRedirectUri=https://abc123/foo4 diff --git a/test/__fixtures__/valid.config.aio b/test/__fixtures__/valid.config.aio index 516e80cb..a28ba709 100644 --- a/test/__fixtures__/valid.config.aio +++ b/test/__fixtures__/valid.config.aio @@ -32,6 +32,21 @@ "id": "17950", "name": "New_Test_Intégration_8", "integration_type": "oauthandroid" + }, + { + "id": "17951", + "name": "New_Test_Intégration_9", + "integration_type": "oauthwebapp" + }, + { + "id": "17952", + "name": "New_Test_Intégration_10", + "integration_type": "oauthnativeapp" + }, + { + "id": "17953", + "name": "New_Test_Intégration_11", + "integration_type": "oauthsinglepageapp" } ], "services": [ diff --git a/test/__fixtures__/valid.config.env b/test/__fixtures__/valid.config.env index 48477ef0..65b39b61 100644 --- a/test/__fixtures__/valid.config.env +++ b/test/__fixtures__/valid.config.env @@ -15,3 +15,15 @@ AIO_ims_contexts_New__Test__Intégration__8_client__id=XRXRXRXRXRXRXRXRXR AIO_ims_contexts_New__Test__Intégration__8_client__secret=XRXRXRXRXRXRXRXRXRX AIO_ims_contexts_New__Test__Intégration__8_redirect__uri=["https://abc123/foo"] AIO_ims_contexts_New__Test__Intégration__8_defaultRedirectUri=https://abc123/foo +AIO_ims_contexts_New__Test__Intégration__9_client__id=TYTYTYYUTYEWTEWRW +AIO_ims_contexts_New__Test__Intégration__9_client__secret=STWEGSDGEVBEGE +AIO_ims_contexts_New__Test__Intégration__9_redirect__uri=["https://abc123/foo2"] +AIO_ims_contexts_New__Test__Intégration__9_defaultRedirectUri=https://abc123/foo2 +AIO_ims_contexts_New__Test__Intégration__10_client__id=XXXTYTYTYYUTYEWTEWRW +AIO_ims_contexts_New__Test__Intégration__10_client__secret=XXXSTWEGSDGEVBEGE +AIO_ims_contexts_New__Test__Intégration__10_redirect__uri=["https://abc123/foo3"] +AIO_ims_contexts_New__Test__Intégration__10_defaultRedirectUri=https://abc123/foo3 +AIO_ims_contexts_New__Test__Intégration__11_client__id=YYYYXXXTYTYTYYUTYEWTEWRW +AIO_ims_contexts_New__Test__Intégration__11_client__secret=YYYYXXXSTWEGSDGEVBEGE +AIO_ims_contexts_New__Test__Intégration__11_redirect__uri=["https://abc123/foo4"] +AIO_ims_contexts_New__Test__Intégration__11_defaultRedirectUri=https://abc123/foo4 diff --git a/test/__fixtures__/valid.config.json b/test/__fixtures__/valid.config.json index 6002faaa..9b8aa6a6 100644 --- a/test/__fixtures__/valid.config.json +++ b/test/__fixtures__/valid.config.json @@ -54,6 +54,39 @@ "redirect_uri": [ "https://abc123/foo" ], "defaultRedirectUri": "https://abc123/foo" } + }, + { + "id": "17951", + "name": "New Test Intégration 9", + "integration_type": "oauthwebapp", + "oauth2": { + "client_id": "TYTYTYYUTYEWTEWRW", + "client_secret": "STWEGSDGEVBEGE", + "redirect_uri": [ "https://abc123/foo2" ], + "defaultRedirectUri": "https://abc123/foo2" + } + }, + { + "id": "17952", + "name": "New Test Intégration 10", + "integration_type": "oauthnativeapp", + "oauth2": { + "client_id": "XXXTYTYTYYUTYEWTEWRW", + "client_secret": "XXXSTWEGSDGEVBEGE", + "redirect_uri": [ "https://abc123/foo3" ], + "defaultRedirectUri": "https://abc123/foo3" + } + }, + { + "id": "17953", + "name": "New Test Intégration 11", + "integration_type": "oauthsinglepageapp", + "oauth2": { + "client_id": "YYYYXXXTYTYTYYUTYEWTEWRW", + "client_secret": "YYYYXXXSTWEGSDGEVBEGE", + "redirect_uri": [ "https://abc123/foo4" ], + "defaultRedirectUri": "https://abc123/foo4" + } } ], "services": [