Merge pull request #277 from Doha2012/master

minor fix
This commit is contained in:
Eugen 2015-11-10 22:22:11 +02:00
commit 60ea63f40e
6 changed files with 13 additions and 12 deletions

View File

@ -1,2 +1,2 @@
#server.contextPath=/resource server.contextPath=/spring-security-oauth-resource
#server.port=8081 server.port=8081

View File

@ -1 +1,2 @@
#server.contextPath=/server server.contextPath=/spring-security-oauth-server
server.port=8081

View File

@ -1,2 +1,2 @@
#server.context-path=/ui server.contextPath=/spring-security-oauth-ui-implicit
#server.port=8080 server.port=8081

View File

@ -10,9 +10,9 @@
<oauth <oauth
site="http://localhost:8080/spring-security-oauth-server" site="http://localhost:8081/spring-security-oauth-server"
client-id="clientId" client-id="clientId"
redirect-uri="http://localhost:8080/spring-security-oauth-ui-implicit/index" redirect-uri="http://localhost:8081/spring-security-oauth-ui-implicit/index"
scope="read" scope="read"
template="oauthTemp"> template="oauthTemp">
</oauth> </oauth>
@ -44,7 +44,7 @@ app.controller('mainCtrl', function($scope,$resource,$http) {
}); });
$scope.foo = {id:0 , name:"sample foo"}; $scope.foo = {id:0 , name:"sample foo"};
$scope.foos = $resource("http://localhost:8080/spring-security-oauth-resource/foos/:fooId",{fooId:'@id'}); $scope.foos = $resource("http://localhost:8081/spring-security-oauth-resource/foos/:fooId",{fooId:'@id'});
$scope.getFoo = function(){ $scope.getFoo = function(){
$scope.foo = $scope.foos.get({fooId:$scope.foo.id}); $scope.foo = $scope.foos.get({fooId:$scope.foo.id});

View File

@ -1,2 +1,2 @@
#server.context-path=/ui server.contextPath=/spring-security-oauth-ui-password
#server.port=8080 server.port=8081

View File

@ -22,7 +22,7 @@ var app = angular.module('myApp', ["ngResource","ngRoute","ngCookies"]);
app.controller('mainCtrl', function($scope,$resource,$http,$httpParamSerializer,$cookies) { app.controller('mainCtrl', function($scope,$resource,$http,$httpParamSerializer,$cookies) {
$scope.foo = {id:0 , name:"sample foo"}; $scope.foo = {id:0 , name:"sample foo"};
$scope.foos = $resource("http://localhost:8080/spring-security-oauth-resource/foos/:fooId",{fooId:'@id'}); $scope.foos = $resource("http://localhost:8081/spring-security-oauth-resource/foos/:fooId",{fooId:'@id'});
$scope.getFoo = function(){ $scope.getFoo = function(){
$scope.foo = $scope.foos.get({fooId:$scope.foo.id}); $scope.foo = $scope.foos.get({fooId:$scope.foo.id});
@ -50,7 +50,7 @@ app.controller('mainCtrl', function($scope,$resource,$http,$httpParamSerializer,
$scope.login = function() { $scope.login = function() {
var req = { var req = {
method: 'POST', method: 'POST',
url: "http://localhost:8080/spring-security-oauth-server/oauth/token", url: "http://localhost:8081/spring-security-oauth-server/oauth/token",
headers: { headers: {
"Authorization": "Basic " + $scope.encoded, "Authorization": "Basic " + $scope.encoded,
"Content-type": "application/x-www-form-urlencoded; charset=utf-8" "Content-type": "application/x-www-form-urlencoded; charset=utf-8"