chore: Release version 1.8.0 with OAuth 2.0 support and code improvements

Author: reeshika-h

changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.8.0
+
+### Sep 15, 2025
+
+- Feature : OAuth 2.0 support with PKCE flow
+- Improved code organization and removed redundant methods
+
 ## v1.7.1
 
 ### Jul 21, 2025

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>cms</artifactId>
     <packaging>jar</packaging>
     <name>contentstack-management-java</name>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.8.0</version>
     <description>Contentstack Java Management SDK for Content Management API, Contentstack is a headless CMS with an
         API-first approach
     </description>

src/main/java/com/contentstack/cms/models/OAuthConfig.java

@@ -14,6 +14,7 @@
 @Getter
 @Builder
 public class OAuthConfig {
+
     private final String appId;
     private final String clientId;
     private final String clientSecret;
@@ -25,7 +26,9 @@ public class OAuthConfig {
 
     /**
      * Validates the configuration
-     * @throws IllegalArgumentException if required fields are missing or invalid
+     *
+     * @throws IllegalArgumentException if required fields are missing or
+     * invalid
      */
     public void validate() {
         if (appId == null || appId.trim().isEmpty()) {
@@ -47,6 +50,7 @@ public void validate() {
 
     /**
      * Checks if PKCE flow should be used (when clientSecret is not provided)
+     *
      * @return true if PKCE should be used
      */
     public boolean isPkceEnabled() {
@@ -55,6 +59,7 @@ public boolean isPkceEnabled() {
 
     /**
      * Gets the formatted authorization endpoint URL
+     *
      * @return The authorization endpoint URL
      */
     public String getFormattedAuthorizationEndpoint() {
@@ -63,19 +68,20 @@ public String getFormattedAuthorizationEndpoint() {
         }
 
         String hostname = "app.contentstack.com";
-        
+
         // Transform hostname if needed
         if (hostname.contains("contentstack")) {
             hostname = hostname
-                .replaceAll("^api\\.", "app.")  // api.contentstack -> app.contentstack
-                .replaceAll("\\.io$", ".com");  // *.io -> *.com
+                    .replaceAll("^api\\.", "app.") // api.contentstack -> app.contentstack
+                    .replaceAll("\\.io$", ".com");  // *.io -> *.com
         }
-        
+
         return "https://" + hostname + "/#!/apps/" + appId + "/authorize";
     }
 
     /**
      * Gets the formatted token endpoint URL
+     *
      * @return The token endpoint URL
      */
     public String getTokenEndpoint() {
@@ -84,19 +90,20 @@ public String getTokenEndpoint() {
         }
 
         String hostname = "developerhub-api.contentstack.com";
-        
+
         // Transform hostname if needed
         if (hostname.contains("contentstack")) {
             hostname = hostname
-                .replaceAll("^dev\\d+\\.", "dev.")  // dev1.* -> dev.*
-                .replaceAll("\\.io$", ".com");      // *.io -> *.com
+                    .replaceAll("^dev\\d+\\.", "dev.") // dev1.* -> dev.*
+                    .replaceAll("\\.io$", ".com");      // *.io -> *.com
         }
-        
+
         return "https://" + hostname + "/token";
     }
 
     /**
      * Gets the response type, defaulting to "code"
+     *
      * @return The response type
      */
     public String getResponseType() {
@@ -105,6 +112,7 @@ public String getResponseType() {
 
     /**
      * Gets the scopes as a list
+     *
      * @return List of scope strings or empty list if no scopes
      */
     public List<String> getScopesList() {
@@ -116,6 +124,7 @@ public List<String> getScopesList() {
 
     /**
      * Gets the scope string
+     *
      * @return The space-delimited scope string or null
      */
     public String getScope() {
@@ -126,8 +135,10 @@ public String getScope() {
      * Builder class for OAuthConfig
      */
     public static class OAuthConfigBuilder {
+
         /**
          * Sets scopes from a list
+         *
          * @param scopes List of scope strings
          * @return Builder instance
          */
@@ -142,6 +153,7 @@ public OAuthConfigBuilder scopes(List<String> scopes) {
 
         /**
          * Sets scopes from varargs
+         *
          * @param scopes Scope strings
          * @return Builder instance
          */
@@ -154,4 +166,4 @@ public OAuthConfigBuilder scopes(String... scopes) {
             return this;
         }
     }
-}
+}

src/main/java/com/contentstack/cms/models/OAuthTokens.java

@@ -14,6 +14,7 @@
 @Getter
 @Setter
 public class OAuthTokens {
+
     private static final String BEARER_TOKEN_TYPE = "Bearer";
     @SerializedName("access_token")
     private String accessToken;
@@ -50,6 +51,7 @@ public OAuthTokens() {
 
     /**
      * Sets the expiration time in seconds and calculates the expiry date
+     *
      * @param expiresIn Expiration time in seconds
      */
     public void setExpiresIn(Long expiresIn) {
@@ -76,6 +78,7 @@ public synchronized Date getIssuedAt() {
 
     /**
      * Gets the scopes as a list
+     *
      * @return List of scope strings or empty list if no scopes
      */
     public List<String> getScopesList() {
@@ -87,6 +90,7 @@ public List<String> getScopesList() {
 
     /**
      * Sets scopes from a list
+     *
      * @param scopes List of scope strings
      */
     public void setScopesList(List<String> scopes) {
@@ -99,6 +103,7 @@ public void setScopesList(List<String> scopes) {
 
     /**
      * Checks if the token has a specific scope
+     *
      * @param scopeToCheck The scope to check for
      * @return true if the token has the scope
      */
@@ -108,39 +113,42 @@ public boolean hasScope(String scopeToCheck) {
 
     /**
      * Checks if the token is expired, including a buffer time
+     *
      * @return true if token is expired or will expire soon
      */
     public boolean isExpired() {
         // No expiry time means token is considered expired
         if (expiresAt == null) {
             return true;
         }
-        
+
         // No access token means token is considered expired
         if (!hasAccessToken()) {
             return true;
         }
-        
+
         // Check if current time + buffer is past expiry
         long currentTime = System.currentTimeMillis();
         long expiryTime = expiresAt.getTime();
         long timeUntilExpiry = expiryTime - currentTime;
-        
+
         // Consider expired if within buffer window
         return timeUntilExpiry <= EXPIRY_BUFFER_MS;
     }
 
     /**
      * Checks if the token is valid (has access token and not expired)
+     *
      * @return true if token is valid
      */
     public synchronized boolean isValid() {
-        return hasAccessToken() && !isExpired() && 
-               BEARER_TOKEN_TYPE.equalsIgnoreCase(tokenType);
+        return hasAccessToken() && !isExpired()
+                && BEARER_TOKEN_TYPE.equalsIgnoreCase(tokenType);
     }
 
     /**
      * Checks if access token is present
+     *
      * @return true if access token exists
      */
     public boolean hasAccessToken() {
@@ -149,6 +157,7 @@ public boolean hasAccessToken() {
 
     /**
      * Checks if refresh token is present
+     *
      * @return true if refresh token exists
      */
     public boolean hasRefreshToken() {
@@ -157,6 +166,7 @@ public boolean hasRefreshToken() {
 
     /**
      * Gets time until token expiration in milliseconds
+     *
      * @return milliseconds until expiration or 0 if expired/invalid
      */
     public long getTimeUntilExpiration() {
@@ -167,46 +177,20 @@ public long getTimeUntilExpiration() {
         return Math.max(0, timeLeft);
     }
 
-    /**
-     * Creates a copy of this token object
-     * @return A new OAuthTokens instance with copied values
-     */
-    public OAuthTokens copy() {
-        OAuthTokens copy = new OAuthTokens();
-        copy.accessToken = this.accessToken;
-        copy.refreshToken = this.refreshToken;
-        copy.tokenType = this.tokenType;
-        copy.expiresIn = this.expiresIn;
-        copy.scope = this.scope;
-        copy.organizationUid = this.organizationUid;
-        copy.userUid = this.userUid;
-        copy.stackApiKey = this.stackApiKey;
-        copy.issuedAt = this.issuedAt != null ? new Date(this.issuedAt.getTime()) : null;
-        copy.expiresAt = this.expiresAt != null ? new Date(this.expiresAt.getTime()) : null;
-        return copy;
-    }
-
-    /**
-     * Gets the stack API key if available
-     * @return The stack API key or null if not available
-     */
-    public String getStackApiKey() {
-        return stackApiKey != null && !stackApiKey.trim().isEmpty() ? stackApiKey : null;
-    }
 
     @Override
     public String toString() {
-        return "OAuthTokens{" +
-                "accessToken='" + (accessToken != null ? "[REDACTED]" : "null") + '\'' +
-                ", refreshToken='" + (refreshToken != null ? "[REDACTED]" : "null") + '\'' +
-                ", tokenType='" + tokenType + '\'' +
-                ", expiresIn=" + expiresIn +
-                ", scope='" + scope + '\'' +
-                ", organizationUid='" + organizationUid + '\'' +
-                ", userUid='" + userUid + '\'' +
-                ", stackApiKey='" + stackApiKey + '\'' +
-                ", issuedAt=" + issuedAt +
-                ", expiresAt=" + expiresAt +
-                '}';
-    }
-}
+        return "OAuthTokens{"
+                + "accessToken='" + (accessToken != null ? "[REDACTED]" : "null") + '\''
+                + ", refreshToken='" + (refreshToken != null ? "[REDACTED]" : "null") + '\''
+                + ", tokenType='" + tokenType + '\''
+                + ", expiresIn=" + expiresIn
+                + ", scope='" + scope + '\''
+                + ", organizationUid='" + organizationUid + '\''
+                + ", userUid='" + userUid + '\''
+                + ", stackApiKey='" + stackApiKey + '\''
+                + ", issuedAt=" + issuedAt
+                + ", expiresAt=" + expiresAt
+                + '}';
+    }
+}