Skip to content
Snippets Groups Projects
Verified Commit 97af8eb3 authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier
Browse files

Merge branch 'master' into staging

parents 93895d16 3625cad5
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -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/",
...@@ -11,13 +12,14 @@ ...@@ -11,13 +12,14 @@
"projects": "http://127.0.0.1:8000/projects/", "projects": "http://127.0.0.1:8000/projects/",
"skills": "http://127.0.0.1:8000/skills/", "skills": "http://127.0.0.1:8000/skills/",
"users": "http://127.0.0.1:8000/users/" "users": "http://127.0.0.1:8000/users/"
} }
}, },
"alpha": { "alpha": {
"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/",
...@@ -26,7 +28,7 @@ ...@@ -26,7 +28,7 @@
"projects": "https://api.alpha.happy-dev.fr/projects/", "projects": "https://api.alpha.happy-dev.fr/projects/",
"skills": "https://api.alpha.happy-dev.fr/skills/", "skills": "https://api.alpha.happy-dev.fr/skills/",
"users": "https://api.alpha.happy-dev.fr/users/" "users": "https://api.alpha.happy-dev.fr/users/"
} }
}, },
"paris": { "paris": {
...@@ -34,6 +36,7 @@ ...@@ -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/",
...@@ -42,13 +45,14 @@ ...@@ -42,13 +45,14 @@
"projects": "https://api.test-paris.happy-dev.fr/projects/", "projects": "https://api.test-paris.happy-dev.fr/projects/",
"skills": "https://api.test-paris.happy-dev.fr/skills/", "skills": "https://api.test-paris.happy-dev.fr/skills/",
"users": "https://api.test-paris.happy-dev.fr/users/" "users": "https://api.test-paris.happy-dev.fr/users/"
} }
}, },
"nantes": { "nantes": {
"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/",
......
...@@ -30,5 +30,6 @@ sib-auth ...@@ -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"}`
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment