From afc64b0eb85051b85c2978e7d51fb4d50448ee35 Mon Sep 17 00:00:00 2001 From: siddhijain Date: Mon, 10 Oct 2022 16:46:59 -0500 Subject: [PATCH 1/6] plugins for GPG signing --- msal4j-brokers/pom.xml | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/msal4j-brokers/pom.xml b/msal4j-brokers/pom.xml index 5365e49e..b5903fef 100644 --- a/msal4j-brokers/pom.xml +++ b/msal4j-brokers/pom.xml @@ -14,11 +14,40 @@ msal4j 1.13.1 - - net.java.dev.jna - jna-platform - 5.12.1 - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.0 + + ${project.build.directory}/delombok + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + + \ No newline at end of file From f3fce3a5396bbd14b7b585bf471f8776626a62f6 Mon Sep 17 00:00:00 2001 From: siddhijain Date: Mon, 10 Oct 2022 21:15:39 -0500 Subject: [PATCH 2/6] more plugins to fix failing tests --- msal4j-brokers/pom.xml | 127 +++++++++++++++++++++++++++++++---------- 1 file changed, 97 insertions(+), 30 deletions(-) diff --git a/msal4j-brokers/pom.xml b/msal4j-brokers/pom.xml index b5903fef..ffa9e7d5 100644 --- a/msal4j-brokers/pom.xml +++ b/msal4j-brokers/pom.xml @@ -3,10 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - jar com.microsoft.azure msal4j-brokers 0.0.1 + jar + + Microsoft Authentication Library for Java - Brokers helps you integrate with the broker + on windows machine to secure Access tokens and refresh tokens. + + + + MIT License + + + 2022 + + UTF-8 + @@ -16,37 +29,91 @@ + + + + central + https://repo1.maven.org/maven2 + + false + + + + + + central + https://repo1.maven.org/maven2 + + false + + + + ${project.build.directory}/delombok - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.0 - - ${project.build.directory}/delombok - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - + + org.projectlombok + lombok-maven-plugin + 1.18.2.0 + + + + delombok + + + + + src/main/java + ${project.build.directory}/delombok + false + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.10 + + -noverify + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.0 + + ${project.build.directory}/delombok + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 8 + 8 + + From f068b350dea98c229c8ccff3dc2d2f9b2f0fc481 Mon Sep 17 00:00:00 2001 From: siddhijain Date: Mon, 10 Oct 2022 22:52:53 -0500 Subject: [PATCH 3/6] add azure-pipelines to build --- msal4j-brokers/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/msal4j-brokers/pom.xml b/msal4j-brokers/pom.xml index ffa9e7d5..d10d607e 100644 --- a/msal4j-brokers/pom.xml +++ b/msal4j-brokers/pom.xml @@ -7,16 +7,27 @@ msal4j-brokers 0.0.1 jar + msal4j-brokers Microsoft Authentication Library for Java - Brokers helps you integrate with the broker on windows machine to secure Access tokens and refresh tokens. + https://github.com/AzureAD/microsoft-authentication-library-for-java + + + msopentech + Microsoft Open Technologies, Inc. + + MIT License 2022 + + https://github.com/AzureAD/microsoft-authentication-library-for-java + UTF-8 From 79b8c968b4614a22c667339ca1376ceb14d95aad Mon Sep 17 00:00:00 2001 From: siddhijain Date: Tue, 11 Oct 2022 09:55:23 -0500 Subject: [PATCH 4/6] Add a source file --- msal4j-brokers/.gitignore | 29 +++++++++++++++++ msal4j-brokers/pom.xml | 18 +++++++---- .../aad/msal4jbrokers/MSALRuntimeBroker.java | 31 +++++++++++++++++++ 3 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 msal4j-brokers/.gitignore create mode 100644 msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java diff --git a/msal4j-brokers/.gitignore b/msal4j-brokers/.gitignore new file mode 100644 index 00000000..8a97050b --- /dev/null +++ b/msal4j-brokers/.gitignore @@ -0,0 +1,29 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# Intellij +../.idea/ + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# Lombok +target/* \ No newline at end of file diff --git a/msal4j-brokers/pom.xml b/msal4j-brokers/pom.xml index d10d607e..675b32e1 100644 --- a/msal4j-brokers/pom.xml +++ b/msal4j-brokers/pom.xml @@ -32,12 +32,18 @@ UTF-8 - - - com.microsoft.azure - msal4j - 1.13.1 - + + + com.microsoft.azure + msal4j + 1.13.2 + + + org.projectlombok + lombok + 1.18.6 + provided + diff --git a/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java b/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java new file mode 100644 index 00000000..dbf21f77 --- /dev/null +++ b/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java @@ -0,0 +1,31 @@ +package com.microsoft.aad.msal4jbrokers; + +import com.microsoft.aad.msal4j.*; +import lombok.extern.slf4j.Slf4j; + +import java.util.concurrent.CompletableFuture; + +@Slf4j +class MSALRuntimeBroker implements IBroker { + + @Override + public IAuthenticationResult acquireToken(PublicClientApplication application, SilentParameters requestParameters) { + log.debug("Should not call this API if msal runtime init failed"); + throw new MsalClientException("Broker implementation missing", "missing_broker"); + } + + @Override + public IAuthenticationResult acquireToken(PublicClientApplication application, InteractiveRequestParameters requestParameters) { + throw new MsalClientException("Broker implementation missing", "missing_broker"); + } + + @Override + public IAuthenticationResult acquireToken(PublicClientApplication application, UserNamePasswordParameters requestParameters) { + throw new MsalClientException("Broker implementation missing", "missing_broker"); + } + + @Override + public CompletableFuture removeAccount(IAccount account) { + throw new MsalClientException("Broker implementation missing", "missing_broker"); + } +} From a546a42b230cad5cbb4170a583f8d1ebc9d497fe Mon Sep 17 00:00:00 2001 From: siddhijain Date: Tue, 11 Oct 2022 10:12:02 -0500 Subject: [PATCH 5/6] change class modifier for javadocs --- .../java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java b/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java index dbf21f77..598b83ac 100644 --- a/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java +++ b/msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/MSALRuntimeBroker.java @@ -6,7 +6,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j -class MSALRuntimeBroker implements IBroker { +public class MSALRuntimeBroker implements IBroker { @Override public IAuthenticationResult acquireToken(PublicClientApplication application, SilentParameters requestParameters) { From ffa025656620e2bb4a58c87415f84c07d4b44246 Mon Sep 17 00:00:00 2001 From: siddhijain Date: Thu, 13 Oct 2022 17:03:22 -0500 Subject: [PATCH 6/6] Removing developer tag --- msal4j-brokers/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/msal4j-brokers/pom.xml b/msal4j-brokers/pom.xml index 675b32e1..060d756e 100644 --- a/msal4j-brokers/pom.xml +++ b/msal4j-brokers/pom.xml @@ -13,12 +13,6 @@ on windows machine to secure Access tokens and refresh tokens. https://github.com/AzureAD/microsoft-authentication-library-for-java - - - msopentech - Microsoft Open Technologies, Inc. - - MIT License