Skip to content
Snippets Groups Projects
Commit 3acc0153 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[enh] Manage #/app/home?uri= to parse g1:// link

parent 690173da
No related branches found
No related tags found
No related merge requests found
Pipeline #9494 failed
Hide whitespace changes
Inline Side-by-side
www/index.html
+ 1
− 0
View file @ 3acc0153
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
<!-- controllers --> <!-- controllers -->
<script src="dist/dist_js/app/controllers/app-controllers.js"></script> <script src="dist/dist_js/app/controllers/app-controllers.js"></script>
<script src="dist/dist_js/app/controllers/home-controllers.js"></script>
<script src="dist/dist_js/app/controllers/join-controllers.js"></script> <script src="dist/dist_js/app/controllers/join-controllers.js"></script>
<script src="dist/dist_js/app/controllers/login-controllers.js"></script> <script src="dist/dist_js/app/controllers/login-controllers.js"></script>
<script src="dist/dist_js/app/controllers/help-controllers.js"></script> <script src="dist/dist_js/app/controllers/help-controllers.js"></script>
......
www/js/controllers.js
+ 1
− 0
View file @ 3acc0153
angular.module('cesium.controllers', [ angular.module('cesium.controllers', [
'cesium.app.controllers', 'cesium.app.controllers',
'cesium.home.controllers',
'cesium.join.controllers', 'cesium.join.controllers',
'cesium.login.controllers', 'cesium.login.controllers',
'cesium.help.controllers', 'cesium.help.controllers',
......
www/js/controllers/app-controllers.js
+ 0
− 169
View file @ 3acc0153
...@@ -15,16 +15,6 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services']) ...@@ -15,16 +15,6 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services'])
} }
}) })
.state('app.home', {
url: "/home?error",
views: {
'menuContent': {
templateUrl: "templates/home/home.html",
controller: 'HomeCtrl'
}
}
})
.state('app.lock', { .state('app.lock', {
cache: false, cache: false,
url: "/lock", url: "/lock",
...@@ -37,15 +27,10 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services']) ...@@ -37,15 +27,10 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services'])
}) })
; ;
// if none of the above states are matched, use this as the fallback
$urlRouterProvider.otherwise('/app/home');
}) })
.controller('AppCtrl', AppController) .controller('AppCtrl', AppController)
.controller('HomeCtrl', HomeController)
.controller('PluginExtensionPointCtrl', PluginExtensionPointController) .controller('PluginExtensionPointCtrl', PluginExtensionPointController)
; ;
...@@ -525,157 +510,3 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ ...@@ -525,157 +510,3 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
$scope.askFullscreen(); $scope.askFullscreen();
// endRemoveIf(device) // endRemoveIf(device)
} }
function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $http, UIUtils,
csConfig, csCache, csPlatform, csCurrency, csSettings) {
'ngInject';
$scope.loading = true;
$scope.locales = angular.copy(csSettings.locales);
$scope.smallscreen = UIUtils.screen.isSmall();
$scope.showInstallHelp = false;
$scope.enter = function(e, state) {
if (ionic.Platform.isIOS()) {
if(window.StatusBar) {
// needed to fix Xcode 9 / iOS 11 issue with blank space at bottom of webview
// https://github.com/meteor/meteor/issues/9041
StatusBar.overlaysWebView(false);
StatusBar.overlaysWebView(true);
}
}
if (state && state.stateParams && state.stateParams.error) { // Error query parameter
$scope.error = state.stateParams.error;
$scope.node = csCurrency.data.node;
$scope.loading = false;
$ionicHistory.nextViewOptions({
disableAnimate: true,
disableBack: true,
historyRoot: true
});
$state.go('app.home', {error: undefined}, {
reload: false,
inherit: true,
notify: false});
}
else {
// Wait platform to be ready
csPlatform.ready()
.then(function() {
$scope.loading = false;
$scope.loadFeeds();
})
.catch(function(err) {
$scope.node = csCurrency.data.node;
$scope.loading = false;
$scope.error = err;
});
}
};
$scope.$on('$ionicView.enter', $scope.enter);
$scope.reload = function() {
$scope.loading = true;
delete $scope.error;
$timeout($scope.enter, 200);
};
$scope.loadFeeds = function() {
var feedUrl = csSettings.getFeedUrl();
if (!feedUrl || typeof feedUrl !== 'string') return; // Skip
var maxContentLength = (csConfig.feed && csConfig.feed.maxContentLength) || 650;
var now = Date.now();
console.debug("[home] Loading feeds from {0}...".format(feedUrl));
$http.get(feedUrl, {responseType: 'json', cache: csCache.get(null, csCache.constants.LONG)})
.success(function(feed) {
console.debug('[home] Feeds loaded in {0}ms'.format(Date.now()-now));
if (!feed || !feed.items || !feed.items.length) return; // skip if empty
feed.items = feed.items.reduce(function(res, item) {
if (!item || (!item.title && !item.content_text && !item.content_html)) return res; // Skip
// Convert UTC time
if (item.date_published) {
item.time = moment.utc(item.date_published).unix();
}
// Convert content to HTML
if (item.content_html) {
item.content = item.content_html;
}
else {
item.content = (item.content_text||'').replace(/\n/g, '<br/>');
}
// Trunc content, if need
if (maxContentLength !== -1 && item.content && item.content.length > maxContentLength) {
var endIndex = Math.max(item.content.lastIndexOf(" ", maxContentLength), item.content.lastIndexOf("<", maxContentLength));
item.content = item.content.substr(0, endIndex) + ' (...)';
item.truncated = true;
}
// If author is missing, copy the main author
item.author = item.author || feed.author;
return res.concat(item);
}, []);
$scope.feed = feed;
})
.error(function(data, status) {
console.error('[home] Failed to load feeds.');
$scope.feed = null;
});
};
/**
* Catch click for quick fix
* @param event
*/
$scope.doQuickFix = function(action) {
if (action === 'settings') {
$ionicHistory.nextViewOptions({
historyRoot: true
});
$state.go('app.settings');
}
};
$scope.changeLanguage = function(langKey) {
$translate.use(langKey);
$scope.hideLocalesPopover();
csSettings.data.locale = _.findWhere($scope.locales, {id: langKey});
csSettings.store();
$scope.loadFeeds();
};
/* -- show/hide locales popup -- */
$scope.showLocalesPopover = function(event) {
UIUtils.popover.show(event, {
templateUrl: 'templates/common/popover_locales.html',
scope: $scope,
autoremove: true,
afterShow: function(popover) {
$scope.localesPopover = popover;
}
});
};
$scope.hideLocalesPopover = function() {
if ($scope.localesPopover) {
$scope.localesPopover.hide();
$scope.localesPopover = null;
}
};
// For DEV ONLY
/*$timeout(function() {
$scope.loginAndGo();
}, 500);*/
}
www/js/controllers/home-controllers.js 0 → 100644
+ 226
− 0
View file @ 3acc0153
angular.module('cesium.home.controllers', ['cesium.platform', 'cesium.services'])
.config(function($stateProvider, $urlRouterProvider) {
'ngInject';
$stateProvider
.state('app.home', {
url: "/home?error&uri",
views: {
'menuContent': {
templateUrl: "templates/home/home.html",
controller: 'HomeCtrl'
}
}
})
;
// if none of the above states are matched, use this as the fallback
$urlRouterProvider.otherwise('/app/home');
})
.controller('HomeCtrl', HomeController)
;
function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $http, UIUtils,
csConfig, csCache, csPlatform, csCurrency, csSettings, csHttp) {
'ngInject';
$scope.loading = true;
$scope.locales = angular.copy(csSettings.locales);
$scope.smallscreen = UIUtils.screen.isSmall();
$scope.showInstallHelp = false;
$scope.enter = function(e, state) {
if (ionic.Platform.isIOS()) {
if(window.StatusBar) {
// needed to fix Xcode 9 / iOS 11 issue with blank space at bottom of webview
// https://github.com/meteor/meteor/issues/9041
StatusBar.overlaysWebView(false);
StatusBar.overlaysWebView(true);
}
}
if (state && state.stateParams && state.stateParams.uri) {
return $scope.redirectFromUri(state.stateParams.uri);
}
else if (state && state.stateParams && state.stateParams.error) { // Error query parameter
$scope.error = state.stateParams.error;
$scope.node = csCurrency.data.node;
$scope.loading = false;
$ionicHistory.nextViewOptions({
disableAnimate: true,
disableBack: true,
historyRoot: true
});
$state.go('app.home', {error: undefined}, {
reload: false,
inherit: true,
notify: false});
}
else {
// Wait platform to be ready
csPlatform.ready()
.then(function() {
$scope.loading = false;
$scope.loadFeeds();
})
.catch(function(err) {
$scope.node = csCurrency.data.node;
$scope.loading = false;
$scope.error = err;
});
}
};
$scope.$on('$ionicView.enter', $scope.enter);
$scope.reload = function() {
$scope.loading = true;
delete $scope.error;
$timeout($scope.enter, 200);
};
$scope.loadFeeds = function() {
var feedUrl = csSettings.getFeedUrl();
if (!feedUrl || typeof feedUrl !== 'string') return; // Skip
var maxContentLength = (csConfig.feed && csConfig.feed.maxContentLength) || 650;
var now = Date.now();
console.debug("[home] Loading feeds from {0}...".format(feedUrl));
$http.get(feedUrl, {responseType: 'json', cache: csCache.get(null, csCache.constants.LONG)})
.success(function(feed) {
console.debug('[home] Feeds loaded in {0}ms'.format(Date.now()-now));
if (!feed || !feed.items || !feed.items.length) return; // skip if empty
feed.items = feed.items.reduce(function(res, item) {
if (!item || (!item.title && !item.content_text && !item.content_html)) return res; // Skip
// Convert UTC time
if (item.date_published) {
item.time = moment.utc(item.date_published).unix();
}
// Convert content to HTML
if (item.content_html) {
item.content = item.content_html;
}
else {
item.content = (item.content_text||'').replace(/\n/g, '<br/>');
}
// Trunc content, if need
if (maxContentLength !== -1 && item.content && item.content.length > maxContentLength) {
var endIndex = Math.max(item.content.lastIndexOf(" ", maxContentLength), item.content.lastIndexOf("<", maxContentLength));
item.content = item.content.substr(0, endIndex) + ' (...)';
item.truncated = true;
}
// If author is missing, copy the main author
item.author = item.author || feed.author;
return res.concat(item);
}, []);
$scope.feed = feed;
})
.error(function(data, status) {
console.error('[home] Failed to load feeds.');
$scope.feed = null;
});
};
/**
* Catch click for quick fix
* @param action
*/
$scope.doQuickFix = function(action) {
if (action === 'settings') {
$ionicHistory.nextViewOptions({
historyRoot: true
});
$state.go('app.settings');
}
};
$scope.changeLanguage = function(langKey) {
$translate.use(langKey);
$scope.hideLocalesPopover();
csSettings.data.locale = _.findWhere($scope.locales, {id: langKey});
csSettings.store();
$scope.loadFeeds();
};
/* -- show/hide locales popup -- */
$scope.showLocalesPopover = function(event) {
UIUtils.popover.show(event, {
templateUrl: 'templates/common/popover_locales.html',
scope: $scope,
autoremove: true,
afterShow: function(popover) {
$scope.localesPopover = popover;
}
});
};
$scope.hideLocalesPopover = function() {
if ($scope.localesPopover) {
$scope.localesPopover.hide();
$scope.localesPopover = null;
}
};
/**
* Parse an URI (see g1lien)
* @param uri
* @returns {*}
*/
$scope.redirectFromUri = function(uri) {
console.debug("[home] Detecting external uri: ", uri);
var parts = csHttp.uri.parse(uri);
if (parts.protocol === 'g1:') {
console.debug("[home] Applying g1 uri...", parts);
// Transfer
if (parts.hostname && parts.search.indexOf('amount=') !== -1) {
return $state.go('app.new_transfer_pubkey', {
pubkey: parts.hostname
});
}
// Pubkey
else if (parts.hostname && BMA.regexp.PUBKEY.test(parts.hostname)) {
var pubkey = parts.hostname;
return $state.go('app.wot_identity', {
pubkey: pubkey
});
}
// Search by uid
else if (parts.hostname && BMA.regexp.USER_ID.test(parts.hostname)) {
var uid = parts.hostname;
return $state.go('app.wot_lookup.tab_search', {
q: uid
});
}
}
else {
console.error("[home] Unknown protocol, in URI: " + uri);
}
// Redirect to home
return $state.go('app.home');
}
// For DEV ONLY
/*$timeout(function() {
$scope.loginAndGo();
}, 500);*/
}
www/js/platform.js
+ 12
− 0
View file @ 3acc0153
...@@ -229,6 +229,16 @@ angular.module('cesium.platform', ['ngIdle', 'cesium.config', 'cesium.services'] ...@@ -229,6 +229,16 @@ angular.module('cesium.platform', ['ngIdle', 'cesium.config', 'cesium.services']
return $q.when(); return $q.when();
} }
function registerProtocol() {
console.debug("[platform] Register protocol g1://")
try {
navigator.registerProtocolHandler("web+june", "#/app/home?uri=%s", "Cesium");
}
catch(err) {
console.error(err)
}
}
function addListeners() { function addListeners() {
listeners = [ listeners = [
// Listen if node changed // Listen if node changed
...@@ -261,6 +271,8 @@ angular.module('cesium.platform', ['ngIdle', 'cesium.config', 'cesium.services'] ...@@ -261,6 +271,8 @@ angular.module('cesium.platform', ['ngIdle', 'cesium.config', 'cesium.services']
// Avoid change state // Avoid change state
disableChangeState(); disableChangeState();
registerProtocol();
// We use 'ionicReady()' instead of '$ionicPlatform.ready()', because this one is callable many times // We use 'ionicReady()' instead of '$ionicPlatform.ready()', because this one is callable many times
startPromise = ionicReady() startPromise = ionicReady()
......
www/js/services/http-services.js
+ 5
− 3
View file @ 3acc0153
...@@ -318,9 +318,11 @@ angular.module('cesium.http.services', ['cesium.cache.services']) ...@@ -318,9 +318,11 @@ angular.module('cesium.http.services', ['cesium.cache.services'])
// See doc : https://gist.github.com/jlong/2428561 // See doc : https://gist.github.com/jlong/2428561
function parseUri(uri) { function parseUri(uri) {
var protocol; var protocol;
if (uri.startsWith('duniter://')) {
protocol = 'duniter'; // G1 URI (see G1lien)
uri = uri.replace('duniter://', 'http://'); if (uri.startsWith('web+june://') || uri.startsWith('g1://')) {
protocol = 'g1:';
uri = uri.replace(/^(g1|web+june):\/\//, 'http:');
} }
var parser = document.createElement('a'); var parser = document.createElement('a');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment