Skip to content

Commit

Permalink
second codestyle run
Browse files Browse the repository at this point in the history
it's early in the morning...forgive me

PR #3324
  • Loading branch information
David Steiman committed Apr 12, 2016
1 parent d7a296f commit eda2675
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
/*jshint camelcase: false */
config.headers = config.headers || {};
var token = $localStorage.authenticationToken || $sessionStorage.authenticationToken;
<% if (authenticationType == 'oauth2') { %>
<% if (authenticationType === 'oauth2') { %>
if (token && token.expires_at && token.expires_at > new Date().getTime()) {
config.headers.Authorization = 'Bearer ' + token.access_token;
}
<% } %><% if (authenticationType == 'jwt' || authenticationType == 'uaa') { %>
<% } %><% if (authenticationType === 'jwt' || authenticationType === 'uaa') { %>
if (token) {
config.headers.Authorization = 'Bearer ' + token;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Sessions.$inject = ['$resource'];

function Sessions ($resource) {
return $resource(<% if(authenticationType == 'uaa') { %>'<%= uaaBaseName %>/api/account/sessions/:series'<%} else { %>'api/account/sessions/:series'<% } %>, {}, {
return $resource(<% if(authenticationType === 'uaa') { %>'<%= uaaBaseName %>/api/account/sessions/:series'<%} else { %>'api/account/sessions/:series'<% } %>, {}, {
'getAll': { method: 'GET', isArray: true}
});
}
Expand Down
2 changes: 1 addition & 1 deletion generators/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ module.exports = JhipsterServerGenerator.extend({
message: function (response) {
return getNumberedQuestion('Which *type* of authentication would you like to use?', currentQuestion, totalQuestions, function (current) {
currentQuestion = current;
}, applicationType === 'monolith');
}, applicationType === 'gateway' || applicationType === 'microservice');
},
choices: [
{
Expand Down

0 comments on commit eda2675

Please sign in to comment.