Fix typo

.flowconfig

@@ -1,25 +0,0 @@
-
-[ignore]
-.*/node_modules/.*
-.*/vendors/.*
-.*/rainloop/.*
-.*/plugins/.*
-.*/build/.*
-.*/asserts/.*
-
-[include]
-
-[libs]
-./dev/
-
-[options]
-strip_root=true
-module.system=haste
-
-esproposal.class_static_fields=enable
-esproposal.class_instance_fields=enable
-esproposal.decorators=ignore
-
-experimental.strict_type_args=true
-
-unsafe.enable_getters_and_setters=true

dev/admin.js

@@ -1,4 +1,4 @@
-/* @flow */
+
 import bootstrap from 'bootstrap';
 import App from 'App/Admin';
 

dev/app.js

@@ -1,4 +1,4 @@
-/* @flow */
+
 import bootstrap from 'bootstrap';
 import App from 'App/User';
 

dev/bootstrap.js

@@ -1,4 +1,4 @@
-/* @flow */
+
 import window from 'window';
 import {killCtrlACtrlS, detectDropdownVisibility, createCommandLegacy, domReady} from 'Common/Utils';
 import {$win, $html, data as GlobalsData, bMobileDevice} from 'Common/Globals';

gulpfile.js

@@ -167,8 +167,8 @@ cfg.paths.staticMinJS = 'rainloop/v/' + cfg.devVersion + '/static/js/min/';
 cfg.paths.staticCSS = 'rainloop/v/' + cfg.devVersion + '/static/css/';
 cfg.paths.momentLocales = 'rainloop/v/' + cfg.devVersion + '/app/localization/moment/';
 
-cfg.paths.asserts = {
+cfg.paths.assets = {
-	src: 'asserts/**/*.*'
+	src: 'assets/**/*.*'
 };
 
 cfg.paths.less = {
@@ -269,12 +269,12 @@ cfg.paths.js = {
 
 // assers
 
-gulp.task('asserts:clean', function() {
+gulp.task('assets:clean', function() {
 	return cleanDir(cfg.paths.static);
 });
 
-gulp.task('asserts', function() {
+gulp.task('assets', function() {
-	return gulp.src(cfg.paths.asserts.src)
+	return gulp.src(cfg.paths.assets.src)
 		.pipe(gulp.dest(cfg.paths.static));
 });
 
@@ -284,7 +284,7 @@ gulp.task('css:clean', function() {
 	return cleanDir(cfg.paths.staticCSS + '/*.css');
 });
 
-gulp.task('css:main', ['asserts'], function() {
+gulp.task('css:main', ['assets'], function() {
 	var autoprefixer = require('gulp-autoprefixer'),
 		less = require('gulp-less'),
 		lessFilter = filter('**/*.less', {restore: true}),
@@ -614,7 +614,7 @@ gulp.task('css', ['css:min']);
 
 gulp.task('vendors', ['moment', 'ckeditor', 'fontastic', 'lightgallery']);
 
-gulp.task('clean', ['js:clean', 'css:clean', 'asserts:clean']);
+gulp.task('clean', ['js:clean', 'css:clean', 'assets:clean']);
 
 gulp.task('rainloop:start', ['rainloop:copy', 'rainloop:setup']);
 

package.json

@@ -52,7 +52,7 @@
     "autolinker": "1.4.0",
     "babel-core": "6.20.0",
     "babel-eslint": "7.1.1",
-    "babel-loader": "6.2.9",
+    "babel-loader": "6.2.10",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
     "babel-plugin-transform-runtime": "6.15.0",
     "babel-preset-es2015": "6.18.0",

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -2137,12 +2137,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 	 * @param string $sSignMeToken = ''
 	 * @param string $sAdditionalCode = ''
 	 * @param string $bAdditionalCodeSignMe = false
+	 * @param string $bSkipTwoFactorAuth = false
 	 *
 	 * @return \RainLoop\Model\Account
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
 	public function LoginProcess(&$sEmail, &$sPassword, $sSignMeToken = '',
-		$sAdditionalCode = '', $bAdditionalCodeSignMe = false)
+		$sAdditionalCode = '', $bAdditionalCodeSignMe = false, $bSkipTwoFactorAuth = false)
 	{
 		$sInputEmail = $sEmail;
 
@@ -2265,8 +2266,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 			throw $oException;
 		}
 
-		// Two factor auth
+		// 2FA
-		if ($this->TwoFactorAuthProvider()->IsActive())
+		if (!$bSkipTwoFactorAuth && $this->TwoFactorAuthProvider()->IsActive())
 		{
 			$aData = $this->getTwoFactorInfo($oAccount);
 			if ($aData && isset($aData['IsSet'], $aData['Enable']) && !empty($aData['Secret']) && $aData['IsSet'] && $aData['Enable'])
@@ -2852,7 +2853,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountDoesNotExist);
 		}
 
-		$oNewAccount = $this->LoginProcess($sEmail, $sPassword);
+		$oNewAccount = $this->LoginProcess($sEmail, $sPassword, '', '', false, true);
 		$oNewAccount->SetParentEmail($sParentEmail);
 
 		$aAccounts[$oNewAccount->Email()] = $oNewAccount->GetAuthToken();

yarn.lock

@@ -401,9 +401,9 @@ babel-helpers@^6.16.0:
     babel-runtime "^6.0.0"
     babel-template "^6.16.0"
 
-babel-loader@6.2.9:
+babel-loader@6.2.10:
-  version "6.2.9"
+  version "6.2.10"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.9.tgz#2bce6a1c29b47afa90b937ba1fb1f87084d61c61"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-utils "^0.2.11"