Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-17 15:37:57 +01:00
Code Issues Projects Releases Wiki Activity

new identity server uri for auth

Browse Source
This commit is contained in:
Kyle Spearrin 2017-05-06 21:32:51 -04:00
parent 21ca3abc7e
commit 20e958b1ee
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
settings.Preview.json
View File

@ -1,5 +1,6 @@
{
"appSettings": {
"apiUri": "https://preview-api.bitwarden.com"
"apiUri": "https://preview-api.bitwarden.com",
"identityUri": "https://preview-identity.bitwarden.com"
}
}

7
settings.Production.json
View File

@ -1,5 +1,6 @@
{
"appSettings": {
"apiUri": "https://api.bitwarden.com"
}
"appSettings": {
"apiUri": "https://api.bitwarden.com",
"identityUri": "https://identity.bitwarden.com"
}
}

3
settings.json
View File

@ -1,5 +1,6 @@
{
"appSettings": {
"apiUri": "http://localhost:4000"
"apiUri": "http://localhost:4000",
"identityUri": "http://localhost:33656"
}
}

2
src/app/config.js
View File

@ -6,7 +6,7 @@ angular
$qProvider.errorOnUnhandledRejections(false);
$locationProvider.hashPrefix('');
jwtOptionsProvider.config({
urlParam: 'access_token2',
urlParam: 'access_token3',
whiteListedDomains: ['api.bitwarden.com', 'preview-api.bitwarden.com', 'localhost', '192.168.1.8']
});
var refreshPromise;

7
src/app/services/apiService.js
View File

@ -3,7 +3,8 @@
.factory('apiService', function ($resource, tokenService, appSettings, $httpParamSerializer) {
var _service = {},
_apiUri = appSettings.apiUri;
_apiUri = appSettings.apiUri,
_identityUri = appSettings.identityUri;
_service.logins = $resource(_apiUri + '/logins/:id', {}, {
get: { method: 'GET', params: { id: '@id' } },
@ -108,9 +109,9 @@
getPublicKey: { url: _apiUri + '/users/:id/public-key', method: 'GET', params: { id: '@id' } }
});
_service.identity = $resource(_apiUri + '/connect', {}, {
_service.identity = $resource(_identityUri + '/connect', {}, {
token: {
url: _apiUri + '/connect/token',
url: _identityUri + '/connect/token',
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8' },
transformRequest: transformUrlEncoded,

2
src/app/settings.js
View File

@ -1,2 +1,2 @@
angular.module("bit")
.constant("appSettings", {"apiUri":"https://api.bitwarden.com","version":"1.10.0","environment":"Production"});
.constant("appSettings", {"apiUri":"https://api.bitwarden.com","identityUri":"https://identity.bitwarden.com","version":"1.10.0","environment":"Production"});