chore: Re-use Twilio Rest Client for Organizations API

src/main/java/com/twilio/auth_strategy/TokenAuthStrategy.java

@@ -47,7 +47,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         TokenAuthStrategy that = (TokenAuthStrategy) o;
-        return Objects.equals(token, that.token) && 
+        return Objects.equals(token, that.token) &&
                 Objects.equals(tokenManager, that.tokenManager);
     }
     @Override
@@ -58,9 +58,15 @@ public int hashCode() {
     public boolean isTokenExpired(final String token) {
         DecodedJWT jwt = JWT.decode(token);
         Date expiresAt = jwt.getExpiresAt();
+
+        // If the token does not have an expiration date, consider it expired
+        if (expiresAt == null) {
+            return true;
+        }
+
         // Add a buffer of 30 seconds
         long bufferMilliseconds = 30 * 1000;
         Date bufferExpiresAt = new Date(expiresAt.getTime() - bufferMilliseconds);
         return bufferExpiresAt.before(new Date());
     }
-}
+}

src/main/java/com/twilio/base/Page.java

@@ -169,28 +169,33 @@ private static <T> Page<T> buildPage(JsonNode root, List<T> results) {
 
     private static <T> Page<T> buildNextGenPage(JsonNode root, List<T> results) {
         JsonNode meta = root.get("meta");
-        Builder<T> builder = new Builder<T>().url(meta.get("url").asText());
+        Builder<T> builder = new Builder<>();
+        if(meta != null && meta.get("url") != null) {
 
-        JsonNode nextPageNode = meta.get("next_page_url");
-        if (!nextPageNode.isNull()) {
-            builder.nextPageUrl(nextPageNode.asText());
-        }
+            builder = builder.url(meta.get("url").asText());
 
-        JsonNode previousPageNode = meta.get("previous_page_url");
-        if (!previousPageNode.isNull()) {
-            builder.previousPageUrl(previousPageNode.asText());
-        }
 
-        JsonNode firstPageNode = meta.get("first_page_url");
-        if (!firstPageNode.isNull()) {
-            builder.firstPageUrl(firstPageNode.asText());
-        }
+            JsonNode nextPageNode = meta.get("next_page_url");
+            if (!nextPageNode.isNull()) {
+                builder.nextPageUrl(nextPageNode.asText());
+            }
 
-        JsonNode pageSizeNode = meta.get("page_size");
-        if (!pageSizeNode.isNull()) {
-            builder.pageSize(pageSizeNode.asInt());
-        } else {
-            builder.pageSize(results.size());
+            JsonNode previousPageNode = meta.get("previous_page_url");
+            if (!previousPageNode.isNull()) {
+                builder.previousPageUrl(previousPageNode.asText());
+            }
+
+            JsonNode firstPageNode = meta.get("first_page_url");
+            if (!firstPageNode.isNull()) {
+                builder.firstPageUrl(firstPageNode.asText());
+            }
+
+            JsonNode pageSizeNode = meta.get("page_size");
+            if (!pageSizeNode.isNull()) {
+                builder.pageSize(pageSizeNode.asInt());
+            } else {
+                builder.pageSize(results.size());
+            }
         }
 
         return builder.records(results).build();