Skip to content
This repository was archived by the owner on Sep 2, 2023. It is now read-only.

Commit f600bbd

Browse files
committed
Merge pull request #2521 from h0vhannes/oauth
OAuth login for Ripple Trade
2 parents 740f942 + c830714 commit f600bbd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1064
-5294
lines changed

config-example.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ var Options = {
8888
// Default threshold in XRPs for fee on RT to show higher load status
8989
low_load_threshold: 0.012,
9090

91-
//Email notifications subscription service URL
92-
notifications_api_url: ''
91+
// Ripple trade backend URL
92+
backend_url: 'https://backend.rippletrade.com',
93+
ids_url: 'https://id.ripple.com'
9394
};
9495

9596
// Load client-side overrides

src/js/entry/web.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ require('../validators/rpWebsocket.directive.js');
2222
require('../services/globalwrappers.service.js');
2323
require('../services/id.service.js');
2424
require('../services/tracker.service.js');
25-
require('../services/blobRemote.service.js');
26-
require('../services/oldblob.service.js');
2725
require('../services/txqueue.service.js');
28-
require('../services/authflowRemote.service.js');
2926
require('../services/keychain.service.js');
3027
require('../services/network.service.js');
3128
require('../services/books.service.js');
@@ -36,6 +33,9 @@ require('../services/domainalias.service.js');
3633
require('../services/history.service.js');
3734
require('../services/notifications.service.js');
3835

36+
require('../services/authflow.service.js');
37+
require('../services/blob.service.js');
38+
3939
require('../services/integration/appManager.service.js');
4040
require('../services/integration/profileManager.service.js');
4141
require('../services/integration/account.service.js');
@@ -58,6 +58,10 @@ var appDependencies = [
5858
'tracker',
5959
'appManager',
6060
'history',
61+
'notifications',
62+
// ID Service related services
63+
'blob',
64+
'authflow',
6165
// Directives
6266
'charts',
6367
'effects',
@@ -72,16 +76,12 @@ var appDependencies = [
7276
// Filters
7377
'filters',
7478
'ui.bootstrap',
75-
'ui.sortable',
76-
'notifications'
79+
'ui.sortable'
7780
];
7881

7982
// Load tabs
8083
var tabdefs = [
81-
require('../tabs/register.controller.js'),
8284
require('../tabs/login.controller.js'),
83-
require('../tabs/migrate.controller.js'),
84-
require('../tabs/recover.controller.js'),
8585
require('../tabs/balance.controller.js'),
8686
require('../tabs/history.controller.js'),
8787
require('../tabs/contacts.controller.js'),
@@ -92,7 +92,6 @@ var tabdefs = [
9292
require('../tabs/trade.controller.js'),
9393
require('../tabs/advanced.controller.js'),
9494
require('../tabs/security.controller.js'),
95-
require('../tabs/kyc.controller.js'),
9695
require('../tabs/tx.controller.js'),
9796
require('../tabs/xrp.controller.js'),
9897
require('../tabs/debug.controller.js'),
@@ -105,7 +104,6 @@ var tabdefs = [
105104
require('../tabs/gold.controller.js'),
106105
require('../tabs/tou.controller.js'),
107106
require('../tabs/privacypolicy.controller.js'),
108-
require('../tabs/twofa.controller.js'),
109107
require('../tabs/jpy.controller.js'),
110108
require('../tabs/mxn.controller.js'),
111109
require('../tabs/404.controller.js'),

src/js/services/authflow.service.js

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
'use strict';
2+
3+
/**
4+
* AUTH FLOW IDS
5+
*
6+
* The auth flow service manages the login, unlock and registration procedures.
7+
*/
8+
9+
var module = angular.module('authflow', []);
10+
11+
module.factory('rpAuthFlow', ['$rootScope', function($scope) {
12+
var AuthFlow = {};
13+
14+
AuthFlow.exists = function(username, callback) {
15+
var meta = AuthFlow.getVaultClient(username);
16+
meta.client.exists(meta.username, callback);
17+
};
18+
19+
AuthFlow.unlock = function(username, password, callback) {
20+
if (!$scope.userBlob) {
21+
$scope.$apply(function() {
22+
callback(new Error('Blob not found'));
23+
});
24+
return;
25+
}
26+
27+
var meta = AuthFlow.getVaultClient(username);
28+
var encrypted_secret = $scope.userBlob.encrypted_secret;
29+
meta.client.unlock(meta.username, password, encrypted_secret, function(err, resp) {
30+
setImmediate(function() {
31+
$scope.$apply(function() {
32+
callback(err, resp);
33+
});
34+
});
35+
});
36+
};
37+
38+
AuthFlow.getVaultClient = function(username) {
39+
var meta = {username: username, domain: Options.domain};
40+
41+
var atSign = username.indexOf('@');
42+
if (atSign !== -1) {
43+
meta = {
44+
username: username.substring(0, atSign),
45+
domain: username.substring(atSign + 1)
46+
};
47+
}
48+
49+
meta.client = new rippleVaultClient.VaultClient(meta.domain);
50+
51+
return meta;
52+
};
53+
54+
return AuthFlow;
55+
}]);

src/js/services/authflowLocal.service.js

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)