Skip to content

Make login URL context depends on env & update enterprise login wording #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2025
Merged

Make login URL context depends on env & update enterprise login wording #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18dd2e2
feat: Update wording to be more inclusive for organization
zatteo Oct 10, 2025
033fae3
feat: Make cloudery login/signin url depends on env
zatteo Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/constants/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,25 @@
"prodBaseUri": "https://manager.cozycloud.cc",
"intBaseUri": "https://staging-manager.cozycloud.cc",
"devBaseUri": "https://manager-dev.cozycloud.cc",
"cozyLoginRelativeUri": "/v2/neutral/start?",
"cozySigninRelativeUri": "/v2/postcode?",
"prodCozyLoginRelativeUri": "/v2/neutral/start?",
"intCozyLoginRelativeUri": "/v2/neutral/start?",
"devCozyLoginRelativeUri": "/v2/neutral/start?",
"prodCozySigninRelativeUri": "/v2/postcode?",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still have a journey taking this path? We should not.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is available technically through a deep link. I plan to remove this part after the release.

"intCozySigninRelativeUri": "/v2/postcode?",
"devCozySigninRelativeUri": "/v2/postcode?",
"iOSQueryString": "universallink_for_email=https%3A%2F%2Flinks.mycozy.cloud%2Fflagship%2Fmanager&redirect_after_email=https%3A%2F%2Flinks.mycozy.cloud%2Fflagship%2Fonboarding%3Fflagship%3Dtrue%26fallback=cozy%253A%252F%252Fonboarding%253Fflagship%253Dtrue&redirect_after_login=https%3A%2F%2Floginflagship",
"androidQueryString": "universallink_for_email=https%3A%2F%2Flinks.mycozy.cloud%2Fflagship%2Fmanager&redirect_after_email=https%3A%2F%2Flinks.mycozy.cloud%2Fflagship%2Fonboarding%3Fflagship%3Dtrue%26fallback=cozy%253A%252F%252Fonboarding%253Fflagship%253Dtrue&redirect_after_login=https%3A%2F%2Floginflagship"
},
"twake": {
"prodBaseUri": "https://manager.cozycloud.cc",
"intBaseUri": "https://manager-int.cozycloud.cc",
"devBaseUri": "https://manager-dev.cozycloud.cc",
"cozyLoginRelativeUri": "/linagora/twake?",
"cozySigninRelativeUri": "/linagora/twake?register=true",
"devBaseUri": "https://manager-int.cozycloud.cc",
"prodCozyLoginRelativeUri": "/linagora/twake_prod?",
"intCozyLoginRelativeUri": "/linagora/twake_stg?",
"devCozyLoginRelativeUri": "/linagora/twake?",
"prodCozySigninRelativeUri": "/linagora/twake_prod?register=true",
"intCozySigninRelativeUri": "/linagora/twake_stg?register=true",
"devCozySigninRelativeUri": "/linagora/twake?register=true",
"iOSQueryString": "",
"androidQueryString": ""
}
Expand Down
8 changes: 4 additions & 4 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@
"buttonSignin": "Create Twake ID",
"buttonLogin": "Login",
"title": "Twake Workplace",
"useYourCompanyServer": "Use your company server",
"useYourCompanyServer": "Use your organization server",
"byContinuingYourAgreeingToOur": "By continuing, you're agreeing to our",
"privacyPolicy": "Privacy Policy"
},
"companyServer": {
"title": "Login",
"body": {
"byUrl": "To log in and access your Twake, please enter its URL",
"byEmail": "To log in and access your Twake, please enter your company email address"
"byEmail": "To log in and access your Twake, please enter your organization email address"
},
"toggle": {
"url": "Enter my Twake URL",
"email": "Enter my company email address"
"email": "Enter my organization email address"
},
"textFieldLabel": "Url",
"buttonLogin": "Next",
"companyServerNotFound": "Company server not found"
"companyServerNotFound": "Organization server not found"
}
},
"services": {
Expand Down
8 changes: 4 additions & 4 deletions src/locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@
"buttonSignin": "Crear Twake ID",
"buttonLogin": "Acceso",
"title": "Twake Workplace",
"useYourCompanyServer": "Utilice el servidor de su empresa",
"useYourCompanyServer": "Utilice el servidor de su organización",
"byContinuingYourAgreeingToOur": "Al continuar, acepta nuestra",
"privacyPolicy": "Política de Privacidad"
},
"companyServer": {
"title": "Acceso",
"body": {
"byUrl": "Para conectarse y acceder a su Twake, introduzca su URL",
"byEmail": "Para conectarse y acceder a su Twake, introduzca la dirección de correo electrónico corporativa"
"byEmail": "Para conectarse y acceder a su Twake, introduzca la dirección de correo electrónico organización"
},
"toggle": {
"url": "Introduce mi URL de Twake",
"email": "Introduzca la dirección de correo electrónico corporativa"
"email": "Introduzca la dirección de correo electrónico organización"
},
"textFieldLabel": "Url",
"buttonLogin": "Siguiente",
"companyServerNotFound": "No se ha encontrado el servidor de la corporativa"
"companyServerNotFound": "No se ha encontrado el servidor de la organización"
}
},
"services": {
Expand Down
8 changes: 4 additions & 4 deletions src/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@
"buttonSignin": "Créer un Twake ID",
"buttonLogin": "Se connecter",
"title": "Twake Workplace",
"useYourCompanyServer": "Utiliser le serveur de votre entreprise",
"useYourCompanyServer": "Utiliser le serveur de votre organisation",
"byContinuingYourAgreeingToOur": "En continuant, vous acceptez notre",
"privacyPolicy": "Politique de confidentialité"
},
"companyServer": {
"title": "Se connecter",
"body": {
"byUrl": "Pour vous connecter et accéder à votre Twake, veuillez saisir son URL",
"byEmail": "Pour vous connecter et accéder à votre Twake, veuillez saisir votre adresse email d'entreprise"
"byEmail": "Pour vous connecter et accéder à votre Twake, veuillez saisir votre adresse email d'organisation"
},
"toggle": {
"url": "Entrer l'URL de mon Twake",
"email": "Entrer mon adresse email d'entreprise"
"email": "Entrer mon adresse email d'organisation"
},
"textFieldLabel": "Serveur",
"buttonLogin": "Suivant",
"companyServerNotFound": "Serveur d'entreprise introuvable"
"companyServerNotFound": "Serveur d'organisation introuvable"
}
},
"services": {
Expand Down
28 changes: 14 additions & 14 deletions src/screens/login/cloudery-env/clouderyEnv.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.prodCozyLoginRelativeUri +
strings.cloudery.twake.androidQueryString,
signinUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.prodCozySigninRelativeUri +
strings.cloudery.twake.androidQueryString,
isOnboardingPartner: false
})
Expand All @@ -48,11 +48,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.devBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.devCozyLoginRelativeUri +
strings.cloudery.twake.androidQueryString,
signinUrl:
strings.cloudery.twake.devBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.devCozySigninRelativeUri +
strings.cloudery.twake.androidQueryString,
isOnboardingPartner: false
})
Expand All @@ -66,11 +66,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.intBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.intCozyLoginRelativeUri +
strings.cloudery.twake.androidQueryString,
signinUrl:
strings.cloudery.twake.intBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.intCozySigninRelativeUri +
strings.cloudery.twake.androidQueryString,
isOnboardingPartner: false
})
Expand All @@ -85,11 +85,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.intBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.intCozyLoginRelativeUri +
strings.cloudery.twake.iOSQueryString,
signinUrl:
strings.cloudery.twake.intBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.intCozySigninRelativeUri +
strings.cloudery.twake.iOSQueryString,
isOnboardingPartner: false
})
Expand All @@ -101,11 +101,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.prodCozyLoginRelativeUri +
strings.cloudery.twake.androidQueryString,
signinUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.prodCozySigninRelativeUri +
strings.cloudery.twake.androidQueryString,
isOnboardingPartner: false
})
Expand All @@ -119,11 +119,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.prodCozyLoginRelativeUri +
strings.cloudery.twake.androidQueryString,
signinUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.prodCozySigninRelativeUri +
strings.cloudery.twake.androidQueryString,
isOnboardingPartner: false
})
Expand Down Expand Up @@ -159,11 +159,11 @@ describe('extractEnvFromUrl', () => {
expect(result).toStrictEqual({
loginUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozyLoginRelativeUri +
strings.cloudery.twake.prodCozyLoginRelativeUri +
strings.cloudery.twake.androidQueryString,
signinUrl:
strings.cloudery.twake.prodBaseUri +
strings.cloudery.twake.cozySigninRelativeUri +
strings.cloudery.twake.prodCozySigninRelativeUri +
strings.cloudery.twake.androidQueryString,
isOnboardingPartner: false
})
Expand Down
19 changes: 16 additions & 3 deletions src/screens/login/cloudery-env/clouderyEnv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,23 @@ export const getClouderyUrls = async (): Promise<ClouderyUrls> => {
}
const baseUri = baseUris[clouderyEnv]

const baseCozyLoginRelativeUris: Record<ClouderyEnv, string> = {
PROD: strings.cloudery[clouderyType].prodCozyLoginRelativeUri,
INT: strings.cloudery[clouderyType].intCozyLoginRelativeUri,
DEV: strings.cloudery[clouderyType].devCozyLoginRelativeUri
}
const baseCozyLoginRelativeUri = baseCozyLoginRelativeUris[clouderyEnv]

const baseCozySigninRelativeUris: Record<ClouderyEnv, string> = {
PROD: strings.cloudery[clouderyType].prodCozySigninRelativeUri,
INT: strings.cloudery[clouderyType].intCozySigninRelativeUri,
DEV: strings.cloudery[clouderyType].devCozySigninRelativeUri
}
const baseCozySigninRelativeUri = baseCozySigninRelativeUris[clouderyEnv]

const onboardingPartnerPath = await getOnboardingPartnerRelativeUrl()
const relativeLoginUri =
onboardingPartnerPath ?? strings.cloudery[clouderyType].cozyLoginRelativeUri
const relativeSigninUri = strings.cloudery[clouderyType].cozySigninRelativeUri
const relativeLoginUri = onboardingPartnerPath ?? baseCozyLoginRelativeUri
const relativeSigninUri = baseCozySigninRelativeUri

const queryString =
Platform.OS === 'ios'
Expand Down
Loading