diff --git a/README.rst b/README.rst index 0a62add..e1463b4 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,6 @@ About This project provides an implementation of a client-side (implicit grant) OAuth 2.0 authorization flow. - Features ======== @@ -37,7 +36,7 @@ Online Check out the demo by going to `example/demo.html via rawhithub.com`_. -.. _example/demo.html via rawhithub.com: https://rawgithub.com/enginous/angular-oauth/master/example/demo.html +.. _example/demo.html via rawhithub.com: https://rawgithub.com/angular-oauth/angular-oauth/master/example/demo.html Local diff --git a/component.json b/component.json index 5415b03..cc2ec68 100644 --- a/component.json +++ b/component.json @@ -4,9 +4,9 @@ "dependencies": { "angular": ">= 1.1.4" }, - "homepage": "https://github.com/enginous/angular-oauth", + "homepage": "https://github.com/angular-oauth/angular-oauth", "repository": { "type": "git", - "url": "git://github.com/enginous/angular-oauth.git" + "url": "git://github.com/angular-oauth/angular-oauth.git" } } diff --git a/src/js/angularOauth.js b/src/js/angularOauth.js index fb3c013..52fa055 100644 --- a/src/js/angularOauth.js +++ b/src/js/angularOauth.js @@ -76,6 +76,11 @@ angular.module('angularOauth', []). } }; + var buildAuthorizationUrl = function(extraParams) { + var params = angular.extend(getParams(), extraParams); + return config.authorizationEndpoint + '?' + objectToQueryString(params); + } + return { // TODO: get/set might want to support expiration to reauthenticate // TODO: check for localStorage support and otherwise perhaps use other methods of storing data (e.g. cookie) @@ -155,8 +160,7 @@ angular.module('angularOauth', []). }, popupOptions); var deferred = $q.defer(), - params = angular.extend(getParams(), extraParams), - url = config.authorizationEndpoint + '?' + objectToQueryString(params), + url = buildAuthorizationUrl(extraParams), resolved = false; var formatPopupOptions = function(options) { @@ -191,6 +195,10 @@ angular.module('angularOauth', []). // TODO: reject deferred if the popup was closed without a message being delivered + maybe offer a timeout return deferred.promise; + }, + getTokenInSameWindow: function(extraParams) { + var url = buildAuthorizationUrl(extraParams); + $window.location.href = url; } } }