mirror of
https://github.com/bitwarden/browser.git
synced 2024-10-05 05:17:40 +02:00
extension appsettings with runtime loadable props
This commit is contained in:
parent
0271c223a6
commit
4c46317f24
@ -71,7 +71,8 @@ gulp.task('min:js', ['clean:js'], function () {
|
|||||||
'!' + paths.minJs,
|
'!' + paths.minJs,
|
||||||
'!' + paths.jsDir + 'fallback*.js',
|
'!' + paths.jsDir + 'fallback*.js',
|
||||||
'!' + paths.jsDir + 'u2f-connector.js',
|
'!' + paths.jsDir + 'u2f-connector.js',
|
||||||
'!' + paths.jsDir + 'duo.js'
|
'!' + paths.jsDir + 'duo.js',
|
||||||
|
'!' + paths.jsDir + 'settings.js'
|
||||||
], { base: '.' })
|
], { base: '.' })
|
||||||
.pipe(concat(paths.concatJsDest))
|
.pipe(concat(paths.concatJsDest))
|
||||||
.pipe(uglify())
|
.pipe(uglify())
|
||||||
@ -332,6 +333,10 @@ gulp.task('dist:move', function () {
|
|||||||
src: paths.jsDir + 'duo.js',
|
src: paths.jsDir + 'duo.js',
|
||||||
dest: paths.dist + 'js'
|
dest: paths.dist + 'js'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
src: paths.jsDir + 'settings.js',
|
||||||
|
dest: paths.dist + 'js'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
src: paths.jsDir + 'bw.min.js',
|
src: paths.jsDir + 'bw.min.js',
|
||||||
dest: paths.dist + 'js'
|
dest: paths.dist + 'js'
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
"apiUri": "https://preview-api.bitwarden.com",
|
"apiUri": "https://preview-api.bitwarden.com",
|
||||||
"identityUri": "https://preview-identity.bitwarden.com",
|
"identityUri": "https://preview-identity.bitwarden.com",
|
||||||
"stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
|
"stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
|
||||||
"braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2"
|
"braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2",
|
||||||
|
"whitelistDomains": [
|
||||||
|
"preview-api.bitwarden.com"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
"apiUri": "https://api.bitwarden.com",
|
"apiUri": "https://api.bitwarden.com",
|
||||||
"identityUri": "https://identity.bitwarden.com",
|
"identityUri": "https://identity.bitwarden.com",
|
||||||
"stripeKey": "pk_live_bpN0P37nMxrMQkcaHXtAybJk",
|
"stripeKey": "pk_live_bpN0P37nMxrMQkcaHXtAybJk",
|
||||||
"braintreeKey": "production_qfbsv8kc_njj2zjtyngtjmbjd"
|
"braintreeKey": "production_qfbsv8kc_njj2zjtyngtjmbjd",
|
||||||
|
"whitelistDomains": [
|
||||||
|
"api.bitwarden.com"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
"apiUri": "http://localhost:4000",
|
"apiUri": "http://localhost:4000",
|
||||||
"identityUri": "http://localhost:33656",
|
"identityUri": "http://localhost:33656",
|
||||||
"stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
|
"stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD",
|
||||||
"braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2"
|
"braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2",
|
||||||
|
"whitelistDomains": [
|
||||||
|
"localhost"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,11 +3,13 @@ angular
|
|||||||
|
|
||||||
.config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, jwtOptionsProvider,
|
.config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, jwtOptionsProvider,
|
||||||
$uibTooltipProvider, toastrConfig, $locationProvider, $qProvider, stripeProvider, appSettings) {
|
$uibTooltipProvider, toastrConfig, $locationProvider, $qProvider, stripeProvider, appSettings) {
|
||||||
|
angular.extend(appSettings, window.bitwardenAppSettings);
|
||||||
|
|
||||||
$qProvider.errorOnUnhandledRejections(false);
|
$qProvider.errorOnUnhandledRejections(false);
|
||||||
$locationProvider.hashPrefix('');
|
$locationProvider.hashPrefix('');
|
||||||
jwtOptionsProvider.config({
|
jwtOptionsProvider.config({
|
||||||
urlParam: 'access_token3',
|
urlParam: 'access_token3',
|
||||||
whiteListedDomains: ['api.bitwarden.com', 'preview-api.bitwarden.com', 'localhost', '192.168.1.3']
|
whiteListedDomains: appSettings.whitelistDomains
|
||||||
});
|
});
|
||||||
var refreshPromise;
|
var refreshPromise;
|
||||||
jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (options, tokenService, authService) {
|
jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (options, tokenService, authService) {
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
angular.module("bit")
|
angular.module("bit")
|
||||||
.constant("appSettings", {"apiUri":"https://api.bitwarden.com","identityUri":"https://identity.bitwarden.com","stripeKey":"pk_live_bpN0P37nMxrMQkcaHXtAybJk","braintreeKey":"production_qfbsv8kc_njj2zjtyngtjmbjd","version":"1.14.3","environment":"Production"});
|
.constant("appSettings", {"apiUri":"https://api.bitwarden.com","identityUri":"https://identity.bitwarden.com","stripeKey":"pk_live_bpN0P37nMxrMQkcaHXtAybJk","braintreeKey":"production_qfbsv8kc_njj2zjtyngtjmbjd","whitelistDomains":["api.bitwarden.com"],"version":"1.14.3","environment":"Production"});
|
||||||
|
@ -85,6 +85,7 @@
|
|||||||
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"
|
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"
|
||||||
integrity="sha384-AH/e+s4V4kUifvnNED2x1XZqArO5qTFU4YKRzUXbz4IgPG1H0Xmz6fP1XUmO4vT/" crossorigin="anonymous"></script>
|
integrity="sha384-AH/e+s4V4kUifvnNED2x1XZqArO5qTFU4YKRzUXbz4IgPG1H0Xmz6fP1XUmO4vT/" crossorigin="anonymous"></script>
|
||||||
<script src="js/fallback-scripts.min.js?v=<!-- @echo cacheTag !>"></script>
|
<script src="js/fallback-scripts.min.js?v=<!-- @echo cacheTag !>"></script>
|
||||||
|
<script src="js/settings.js?v=<!-- @echo cacheTag !>"></script>
|
||||||
|
|
||||||
<script src="js/lib.min.js?v=<!-- @echo cacheTag !>"></script>
|
<script src="js/lib.min.js?v=<!-- @echo cacheTag !>"></script>
|
||||||
<script src="js/bw.min.js?v=<!-- @echo cacheTag !>"></script>
|
<script src="js/bw.min.js?v=<!-- @echo cacheTag !>"></script>
|
||||||
@ -102,6 +103,7 @@
|
|||||||
<script src="lib/clipboard/clipboard.js"></script>
|
<script src="lib/clipboard/clipboard.js"></script>
|
||||||
<script src="js/duo.js"></script>
|
<script src="js/duo.js"></script>
|
||||||
<script src="js/webcrypto-shim.js"></script>
|
<script src="js/webcrypto-shim.js"></script>
|
||||||
|
<script src="js/settings.js"></script>
|
||||||
|
|
||||||
<script src="lib/angular/angular.js"></script>
|
<script src="lib/angular/angular.js"></script>
|
||||||
<script src="lib/angular-promise-polyfill/index.js"></script>
|
<script src="lib/angular-promise-polyfill/index.js"></script>
|
||||||
|
1
src/js/settings.js
Normal file
1
src/js/settings.js
Normal file
@ -0,0 +1 @@
|
|||||||
|
var bitwardenAppSettings = {};
|
Loading…
Reference in New Issue
Block a user