Skip to content

O
origin-web-common
Unverified Commit 68c2c767 by Sam Padgett Committed by GitHub
Options

Merge pull request #267 from benjaminapetersen/trello/api-groups/oAuthAccessTokens 

Add oauthaccesstokens to API_PREFERRED_VERSIONS, update deleteTokenLogoutService
parents 6777e1b8 e10a1fa8
Showing with 37 additions and 14 deletions
dist/origin-web-common-services.js
......@@ -2812,9 +2812,11 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
angular.module('openshiftCommonServices')
.provider('DeleteTokenLogoutService', function() {
this.$get = function($q, $injector, Logger) {
this.$get = function(
$q,
$injector,
Logger) {
var authLogger = Logger.get("auth");
return {
logout: function(user, token) {
authLogger.log("DeleteTokenLogoutService.logout()", user, token);
......@@ -2825,13 +2827,16 @@ angular.module('openshiftCommonServices')
return $q.when({});
}
// Lazily get the data service. Can't explicitly depend on it or we get circular dependencies.
// Lazy load services to eliminate circular dependencies.
var APIService = $injector.get('APIService');
var DataService = $injector.get('DataService');
var oAuthAccessTokensVersion = APIService.getPreferredVersion('oauthaccesstokens');
// Use the token to delete the token
// Never trigger a login when deleting our token
var opts = {http: {auth: {token: token, triggerLogin: false}}};
// TODO: Change this to return a promise that "succeeds" even if the token delete fails?
return DataService.delete("oauthaccesstokens", token, {}, opts);
return DataService.delete(oAuthAccessTokensVersion, token, {}, opts);
},
};
};
......@@ -3793,6 +3798,7 @@ angular.module('openshiftCommonServices')
imagestreamimages: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamimages' },
imagestreamimports: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamimports' },
limitranges: {version: 'v1', resource: 'limitranges' },
oauthaccesstokens: {group: 'oauth.openshift.io', version: 'v1', resource: 'oauthaccesstokens' },
pods: {version: 'v1', resource: 'pods' },
'pods/log': {version: 'v1', resource: 'pods/log' },
processedtemplates: {group: 'template.openshift.io', version: 'v1', resource: 'processedtemplates' },
......
dist/origin-web-common.js
......@@ -1441,6 +1441,7 @@ angular.module('openshiftCommonServices')
imagestreamimages: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamimages' },
imagestreamimports: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamimports' },
limitranges: {version: 'v1', resource: 'limitranges' },
oauthaccesstokens: {group: 'oauth.openshift.io', version: 'v1', resource: 'oauthaccesstokens' },
pods: {version: 'v1', resource: 'pods' },
'pods/log': {version: 'v1', resource: 'pods/log' },
processedtemplates: {group: 'template.openshift.io', version: 'v1', resource: 'processedtemplates' },
......@@ -4862,9 +4863,11 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
angular.module('openshiftCommonServices')
.provider('DeleteTokenLogoutService', function() {
this.$get = ["$q", "$injector", "Logger", function($q, $injector, Logger) {
this.$get = ["$q", "$injector", "Logger", function(
$q,
$injector,
Logger) {
var authLogger = Logger.get("auth");
return {
logout: function(user, token) {
authLogger.log("DeleteTokenLogoutService.logout()", user, token);
......@@ -4875,13 +4878,16 @@ angular.module('openshiftCommonServices')
return $q.when({});
}
// Lazily get the data service. Can't explicitly depend on it or we get circular dependencies.
// Lazy load services to eliminate circular dependencies.
var APIService = $injector.get('APIService');
var DataService = $injector.get('DataService');
var oAuthAccessTokensVersion = APIService.getPreferredVersion('oauthaccesstokens');
// Use the token to delete the token
// Never trigger a login when deleting our token
var opts = {http: {auth: {token: token, triggerLogin: false}}};
// TODO: Change this to return a promise that "succeeds" even if the token delete fails?
return DataService.delete("oauthaccesstokens", token, {}, opts);
return DataService.delete(oAuthAccessTokensVersion, token, {}, opts);
},
};
}];
......
dist/origin-web-common.min.js
......@@ -584,6 +584,11 @@ limitranges:{
version:"v1",
resource:"limitranges"
},
oauthaccesstokens:{
group:"oauth.openshift.io",
version:"v1",
resource:"oauthaccesstokens"
},
pods:{
version:"v1",
resource:"pods"
......@@ -2149,7 +2154,7 @@ var authLogger = Logger.get("auth");
return {
logout:function(user, token) {
if (authLogger.log("DeleteTokenLogoutService.logout()", user, token), !token) return authLogger.log("DeleteTokenLogoutService, no token, returning immediately"), $q.when({});
var DataService = $injector.get("DataService"), opts = {
var APIService = $injector.get("APIService"), DataService = $injector.get("DataService"), oAuthAccessTokensVersion = APIService.getPreferredVersion("oauthaccesstokens"), opts = {
http:{
auth:{
token:token,
......@@ -2157,7 +2162,7 @@ triggerLogin:!1
}
}
};
return DataService["delete"]("oauthaccesstokens", token, {}, opts);
return DataService["delete"](oAuthAccessTokensVersion, token, {}, opts);
}
};
} ];
......
src/constants/apiPreferredVersions.js
......@@ -25,6 +25,7 @@ angular.module('openshiftCommonServices')
imagestreamimages: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamimages' },
imagestreamimports: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamimports' },
limitranges: {version: 'v1', resource: 'limitranges' },
oauthaccesstokens: {group: 'oauth.openshift.io', version: 'v1', resource: 'oauthaccesstokens' },
pods: {version: 'v1', resource: 'pods' },
'pods/log': {version: 'v1', resource: 'pods/log' },
processedtemplates: {group: 'template.openshift.io', version: 'v1', resource: 'processedtemplates' },
......
src/services/deleteTokenLogoutService.js
......@@ -4,9 +4,11 @@
angular.module('openshiftCommonServices')
.provider('DeleteTokenLogoutService', function() {
this.$get = function($q, $injector, Logger) {
this.$get = function(
$q,
$injector,
Logger) {
var authLogger = Logger.get("auth");
return {
logout: function(user, token) {
authLogger.log("DeleteTokenLogoutService.logout()", user, token);
......@@ -17,13 +19,16 @@ angular.module('openshiftCommonServices')
return $q.when({});
}
// Lazily get the data service. Can't explicitly depend on it or we get circular dependencies.
// Lazy load services to eliminate circular dependencies.
var APIService = $injector.get('APIService');
var DataService = $injector.get('DataService');
var oAuthAccessTokensVersion = APIService.getPreferredVersion('oauthaccesstokens');
// Use the token to delete the token
// Never trigger a login when deleting our token
var opts = {http: {auth: {token: token, triggerLogin: false}}};
// TODO: Change this to return a promise that "succeeds" even if the token delete fails?
return DataService.delete("oauthaccesstokens", token, {}, opts);
return DataService.delete(oAuthAccessTokensVersion, token, {}, opts);
},
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment