From f856163627d38daeb2d30ff41da7839cc609e9c7 Mon Sep 17 00:00:00 2001
From: Jeff Burke <Jeff.Burke@nrc-cnrc.gc.ca>
Date: Tue, 26 Jul 2016 09:27:25 -0700
Subject: [PATCH] s1849: updates for LocalAuthority constuctor taking a
Standard.
---
.../src/ca/nrc/cadc/auth/ACIdentityManager.java | 6 +++---
.../src/ca/nrc/cadc/auth/AuthenticatorImpl.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
index 64d1e612..b71fa1a9 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
@@ -110,7 +110,7 @@ public class ACIdentityManager implements IdentityManager
public NumericPrincipal run() throws Exception
{
LocalAuthority localAuth = new LocalAuthority();
- URI serviceURI = localAuth.getServiceURI("ums");
+ URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());
UserClient userClient = new UserClient(serviceURI);
User newUser = userClient.createUser(x500Principal);
@@ -206,7 +206,7 @@ public class ACIdentityManager implements IdentityManager
public Object run() throws Exception
{
LocalAuthority localAuth = new LocalAuthority();
- URI serviceURI = localAuth.getServiceURI("ums");
+ URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());
UserClient userClient = new UserClient(serviceURI);
userClient.augmentSubject(subject);
@@ -236,7 +236,7 @@ public class ACIdentityManager implements IdentityManager
{
RegistryClient regClient = new RegistryClient();
LocalAuthority localAuth = new LocalAuthority();
- URI serviceURI = localAuth.getServiceURI("gms");
+ URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());
URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);
// Hack to strip off the groups endpoint to get the base url of the service.
diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
index 11c3e6b1..190ee087 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
@@ -74,7 +74,7 @@ public class AuthenticatorImpl implements Authenticator
{
RegistryClient regClient = new RegistryClient();
LocalAuthority localAuth = new LocalAuthority();
- URI serviceURI = localAuth.getServiceURI("gms");
+ URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());
URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);
// Hack to strip off the groups endpoint to get the base url of the service.
--
GitLab