Skip to content

Commit 0cbf6af

Browse files
author
sgonzalezMSFT
committed
Update dev samples
1 parent b17c880 commit 0cbf6af

File tree

5 files changed

+111
-6
lines changed

5 files changed

+111
-6
lines changed

‎src/samples/confidential-client/ClientCredentialGrant.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import com.microsoft.aad.msal4j.*;
4+
import com.microsoft.aad.msal4j.ClientCredentialFactory;
5+
import com.microsoft.aad.msal4j.ClientCredentialParameters;
6+
import com.microsoft.aad.msal4j.ConfidentialClientApplication;
7+
import com.microsoft.aad.msal4j.IAuthenticationResult;
8+
import com.microsoft.aad.msal4j.SilentParameters;
59

610
import java.util.Collections;
711
import java.util.concurrent.CompletableFuture;
812
import java.util.function.BiConsumer;
9-
import java.util.function.BiFunction;
1013

1114
class ClientCredentialGrant {
1215

@@ -18,7 +21,7 @@ private static void getAccessTokenByClientCredentialGrant() throws Exception {
1821

1922
ConfidentialClientApplication app = ConfidentialClientApplication.builder(
2023
TestData.CONFIDENTIAL_CLIENT_ID,
21-
ClientCredentialFactory.create(TestData.CONFIDENTIAL_CLIENT_SECRET))
24+
ClientCredentialFactory.createFromSecret(TestData.CONFIDENTIAL_CLIENT_SECRET))
2225
.authority(TestData.TENANT_SPECIFIC_AUTHORITY)
2326
.build();
2427

‎src/samples/msal-b2c-web-sample/msal-b2c-web-sample.iml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="Spring" name="Spring">
5+
<configuration />
6+
</facet>
7+
<facet type="web" name="Web">
8+
<configuration>
9+
<webroots>
10+
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
11+
</webroots>
12+
</configuration>
13+
</facet>
14+
</component>
15+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<output url="file://$MODULE_DIR$/target/classes" />
17+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
18+
<content url="file://$MODULE_DIR$">
19+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
20+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
21+
<excludeFolder url="file://$MODULE_DIR$/target" />
22+
</content>
23+
<orderEntry type="inheritedJdk" />
24+
<orderEntry type="sourceFolder" forTests="false" />
25+
<orderEntry type="module" module-name="msal4j" />
26+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
27+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
28+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
29+
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
30+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
31+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.8" level="project" />
32+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
33+
<orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:6.5" level="project" />
34+
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
35+
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
36+
<orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
37+
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
38+
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
39+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
40+
<orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4.4" level="project" />
41+
<orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:8.2" level="project" />
42+
<orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
43+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.4.RELEASE" level="project" />
44+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.4.RELEASE" level="project" />
45+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.4.RELEASE" level="project" />
46+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.4.RELEASE" level="project" />
47+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.4.RELEASE" level="project" />
48+
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
49+
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
50+
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
51+
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
52+
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
53+
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
54+
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
55+
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
56+
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
57+
<orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
58+
<orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
59+
<orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
60+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.4.RELEASE" level="project" />
61+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.4.RELEASE" level="project" />
62+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
63+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
64+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
65+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
66+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
67+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
68+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.4.RELEASE" level="project" />
69+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.17" level="project" />
70+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.17" level="project" />
71+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.17" level="project" />
72+
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
73+
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
74+
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
75+
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
76+
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.6.RELEASE" level="project" />
77+
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
78+
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.6.RELEASE" level="project" />
79+
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
80+
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
81+
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
82+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
83+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.4.RELEASE" level="project" />
84+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.4.RELEASE" level="project" />
85+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.4.RELEASE" level="project" />
86+
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
87+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
88+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
89+
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
90+
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.12" level="project" />
91+
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.12" level="project" />
92+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
93+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
94+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
95+
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
96+
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
97+
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
98+
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
99+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.6.RELEASE" level="project" />
100+
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
101+
</component>
102+
</module>

‎src/samples/msal-b2c-web-sample/src/main/java/com/microsoft/azure/msalwebsample/AuthHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AuthHelper {
3535

3636
private ConfidentialClientApplication createClientApplication() throws MalformedURLException {
3737
return ConfidentialClientApplication.builder(configuration.clientId,
38-
ClientCredentialFactory.create(configuration.secret))
38+
ClientCredentialFactory.createFromSecret(configuration.secret))
3939
.b2cAuthority(configuration.signUpSignInAuthority)
4040
.build();
4141
}

‎src/samples/msal-obo-sample/src/main/java/com/microsoft/azure/msalobosample/MsalAuthHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ String getOboToken(String scope) throws MalformedURLException {
4646
String authToken = getAuthToken();
4747

4848
ConfidentialClientApplication application =
49-
ConfidentialClientApplication.builder(clientId, ClientCredentialFactory.create(secret))
49+
ConfidentialClientApplication.builder(clientId, ClientCredentialFactory.createFromSecret(secret))
5050
.authority(authority).build();
5151

5252
String cacheKey = Hashing.sha256()

‎src/samples/msal-web-sample/src/main/java/com/microsoft/azure/msalwebsample/AuthHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void init() {
4747
}
4848

4949
private ConfidentialClientApplication createClientApplication() throws MalformedURLException {
50-
return ConfidentialClientApplication.builder(clientId, ClientCredentialFactory.create(clientSecret)).
50+
return ConfidentialClientApplication.builder(clientId, ClientCredentialFactory.createFromSecret(clientSecret)).
5151
authority(authority).
5252
build();
5353
}

0 commit comments

Comments
 (0)