oidc

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.kontur.diadoc</groupId>
     <artifactId>diadocsdk</artifactId>
-    <version>3.26.1</version>
+    <version>3.27.0</version>
 
     <packaging>jar</packaging>
 

src/main/java/Diadoc/Api/DiadocApi.java

@@ -2,6 +2,9 @@
 
 import Diadoc.Api.auth.AuthManager;
 import Diadoc.Api.auth.AuthenticateClient;
+import Diadoc.Api.auth.IAuthManager;
+import Diadoc.Api.auth.oidc.OidcAuthManager;
+import Diadoc.Api.auth.oidc.TokenProvider;
 import Diadoc.Api.counteragent.CounteragentClient;
 import Diadoc.Api.counteragentGroup.CounteragentGroupClient;
 import Diadoc.Api.department.DepartmentClient;
@@ -56,12 +59,20 @@ public class DiadocApi {
     private final DiadocHttpClient diadocHttpClient;
 
     public DiadocApi(String apiClientId, String url, @Nullable HttpHost proxyHost, @Nullable ConnectionSettings connectionSettings) {
+        this(new AuthManager(apiClientId), url, proxyHost, connectionSettings);
+    }
+
+    public DiadocApi(TokenProvider tokenProvider,  String url, @Nullable HttpHost proxyHost, @Nullable ConnectionSettings connectionSettings) {
+        this(new OidcAuthManager(tokenProvider), url, proxyHost, connectionSettings);
+    }
+
+    private DiadocApi(IAuthManager authManager, String url, @Nullable HttpHost proxyHost, @Nullable ConnectionSettings connectionSettings) {
         if (url == null) {
             throw new IllegalArgumentException("url");
         }
-        authManager = new AuthManager(apiClientId);
+        this.authManager = authManager instanceof AuthManager ? (AuthManager) authManager : null;
         diadocHttpClient = new DiadocHttpClient(authManager.getCredentialsProvider(), url, proxyHost, connectionSettings);
-        authClient = new AuthenticateClient(authManager, diadocHttpClient);
+        authClient = authManager.createAuthenticateClient(diadocHttpClient);
         organizationClient = new OrganizationClient(diadocHttpClient);
         departmentClient = new DepartmentClient(diadocHttpClient);
         employeeClient = new EmployeeClient(diadocHttpClient);
@@ -83,7 +94,6 @@ public DiadocApi(String apiClientId, String url, @Nullable HttpHost proxyHost, @
         employeePowerOfAttorneyClient = new EmployeePowerOfAttorneyClient(diadocHttpClient);
         documentWorkflowClient = new DocumentWorkflowClient(diadocHttpClient);
         operatorClient = new OperatorClient(diadocHttpClient);
-        authManager.setCredentials(null);
     }
 
     public DiadocApi(String apiClientId, String url) {
@@ -183,6 +193,7 @@ public DocumentWorkflowClient getDocumentWorkflowClient() {
         return documentWorkflowClient;
     }
 
+    @Deprecated
     public AuthManager getAuthManager() {
         return authManager;
     }

src/main/java/Diadoc/Api/auth/AuthManager.java

@@ -1,20 +1,32 @@
 package Diadoc.Api.auth;
 
+import Diadoc.Api.helpers.Tools;
+import Diadoc.Api.httpClient.DiadocHttpClient;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 
-public class AuthManager {
-    private boolean isAuthenticated = false;
-    private String apiClientId;
-    private CredentialsProvider credentialsProvider;
+public class AuthManager implements IAuthManager {
+    private volatile boolean isAuthenticated;
+    private final String apiClientId;
+    private final CredentialsProvider credentialsProvider;
 
     public AuthManager(String apiClientId) {
+        if (Tools.isNullOrEmpty(apiClientId)) {
+            throw new IllegalArgumentException("ApiClientId cannot be empty or null");
+        }
         this.apiClientId = apiClientId;
+        isAuthenticated = false;
         credentialsProvider = new BasicCredentialsProvider();
         credentialsProvider.setCredentials(AuthScope.ANY, new DiadocCredentials(apiClientId, null));
     }
 
+    @Override
+    public AuthenticateClient createAuthenticateClient(DiadocHttpClient httpClient) {
+        return new AuthenticateClient(this, httpClient);
+    }
+
+    @Override
     public CredentialsProvider getCredentialsProvider() {
         return credentialsProvider;
     }
@@ -24,11 +36,11 @@ public boolean isAuthenticated() {
     }
 
     public void setCredentials(String authToken) {
-        isAuthenticated = (authToken != null);
+        isAuthenticated = authToken != null;
         credentialsProvider.setCredentials(AuthScope.ANY, new DiadocCredentials(apiClientId, authToken));
     }
 
-    public void clearCredentials(){
+    public void clearCredentials() {
         isAuthenticated = false;
         credentialsProvider.setCredentials(AuthScope.ANY, new DiadocCredentials(apiClientId, null));
     }

src/main/java/Diadoc/Api/auth/AuthenticateClient.java

@@ -21,8 +21,8 @@
 
 public class AuthenticateClient {
     private static final String V_3_AUTHENTICATE = "/V3/Authenticate";
-    private AuthManager authManager;
-    private DiadocHttpClient diadocHttpClient;
+    private final AuthManager authManager;
+    private final DiadocHttpClient diadocHttpClient;
 
     public AuthenticateClient(AuthManager authManager, DiadocHttpClient diadocHttpClient) {
         this.authManager = authManager;
@@ -142,4 +142,4 @@ public ExternalServiceAuthInfo getExternalServiceAuthInfo(String key) throws Dia
             throw new DiadocSdkException(ex);
         }
     }
-}
+}

src/main/java/Diadoc/Api/auth/CredentialsSchemeFactory.java

@@ -0,0 +1,25 @@
+package Diadoc.Api.auth;
+
+import Diadoc.Api.auth.oidc.DiadocOidcCredentials;
+import Diadoc.Api.auth.oidc.OidcAuthScheme;
+import org.apache.http.auth.AuthScheme;
+import org.apache.http.auth.Credentials;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+public class CredentialsSchemeFactory {
+
+    private static final Map<Class<? extends Credentials>, Supplier<AuthScheme>> SCHEME_SUPPLIERS = Map.of(
+            DiadocOidcCredentials.class, OidcAuthScheme::new,
+            DiadocCredentials.class, DiadocAuthScheme::new
+    );
+
+    public AuthScheme createScheme(Credentials credentials) {
+        Supplier<AuthScheme> schemeSupplier = SCHEME_SUPPLIERS.get(credentials.getClass());
+        if (schemeSupplier == null) {
+            throw new IllegalArgumentException("Unsupported credentials type: " + credentials.getClass().getName());
+        }
+        return schemeSupplier.get();
+    }
+}

src/main/java/Diadoc/Api/auth/DiadocAuthScheme.java

@@ -14,7 +14,7 @@
 @Contract()
 public class DiadocAuthScheme extends RFC2617Scheme {
 
-    private boolean complete;
+    private volatile boolean complete;
 
     /**
      * Default constructor for the Diadoc authentication scheme.
@@ -121,4 +121,4 @@ public static Header authenticate(final DiadocCredentials credentials) {
         return new BufferedHeader(buffer);
     }
 
-}
+}

src/main/java/Diadoc/Api/auth/DiadocPreemptiveAuthRequestInterceptor.java

@@ -3,6 +3,7 @@
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.auth.AuthScheme;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.AuthState;
 import org.apache.http.auth.Credentials;
@@ -13,6 +14,12 @@
 
 public class DiadocPreemptiveAuthRequestInterceptor implements HttpRequestInterceptor {
 
+    private final CredentialsSchemeFactory credentialsSchemeMapper;
+
+    public DiadocPreemptiveAuthRequestInterceptor() {
+        this.credentialsSchemeMapper = new CredentialsSchemeFactory();
+    }
+
     public void process(final HttpRequest request, final HttpContext context) {
         AuthState authState = (AuthState) context.getAttribute(HttpClientContext.TARGET_AUTH_STATE);
         // If no auth scheme has been initialized yet
@@ -24,8 +31,14 @@ public void process(final HttpRequest request, final HttpContext context) {
             Credentials credentials = credentialsProvider.getCredentials(authScope);
             // If found, generate BasicScheme preemptively
             if (credentials != null) {
-                authState.update(new DiadocAuthScheme(), credentials);
+               updateAuthState(authState, credentials);
             }
         }
     }
+
+    private void updateAuthState(AuthState authState, Credentials credentials) {
+        AuthScheme scheme = credentialsSchemeMapper.createScheme(credentials);
+        authState.update(scheme, credentials);
+    }
+
 }

src/main/java/Diadoc/Api/auth/IAuthManager.java

@@ -0,0 +1,11 @@
+package Diadoc.Api.auth;
+
+import Diadoc.Api.httpClient.DiadocHttpClient;
+import org.apache.http.client.CredentialsProvider;
+
+public interface IAuthManager {
+
+    AuthenticateClient createAuthenticateClient(DiadocHttpClient httpClient);
+
+    CredentialsProvider getCredentialsProvider();
+}

src/main/java/Diadoc/Api/auth/oidc/ContainerTokenProvider.java

@@ -0,0 +1,34 @@
+package Diadoc.Api.auth.oidc;
+
+import java.util.Objects;
+
+/**
+ * Default implementation
+ */
+public class ContainerTokenProvider implements TokenProvider {
+
+    private volatile String token;
+
+    @Override
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ContainerTokenProvider that = (ContainerTokenProvider) o;
+        return Objects.equals(token, that.token);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(token);
+    }
+
+}

src/main/java/Diadoc/Api/auth/oidc/DiadocOidcCredentials.java

@@ -0,0 +1,35 @@
+package Diadoc.Api.auth.oidc;
+
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.auth.BasicUserPrincipal;
+import org.apache.http.auth.Credentials;
+
+import java.security.Principal;
+
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
+public class DiadocOidcCredentials implements Credentials {
+
+    private final TokenProvider tokenProvider;
+    private final Principal userPrincipal;
+
+    public DiadocOidcCredentials(TokenProvider tokenProvider) {
+        this.tokenProvider = tokenProvider;
+        this.userPrincipal = new BasicUserPrincipal("DefaultUser");
+    }
+
+
+    public TokenProvider getTokenProvider() {
+        return tokenProvider;
+    }
+
+    @Override
+    public Principal getUserPrincipal() {
+        return userPrincipal;
+    }
+
+    @Override
+    public String getPassword() {
+        return "";
+    }
+}

src/main/java/Diadoc/Api/auth/oidc/OidcAuthManager.java

@@ -0,0 +1,37 @@
+package Diadoc.Api.auth.oidc;
+
+import Diadoc.Api.auth.AuthenticateClient;
+import Diadoc.Api.auth.IAuthManager;
+import Diadoc.Api.httpClient.DiadocHttpClient;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+
+import java.util.Objects;
+
+public class OidcAuthManager implements IAuthManager {
+
+    private final TokenProvider tokenProvider;
+    private final CredentialsProvider credentialsProvider;
+
+    public OidcAuthManager(TokenProvider tokenProvider) {
+        Objects.requireNonNull(tokenProvider, "tokenProvider cannot be null");
+        this.tokenProvider = tokenProvider;
+        credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY, new DiadocOidcCredentials(tokenProvider));
+    }
+
+    @Override
+    public AuthenticateClient createAuthenticateClient(DiadocHttpClient httpClient) {
+        return new OidcAuthenticateClient();
+    }
+
+    @Override
+    public CredentialsProvider getCredentialsProvider() {
+        return credentialsProvider;
+    }
+
+    public TokenProvider getTokenProvider() {
+        return tokenProvider;
+    }
+}