From 7dc6a2c19c49946214492efb4aa6a89dba37ef3a Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Fri, 19 Jun 2015 01:33:16 +0400 Subject: [PATCH 01/10] [FEAT] Logout: Auto logout from IDS on logout --- src/js/controllers/app.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/app.controller.js b/src/js/controllers/app.controller.js index 05c9ec216..901e2699a 100644 --- a/src/js/controllers/app.controller.js +++ b/src/js/controllers/app.controller.js @@ -772,7 +772,7 @@ function AppCtrl ($scope, id, net, keychain, txQueue, appManager, rpTracker, $scope.logout = function () { id.logout(); - location.reload(); + location.href = Options.ids_url + '/auth/logout?redirect=' + encodeURIComponent(location.href); }; $scope.$on('$idRemoteLogout', handleRemoteLogout); From 9a1711546ddcce83f5f612d250a23dd52fe1cf6f Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Sat, 20 Jun 2015 18:05:19 +0400 Subject: [PATCH 02/10] [FiX] Text: Edit text on RT settings page (IID-118) --- src/templates/tabs/security.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/tabs/security.jade b/src/templates/tabs/security.jade index ff357d195..b0c3d7245 100644 --- a/src/templates/tabs/security.jade +++ b/src/templates/tabs/security.jade @@ -36,8 +36,8 @@ section.col-xs-12.content(ng-controller="SecurityCtrl") .section .descriptor(l10n) Security settings .row - label(l10n) You can now manage your secret settings such as secret key, password, - | and two-factor authentication through Ripple ID. Pressing edit will take you to id.ripple.com. + label(l10n) You can now manage your security settings such as secret key, + | password, and two-factor authentication by clicking edit. .row.row-padding-small-xs .col-xs-9.col-sm-8.col-md-6 .col-xs-3.col-sm-4.col-md-6 From f3c477327f1bdd3873775de029ddd3ebf3dad5b5 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Sat, 20 Jun 2015 18:37:58 +0400 Subject: [PATCH 03/10] [FiX] Text: Remove IDS reference from main page (IID-120) --- src/templates/tabs/login.jade | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/templates/tabs/login.jade b/src/templates/tabs/login.jade index 58bd2b520..9dbb09777 100644 --- a/src/templates/tabs/login.jade +++ b/src/templates/tabs/login.jade @@ -24,12 +24,6 @@ section.col-xs-12.content(ng-controller="LoginCtrl") label input.rememberMe(name='remember_me', type='checkbox') span(for='remember_me', l10n) Remember me on this device for 30 days - .row.switch-mode-wrapper - .switch-mode-link-container.bottomText(l10n) - | Ripple Trade uses   - a(href="https://id.ripple.com") RippleID   - | to securely manage your personal information - .row.action-login(ng-if="$routeParams.to") .col-xs-12.col-sm-6.col-md-6.uri-form-container From 575824baf8cc6f653d1d7532991b918a1bc32738 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Sat, 20 Jun 2015 18:52:58 +0400 Subject: [PATCH 04/10] [FiX] CSS: Remove migrate, register, recover related CSS --- src/less/ripple/content.less | 2 +- src/less/ripple/landing.less | 33 ++------------- src/less/ripple/tabs/authorization.less | 55 ++----------------------- 3 files changed, 8 insertions(+), 82 deletions(-) diff --git a/src/less/ripple/content.less b/src/less/ripple/content.less index a5566d9a1..ec8aadafc 100644 --- a/src/less/ripple/content.less +++ b/src/less/ripple/content.less @@ -2,7 +2,7 @@ // Temporary @media (max-width: @screen-xs-max) { - .t-login, .t-register, .t-migrate, .t-tou, .t-privacypolicy { + .t-login, .t-tou, .t-privacypolicy { header { display: none; } diff --git a/src/less/ripple/landing.less b/src/less/ripple/landing.less index ab1eab726..be947e46b 100644 --- a/src/less/ripple/landing.less +++ b/src/less/ripple/landing.less @@ -148,24 +148,24 @@ header.loggedOut { } } - #t-register .auth-form-container .auth-form-wrapper, #t-login .auth-form-container .auth-form-wrapper, #t-recover .auth-form-container .auth-form-wrapper, #t-account .auth-form-container .auth-form-wrapper, #t-migrate .auth-form-container .auth-form-wrapper { + #t-login .auth-form-container .auth-form-wrapper, #t-account .auth-form-container .auth-form-wrapper { float: right; border: none; background: rgba(76, 141, 184, .8); border-radius: 5px; } - #t-register .auth-form-container h2, #t-login .auth-form-container h2, #t-recover .auth-form-container h2, #t-account .auth-form-container h2, #t-migrate .auth-form-container h2 { + #t-login .auth-form-container h2, #t-account .auth-form-container h2 { color: @white; width: 100%; margin: 0; } - #t-register .auth-form-container .auth-form-wrapper label, #t-login .auth-form-container .auth-form-wrapper label, #t-recover .auth-form-container .auth-form-wrapper label, #t-account .auth-form-container .auth-form-wrapper label, #t-migrate .auth-form-container .auth-form-wrapper label, #t-register .auth-form-container .see-privacy-text, #t-login .auth-form-container .see-privacy-text, #t-recover .auth-form-container .see-privacy-text, #t-account .auth-form-container .see-privacy-text, #t-migrate .auth-form-container .see-privacy-text { + #t-login .auth-form-container .auth-form-wrapper label, #t-account .auth-form-container .auth-form-wrapper label, #t-login .auth-form-container .see-privacy-text, #t-account .auth-form-container .see-privacy-text { color: @landingblue; } - #t-register .auth-form-container .sign-up-steps-list li.active, #t-login .auth-form-container .sign-up-steps-list li.active, #t-recover .auth-form-container .sign-up-steps-list li.active, #t-account .auth-form-container .sign-up-steps-list li.active, #t-migrate .auth-form-container .sign-up-steps-list li.active { + #t-login .auth-form-container .sign-up-steps-list li.active, #t-account .auth-form-container .sign-up-steps-list li.active { color: @white; border-bottom: 1px solid @white !important; } @@ -421,31 +421,6 @@ header.loggedOut { } -//register specific -#t-register { - - h2.loginTop a { - color: @midgray !important; - display: block; - background: rgba(0,0,0,0.2); - padding: 15px; - &:hover { - color: @white !important; - } - } - - .tabBg { - background: rgba(0,0,0,.6); - height: 100px; - width: 16%; - position: absolute; - right: 15px !important; - border-top-right-radius: 5px; - cursor: pointer; - } - -} - //privacy policy and tou .t-privacypolicy, .t-tou { diff --git a/src/less/ripple/tabs/authorization.less b/src/less/ripple/tabs/authorization.less index f559214f8..352dac5b9 100644 --- a/src/less/ripple/tabs/authorization.less +++ b/src/less/ripple/tabs/authorization.less @@ -1,9 +1,9 @@ -.t-register, .t-login, .t-recover, .t-migrate { +.t-login { header nav { display: none; } } -#t-register, #t-login, #t-recover, #t-account, #t-migrate { +#t-login, #t-account { a { text-decoration: none; &:hover, &:focus { @@ -238,56 +238,7 @@ } } } -#t-register { - .auth-form-container { - &.mode-verification { - .auth-form-wrapper { - .btn-cancel { - .loading_text { - text-transform: lowercase; - } - } - } - } - } - .register_masterkey { - position: relative; - .auth-attention { - margin-top: 30px; - text-align: center; - .recovery { - margin-top: 10px; - } - } - } - .welcome-wrapper { - text-align: center; - } - .platform, h4.new { - max-width: 700px; - margin: auto; - } - h4.new { - padding: 25px 0; - border-top: 1px solid @midgray; - font-weight: 200; - font-size: 1.1em; - } - span.currency { - font-weight: 500; - } - .xrp-xau { - font-size: 1.2em; - } -} -#t-migrate { - .text-status { - #error { - font-size: 12px; - color: @midred; - } - } -} + #t-login { @media (max-width: @screen-xs-max) { .content { From 66505876ac15db3a62980b8472eae88f7f898b7e Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Sun, 21 Jun 2015 02:36:02 +0400 Subject: [PATCH 05/10] [FiX] Travis: Put new RTB address in Travis config --- test/travis/config-travis.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/travis/config-travis.js b/test/travis/config-travis.js index a21d83ba4..77cc29bc9 100644 --- a/test/travis/config-travis.js +++ b/test/travis/config-travis.js @@ -5,7 +5,6 @@ */ var Options = { // Local domain - // // Which domain should ripple-client consider native? domain: 'ripp.site:3000', @@ -85,7 +84,7 @@ var Options = { gateway_max_limit: 1000000000, // Ripple trade backend URL - backend_url: 'http://54.68.38.81:8080', + backend_url: 'http://54.68.38.81:8081', ids_url: 'http://idripple.com', ticker: { From cfa07dd760d3510c865d0def1f099ee701189797 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Sun, 21 Jun 2015 04:17:07 +0400 Subject: [PATCH 06/10] [FiX] Travis: Wait until 'Connected to BrowserSync' disappears --- test/selenium/tests-public/LoginRT.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/selenium/tests-public/LoginRT.json b/test/selenium/tests-public/LoginRT.json index 9df8cbe3a..1420ab05f 100644 --- a/test/selenium/tests-public/LoginRT.json +++ b/test/selenium/tests-public/LoginRT.json @@ -60,6 +60,11 @@ "type": "waitForTextPresent", "text": "BALANCES" }, + { + "type": "waitForTextPresent", + "text": "Connected to BrowserSync", + "negated": true + }, { "type": "clickElement", "locator": { From b967ce99ae53d3d3f6207fd9aae6606a52927b09 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Mon, 22 Jun 2015 23:13:48 +0400 Subject: [PATCH 07/10] [FEAT] Login: Remove "remember me" feature --- src/templates/tabs/login.jade | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/templates/tabs/login.jade b/src/templates/tabs/login.jade index 9dbb09777..dd7a19d71 100644 --- a/src/templates/tabs/login.jade +++ b/src/templates/tabs/login.jade @@ -19,11 +19,7 @@ section.col-xs-12.content(ng-controller="LoginCtrl") span(l10n) Sign Up button.btn.btn-submit.btn-block.btn-success#loginBtn(type="submit" ng-click="submitForm('login')") span(l10n) Sign In - .input-group.col-xs-12 input(name='redirect_to', type='hidden', value='{{redirectTo}}') - label - input.rememberMe(name='remember_me', type='checkbox') - span(for='remember_me', l10n) Remember me on this device for 30 days .row.action-login(ng-if="$routeParams.to") .col-xs-12.col-sm-6.col-md-6.uri-form-container From 7ac74afbc26501e88383a50f78db57a4fe7d2fd5 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Tue, 23 Jun 2015 00:08:53 +0400 Subject: [PATCH 08/10] [FIX] Login: Fix code style in login.controller.js --- src/js/tabs/login.controller.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/js/tabs/login.controller.js b/src/js/tabs/login.controller.js index 15447ff44..547d629e9 100644 --- a/src/js/tabs/login.controller.js +++ b/src/js/tabs/login.controller.js @@ -1,10 +1,9 @@ - +'use strict'; var util = require('util'); var Tab = require('../client/tab').Tab; -var LoginTab = function() -{ +var LoginTab = function() { Tab.call(this); }; From 860f61400549565cb221d5f3bfb4cd1d81e36479 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Tue, 23 Jun 2015 04:10:54 +0400 Subject: [PATCH 09/10] [FIX] ID Service: Fix code style in id.service.js --- src/js/services/id.service.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/js/services/id.service.js b/src/js/services/id.service.js index 84051d68b..c4a1fc51c 100644 --- a/src/js/services/id.service.js +++ b/src/js/services/id.service.js @@ -6,19 +6,14 @@ * The id service is used for user identification and authorization. */ -var util = require('util'), - webutil = require('../util/web'), - settings = require('../util/settings'), - Base58Utils = require('../util/base58'), - RippleAddress = require('../util/types').RippleAddress; +var webutil = require('../util/web'), + settings = require('../util/settings'); var module = angular.module('id', ['authflow', 'blob']); module.factory( - 'rpId', ['$rootScope', '$location', '$route', '$routeParams', '$timeout', - 'rpAuthFlow', 'rpBlob', '$q', - function($scope, $location, $route, $routeParams, $timeout, - $authflow, $blob, $q) { + 'rpId', ['$rootScope', '$location', '$route', '$routeParams', '$timeout', 'rpAuthFlow', 'rpBlob', '$q', + function($scope, $location, $route, $routeParams, $timeout, $authflow, $blob, $q) { /** * Identity manager * @@ -350,8 +345,7 @@ module.factory( }); }; - Id.prototype.logout = function() - { + Id.prototype.logout = function() { store.remove('backend_token'); // TODO make it better @@ -373,7 +367,9 @@ module.factory( Id.prototype.unlock = function(username, password, callback) { // Callback is optional - if('function' !== typeof callback) callback = $.noop; + if ('function' !== typeof callback) { + callback = $.noop; + } // username = Id.normalizeUsernameForDisplay(username); // password = Id.normalizePassword(password); @@ -393,7 +389,7 @@ module.factory( * Redirects the user to a page where they can identify. This could be the * login tab most likely. */ - Id.prototype.goId = function () { + Id.prototype.goId = function() { if (!this.isLoggedIn()) { if (_.size($routeParams)) { var tab = $route.current.tabName; From 474ae7796808b0102968277782f49e0f6e0ca347 Mon Sep 17 00:00:00 2001 From: Hovhannes Kuloghlyan Date: Tue, 23 Jun 2015 15:41:39 +0400 Subject: [PATCH 10/10] [FIX] ID Service: Fix code style in id.service.js --- src/js/services/id.service.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/js/services/id.service.js b/src/js/services/id.service.js index c4a1fc51c..3ce792e6a 100644 --- a/src/js/services/id.service.js +++ b/src/js/services/id.service.js @@ -417,9 +417,6 @@ module.factory( return this.resolvedNames[address]; }; - /** - * - */ Id.prototype.addressDontHaveName = function(address) { return this.resolvedNames[address] === address; };