Merge branch 'master' into staging

This commit is contained in:
Jean-Baptiste Pasquier 2019-10-15 15:52:41 +02:00
commit 97af8eb377
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
2 changed files with 8 additions and 3 deletions

View File

@ -3,6 +3,7 @@
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "http://127.0.0.1:8000/openid/", "authority": "http://127.0.0.1:8000/openid/",
"clientName": "SIB App",
"endpoints": { "endpoints": {
"businessproviders": "http://127.0.0.1:8000/businessproviders/", "businessproviders": "http://127.0.0.1:8000/businessproviders/",
"circles": "http://127.0.0.1:8000/circles/", "circles": "http://127.0.0.1:8000/circles/",
@ -18,6 +19,7 @@
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.alpha.happy-dev.fr/openid/", "authority": "https://api.alpha.happy-dev.fr/openid/",
"clientName": "SIB App",
"endpoints": { "endpoints": {
"businessproviders": "https://api.alpha.happy-dev.fr/businessproviders/", "businessproviders": "https://api.alpha.happy-dev.fr/businessproviders/",
"circles": "https://api.alpha.happy-dev.fr/circles/", "circles": "https://api.alpha.happy-dev.fr/circles/",
@ -34,6 +36,7 @@
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-paris.happy-dev.fr/openid/", "authority": "https://api.test-paris.happy-dev.fr/openid/",
"clientName": "SIB App",
"endpoints": { "endpoints": {
"businessproviders": "https://api.test-paris.happy-dev.fr/businessproviders/", "businessproviders": "https://api.test-paris.happy-dev.fr/businessproviders/",
"circles": "https://api.test-paris.happy-dev.fr/circles/", "circles": "https://api.test-paris.happy-dev.fr/circles/",
@ -49,6 +52,7 @@
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-nantes.happy-dev.fr/openid/", "authority": "https://api.test-nantes.happy-dev.fr/openid/",
"clientName": "SIB App",
"endpoints": { "endpoints": {
"businessproviders": "https://api.test-nantes.happy-dev.fr/businessproviders/", "businessproviders": "https://api.test-nantes.happy-dev.fr/businessproviders/",
"circles": "https://api.test-nantes.happy-dev.fr/circles/", "circles": "https://api.test-nantes.happy-dev.fr/circles/",

View File

@ -30,5 +30,6 @@ sib-auth
sib-auth-provider( sib-auth-provider(
data-authority=`${authority}` data-authority=`${authority}`
data-id=`${authorityName || "paris"}` data-id=`${authorityName || "paris"}`
data-client-name=`${clientName || "SIB App"}`
) )