fixing gradle also making public IdToken from function

stratus-video · Apr 8, 2024 · 4674134 · 4674134
1 parent 07a752f
commit 4674134
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -11,9 +11,7 @@
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<manifest
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="net.openid.appauthdemo" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,6 +4,7 @@ apply from: '../config/android-common.gradle'
 apply from: '../config/keystore.gradle'
 
 android {
+    namespace 'net.openid.appauthdemo'
     defaultConfig {
         applicationId 'net.openid.appauthdemo'
         project.archivesBaseName = 'appauth-demoapp'

diff --git a/config/android-common.gradle b/config/android-common.gradle
@@ -1,4 +1,5 @@
 android {
+    namespace 'net.openid.appauth'
     compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -41,7 +42,7 @@ task jar(type: Copy, dependsOn:'bundleRelease') {
 // produces a JAR containing sources
 task sourcesJar(type: Jar, dependsOn:'generateReleaseSources') {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 tasks.withType(JavaCompile) {

diff --git a/config/coverage.gradle b/config/coverage.gradle
@@ -14,8 +14,8 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "testDebugUnitTest") {
     group = "Reporting"
     description = "Generate Jacoco coverage reports after running tests."
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
     // Class R is used, but usage will not be covered, so ignore this class from report
     afterEvaluate {

diff --git a/config/javadoc.gradle b/config/javadoc.gradle
@@ -9,7 +9,7 @@ dependencies {
 task androidJavadoc(type: JavaExec) {
     jvmArgs = ['--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED']
     classpath files(project.android.getBootClasspath())
-    main = 'jdk.javadoc.internal.tool.Main'
+    mainClass = 'jdk.javadoc.internal.tool.Main'
     ext.destinationDir = file("${project.buildDir}/docs/javadoc")
     args = ['-doctitle', "AppAuth for Android",
             '-use',
@@ -25,7 +25,7 @@ task androidJavadoc(type: JavaExec) {
 }
 
 task javadocJar(type: Jar, dependsOn: androidJavadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from androidJavadoc.ext.destinationDir
 }
 

diff --git a/config/style.gradle b/config/style.gradle
@@ -10,7 +10,7 @@ task checkAllSource(type: Checkstyle) {
     afterEvaluate {
         source 'java'
         include '**/*.java'
-        classpath = files project.configurations.compile.files
+        classpath = files()
     }
 }
 

diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -12,8 +12,7 @@
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.openid.appauth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/library/java/net/openid/appauth/IdToken.java b/library/java/net/openid/appauth/IdToken.java
@@ -160,15 +160,15 @@ private static JSONObject parseJwtSection(String section) throws JSONException {
         return new JSONObject(jsonString);
     }
 
-    static IdToken from(String token) throws JSONException, IdTokenException {
+    public static IdToken from(String token) throws JSONException, IdTokenException {
         String[] sections = token.split("\\.");
 
         if (sections.length <= 1) {
             throw new IdTokenException("ID token must have both header and claims section");
         }
 
         // We ignore header contents, but parse it to check that it is structurally valid JSON
-        parseJwtSection(sections[0]);
+        JSONObject headers = parseJwtSection(sections[0]);
         JSONObject claims = parseJwtSection(sections[1]);
 
         final String issuer = JsonUtil.getString(claims, KEY_ISSUER);
@@ -182,7 +182,11 @@ static IdToken from(String token) throws JSONException, IdTokenException {
         }
         final Long expiration = claims.getLong(KEY_EXPIRATION);
         final Long issuedAt = claims.getLong(KEY_ISSUED_AT);
-        final String nonce = JsonUtil.getStringIfDefined(claims, KEY_NONCE);
+        String tempNonce = JsonUtil.getStringIfDefined(claims, KEY_NONCE);
+        if (tempNonce == null) {
+            tempNonce = JsonUtil.getStringIfDefined(headers, KEY_NONCE);
+        }
+        final String nonce = tempNonce;
         final String authorizedParty = JsonUtil.getStringIfDefined(claims, KEY_AUTHORIZED_PARTY);
 
         for (String key: BUILT_IN_CLAIMS) {