feat: Feature flag ENABLE_PHONE_LOGIN (#5424)

wireapp · Dec 14, 2018 · d50d37b · d50d37b
1 parent 62df1f1
commit d50d37b
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 24 deletions.
diff --git a/.env b/.env
@@ -15,6 +15,7 @@ ENFORCE_HTTPS="false"
 FEATURE_CHECK_CONSENT="true"
 FEATURE_ENABLE_ACCOUNT_REGISTRATION="true"
 FEATURE_ENABLE_DEBUG="true"
+FEATURE_ENABLE_PHONE_LOGIN="true"
 FEATURE_ENABLE_SSO="true"
 FEATURE_SHOW_LOADING_INFORMATION="true"
 GOOGLE_WEBMASTER_ID=""

diff --git a/app/script/auth/config.ts b/app/script/auth/config.ts
@@ -39,6 +39,7 @@ declare global {
           CHECK_CONSENT: boolean;
           ENABLE_ACCOUNT_REGISTRATION: boolean;
           ENABLE_DEBUG: boolean;
+          ENABLE_PHONE_LOGIN: boolean;
           ENABLE_SSO: boolean;
           SHOW_LOADING_INFORMATION: boolean;
         };
@@ -63,6 +64,7 @@ export const FEATURE = window.wire.env.FEATURE || {
   CHECK_CONSENT: true,
   ENABLE_ACCOUNT_REGISTRATION: true,
   ENABLE_DEBUG: false,
+  ENABLE_PHONE_LOGIN: true,
   ENABLE_SSO: false,
   SHOW_LOADING_INFORMATION: false,
 };

diff --git a/app/script/auth/page/Login.tsx b/app/script/auth/page/Login.tsx
@@ -421,14 +421,16 @@ class Login extends React.Component<CombinedProps, State> {
                           {_(loginStrings.ssoLogin)}
                         </Link>
                       </Column>
-                      <Column>
-                        <Link
-                          href={EXTERNAL_ROUTE.PHONE_LOGIN + window.location.search}
-                          data-uie-name="go-sign-in-phone"
-                        >
-                          {_(loginStrings.phoneLogin)}
-                        </Link>
-                      </Column>
+                      {config.FEATURE.ENABLE_PHONE_LOGIN && (
+                        <Column>
+                          <Link
+                            href={URLUtil.pathWithParams(EXTERNAL_ROUTE.PHONE_LOGIN)}
+                            data-uie-name="go-sign-in-phone"
+                          >
+                            {_(loginStrings.phoneLogin)}
+                          </Link>
+                        </Column>
+                      )}
                     </Columns>
                   </div>
                 ) : (
@@ -438,11 +440,16 @@ class Login extends React.Component<CombinedProps, State> {
                         {_(loginStrings.forgotPassword)}
                       </Link>
                     </Column>
-                    <Column>
-                      <Link href={EXTERNAL_ROUTE.PHONE_LOGIN + window.location.search} data-uie-name="go-sign-in-phone">
-                        {_(loginStrings.phoneLogin)}
-                      </Link>
-                    </Column>
+                    {config.FEATURE.ENABLE_PHONE_LOGIN && (
+                      <Column>
+                        <Link
+                          href={URLUtil.pathWithParams(EXTERNAL_ROUTE.PHONE_LOGIN)}
+                          data-uie-name="go-sign-in-phone"
+                        >
+                          {_(loginStrings.phoneLogin)}
+                        </Link>
+                      </Column>
+                    )}
                   </Columns>
                 )}
               </ContainerXS>

diff --git a/app/script/config.js b/app/script/config.js
@@ -19,6 +19,8 @@
 
 window.z = window.z || {};
 
+const env = window.wire.env;
+
 window.z.config = {
   ACCENT_ID: {
     BLUE: 1,
@@ -30,6 +32,15 @@ window.z.config = {
     YELLOW: 3,
   },
 
+  FEATURE: {
+    CHECK_CONSENT: env.FEATURE && env.FEATURE.CHECK_CONSENT,
+    ENABLE_ACCOUNT_REGISTRATION: env.FEATURE && env.FEATURE.ENABLE_ACCOUNT_REGISTRATION,
+    ENABLE_DEBUG: env.FEATURE && env.FEATURE.ENABLE_DEBUG,
+    ENABLE_PHONE_LOGIN: env.FEATURE && env.FEATURE.ENABLE_PHONE_LOGIN,
+    ENABLE_SSO: env.FEATURE && env.FEATURE.ENABLE_SSO,
+    SHOW_LOADING_INFORMATION: env.FEATURE && env.FEATURE.SHOW_LOADING_INFORMATION,
+  },
+
   LOGGER: {
     OPTIONS: {
       domains: {
@@ -93,23 +104,23 @@ window.z.config = {
 
   URL: {
     ACCOUNT: {
-      PRODUCTION: (window.wire.env.URL && window.wire.env.URL.ACCOUNT_BASE) || 'https://account.wire.com',
+      PRODUCTION: (env.URL && env.URL.ACCOUNT_BASE) || 'https://account.wire.com',
       STAGING: 'https://wire-account-staging.zinfra.io',
     },
-    PRIVACY_POLICY: window.wire.env.URL && window.wire.env.URL.PRIVACY_POLICY,
+    PRIVACY_POLICY: env.URL && env.URL.PRIVACY_POLICY,
     SUPPORT: 'https://support.wire.com',
     TEAM_SETTINGS: {
-      PRODUCTION: (window.wire.env.URL && window.wire.env.URL.TEAMS_BASE) || 'https://teams.wire.com',
+      PRODUCTION: (env.URL && env.URL.TEAMS_BASE) || 'https://teams.wire.com',
       STAGING: 'https://wire-teams-staging.zinfra.io',
     },
-    TERMS_OF_USE_PERSONAL: window.wire.env.URL && window.wire.env.URL.TERMS_OF_USE_PERSONAL,
-    TERMS_OF_USE_TEAMS: window.wire.env.URL && window.wire.env.URL.TERMS_OF_USE_TEAMS,
+    TERMS_OF_USE_PERSONAL: env.URL && env.URL.TERMS_OF_USE_PERSONAL,
+    TERMS_OF_USE_TEAMS: env.URL && env.URL.TERMS_OF_USE_TEAMS,
     WEBAPP: {
       INTERNAL: 'https://wire-webapp-staging.wire.com',
-      PRODUCTION: window.wire.env.APP_BASE || 'https://app.wire.com',
+      PRODUCTION: env.APP_BASE || 'https://app.wire.com',
       STAGING: 'https://wire-webapp-staging.zinfra.io',
     },
-    WEBSITE: window.wire.env.URL && window.wire.env.URL.WEBSITE_BASE,
+    WEBSITE: env.URL && env.URL.WEBSITE_BASE,
   },
 
   URL_PATH: {

diff --git a/app/script/main/app.js b/app/script/main/app.js
@@ -249,7 +249,7 @@ class App {
    * @returns {Object} All utils
    */
   _setup_utils() {
-    return window.wire.env.FEATURE.ENABLE_DEBUG ? {debug: new DebugUtil(this.repository)} : {};
+    return z.config.FEATURE.ENABLE_DEBUG ? {debug: new DebugUtil(this.repository)} : {};
   }
 
   /**

diff --git a/app/script/user/UserRepository.js b/app/script/user/UserRepository.js
@@ -797,7 +797,7 @@ z.user.UserRepository = class UserRepository {
   }
 
   getMarketingConsent() {
-    if (!window.wire.env.FEATURE.CHECK_CONSENT) {
+    if (!z.config.FEATURE.CHECK_CONSENT) {
       this.logger.warn(`Consent check feature is disabled. Defaulting to '${this.marketingConsent()}'`);
       return Promise.resolve();
     }

diff --git a/app/script/util/util.js b/app/script/util/util.js
@@ -457,7 +457,7 @@ z.util.isValidEmail = email => {
  * @returns {boolean} True, if the input a phone number
  */
 z.util.isValidPhoneNumber = phoneNumber => {
-  const allowDebugPhoneNumbers = window.wire.env.FEATURE.ENABLE_DEBUG;
+  const allowDebugPhoneNumbers = z.config.FEATURE.ENABLE_DEBUG;
   const regularExpression = allowDebugPhoneNumbers ? /^\+[0-9]\d{1,14}$/ : /^\+[1-9]\d{1,14}$/;
 
   return regularExpression.test(phoneNumber);

diff --git a/app/script/view_model/LoadingViewModel.js b/app/script/view_model/LoadingViewModel.js
@@ -52,7 +52,7 @@ z.viewModel.LoadingViewModel = class LoadingViewModel {
 
         case z.string.initDecryption:
         case z.string.initEvents: {
-          if (!window.wire.env.FEATURE.SHOW_LOADING_INFORMATION) {
+          if (!z.config.FEATURE.SHOW_LOADING_INFORMATION) {
             updatedLoadingMessage = z.l10n.text(messageLocator);
             break;
           }

diff --git a/server/ServerConfig.ts b/server/ServerConfig.ts
@@ -21,6 +21,7 @@ export interface ServerConfig {
       CHECK_CONSENT: boolean;
       ENABLE_ACCOUNT_REGISTRATION: boolean;
       ENABLE_DEBUG: boolean;
+      ENABLE_PHONE_LOGIN: boolean;
       ENABLE_SSO: boolean;
       SHOW_LOADING_INFORMATION: boolean;
     };

diff --git a/server/config.ts b/server/config.ts
@@ -131,6 +131,7 @@ const config: ServerConfig = {
       CHECK_CONSENT: process.env.FEATURE_CHECK_CONSENT == 'false' ? false : true,
       ENABLE_ACCOUNT_REGISTRATION: process.env.FEATURE_ENABLE_ACCOUNT_REGISTRATION == 'false' ? false : true,
       ENABLE_DEBUG: process.env.FEATURE_ENABLE_DEBUG == 'true' ? true : false,
+      ENABLE_PHONE_LOGIN: process.env.FEATURE_ENABLE_PHONE_LOGIN == 'false' ? false : true,
       ENABLE_SSO: process.env.FEATURE_ENABLE_SSO == 'true' ? true : false,
       SHOW_LOADING_INFORMATION: process.env.FEATURE_SHOW_LOADING_INFORMATION == 'true' ? true : false,
     },