From 91b6b70b3b4becac16dcd29b48c3a9553a70bcde Mon Sep 17 00:00:00 2001 From: ajay3568yadav Date: Wed, 16 Jul 2025 15:10:10 -0700 Subject: [PATCH 01/31] VSPC-189 added citeshpere connection --- .../core/services/CitesphereAuthToken.java | 76 ++++++ .../core/services/ICitesphereManager.java | 104 ++++++++ .../core/services/impl/CitesphereManager.java | 248 ++++++++++++++++++ .../views/staff/modules/slides/slide.html | 168 +++++++++--- 4 files changed, 555 insertions(+), 41 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java new file mode 100644 index 000000000..f0ffb4ffd --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java @@ -0,0 +1,76 @@ +package edu.asu.diging.vspace.core.services; + +import java.util.Map; + +/** + * Authentication token object for Citesphere API + */ +public class CitesphereAuthToken { + + private String authType; + private Map headers; + private String accessToken; + private String username; + private String password; + + /** + * Constructor for OAuth authentication + * @param accessToken OAuth access token + */ + public CitesphereAuthToken(String accessToken) { + this.authType = "oauth"; + this.accessToken = accessToken; + } + + /** + * Constructor for Basic authentication + * @param username Username + * @param password Password + */ + public CitesphereAuthToken(String username, String password) { + this.authType = "basic"; + this.username = username; + this.password = password; + } + + // Getters and setters + public String getAuthType() { + return authType; + } + + public void setAuthType(String authType) { + this.authType = authType; + } + + public Map getHeaders() { + return headers; + } + + public void setHeaders(Map headers) { + this.headers = headers; + } + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java new file mode 100644 index 000000000..06d6b16f1 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java @@ -0,0 +1,104 @@ +package edu.asu.diging.vspace.core.services; + +import java.util.Map; + +/** + * Service interface for Citesphere API operations + */ +public interface ICitesphereManager { + + /** + * Get user information + * @return User data as Map + */ + Map getUser(); + + /** + * Check test endpoint + * @return Test response as Map + */ + Map checkTest(); + + /** + * Check access for a document + * @param documentId Document ID to check access for + * @return Access check response as Map + */ + Map checkAccess(String documentId); + + /** + * Get data by endpoint + * @param endpoint API endpoint path + * @return Data response as Map + */ + Map getDataByEndpoint(String endpoint); + + /** + * Get all groups + * @return Groups data as Map + */ + Map getGroups(); + + /** + * Get group information + * @param groupId Group ID + * @return Group information as Map + */ + Map getGroupInfo(String groupId); + + /** + * Get group items + * @param zoteroGroupId Zotero group ID + * @return Group items as Map + */ + Map getGroupItems(String zoteroGroupId); + + /** + * Get collections + * @param zoteroGroupId Zotero group ID + * @return Collections as Map + */ + Map getCollections(String zoteroGroupId); + + /** + * Get collection items + * @param zoteroGroupId Zotero group ID + * @param collectionId Collection ID + * @param pageNumber Page number (optional, defaults to 0) + * @return Collection items as Map + */ + Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber); + + /** + * Get collection items (overloaded method without page number) + * @param zoteroGroupId Zotero group ID + * @param collectionId Collection ID + * @return Collection items as Map + */ + Map getCollectionItems(String zoteroGroupId, String collectionId); + + /** + * Get item information + * @param zoteroGroupId Zotero group ID + * @param itemId Item ID + * @return Item information as Map + */ + Map getItemInfo(String zoteroGroupId, String itemId); + + /** + * Get collections by collection ID + * @param zoteroGroupId Zotero group ID + * @param collectionId Collection ID + * @return Collections as Map + */ + Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId); + + /** + * Add item to group + * @param groupId Group ID + * @param data Item data + * @param filePath Path to file to upload + * @return Response from API + */ + Object addItem(String groupId, Map data, String filePath); +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java new file mode 100644 index 000000000..8b948578e --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -0,0 +1,248 @@ +package edu.asu.diging.vspace.core.services.impl; + + +//import com.citesphere.api.CitesphereService; +//import com.citesphere.api.auth.CitesphereAuthToken; +import com.fasterxml.jackson.databind.ObjectMapper; + +import edu.asu.diging.vspace.core.services.CitesphereAuthToken; +import edu.asu.diging.vspace.core.services.ICitesphereManager; +import okhttp3.*; + +import java.io.File; +import java.io.IOException; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; + +/** + * Implementation of CitesphereService for API operations + */ +public class CitesphereManager implements ICitesphereManager { + + private final String api; + private final CitesphereAuthToken authTokenObject; + private final OkHttpClient client; + private final ObjectMapper objectMapper; + + /** + * Constructor + * @param api API base URL + * @param authTokenObject Authentication token object + * @return + */ + public void CitesphereConnectorImpl(String api, CitesphereAuthToken authTokenObject) { + this.api = api; + this.authTokenObject = authTokenObject; + this.client = new OkHttpClient(); + this.objectMapper = new ObjectMapper(); + + validate(); + handleApiParams(); + } + + /** + * Validate authentication token object + */ + private void validate() { + if (authTokenObject.getAuthType() == null) { + throw new IllegalArgumentException("Missing authType attribute"); + } + + if (authTokenObject.getAccessToken() == null) { + if (authTokenObject.getUsername() == null || authTokenObject.getPassword() == null) { + throw new IllegalArgumentException( + "Either username and password or access_token should be present"); + } + } + + if (!"oauth".equals(authTokenObject.getAuthType()) && + !"basic".equals(authTokenObject.getAuthType())) { + throw new IllegalArgumentException("authType should be either oauth or basic"); + } + } + + /** + * Handle API parameters and set headers + */ + private void handleApiParams() { + Map headers = new HashMap<>(); + + if ("oauth".equals(authTokenObject.getAuthType())) { + headers.put("Authorization", "Bearer " + authTokenObject.getAccessToken()); + } else if ("basic".equals(authTokenObject.getAuthType())) { + String authStr = authTokenObject.getUsername() + ":" + authTokenObject.getPassword(); + String authB64 = Base64.getEncoder().encodeToString(authStr.getBytes()); + headers.put("Authorization", "Basic " + authB64); + } + + authTokenObject.setHeaders(headers); + } + + /** + * Execute GET command + * @param url Request URL + * @return Response data as Map + */ + private Map executeCommand(String url) { + try { + Request.Builder requestBuilder = new Request.Builder().url(url); + + // Add headers + if (authTokenObject.getHeaders() != null) { + for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { + requestBuilder.addHeader(header.getKey(), header.getValue()); + } + } + + Request request = requestBuilder.build(); + + try (Response response = client.newCall(request).execute()) { + if (response.body() != null) { + String responseBody = response.body().string(); + return objectMapper.readValue(responseBody, Map.class); + } + } + } catch (Exception e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + return errorMap; + } + + return new HashMap<>(); + } + + /** + * Execute POST request + * @param url Request URL + * @param data Request data + * @param filePath File path for upload + * @return Response object + */ + private Object executePostRequest(String url, Map data, String filePath) { + try { + MultipartBody.Builder builder = new MultipartBody.Builder() + .setType(MultipartBody.FORM); + + // Add data parameters + if (data != null) { + for (Map.Entry entry : data.entrySet()) { + builder.addFormDataPart(entry.getKey(), entry.getValue().toString()); + } + } + + // Add file if provided + if (filePath != null) { + File file = new File(filePath); + if (file.exists()) { + RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/pdf")); + builder.addFormDataPart("files", file.getName(), fileBody); + } + } + + RequestBody requestBody = builder.build(); + + Request.Builder requestBuilder = new Request.Builder() + .url(url) + .post(requestBody); + + // Add headers + if (authTokenObject.getHeaders() != null) { + for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { + requestBuilder.addHeader(header.getKey(), header.getValue()); + } + } + + Request request = requestBuilder.build(); + + try (Response response = client.newCall(request).execute()) { + System.out.println("Response code: " + response.code()); + return response; + } + + } catch (Exception e) { + System.err.println("[ERROR] -------- Error during API request with " + filePath + ": " + e.getMessage()); + return "Error loading/reading file"; + } + } + + @Override + public Map getUser() { + String url = api + "/v1/user"; + return executeCommand(url); + } + + @Override + public Map checkTest() { + String url = api + "/v1/test"; + return executeCommand(url); + } + + @Override + public Map checkAccess(String documentId) { + String url = api + "/files/giles/" + documentId + "/access/check"; + return executeCommand(url); + } + + @Override + public Map getDataByEndpoint(String endpoint) { + String url = api + "/v1" + endpoint; + return executeCommand(url); + } + + @Override + public Map getGroups() { + String url = api + "/v1/groups"; + return executeCommand(url); + } + + @Override + public Map getGroupInfo(String groupId) { + String url = api + "/v1/groups/" + groupId; + return executeCommand(url); + } + + @Override + public Map getGroupItems(String zoteroGroupId) { + String url = api + "/v1/groups/" + zoteroGroupId + "/items"; + return executeCommand(url); + } + + @Override + public Map getCollections(String zoteroGroupId) { + String url = api + "/v1/groups/" + zoteroGroupId + "/collections"; + return executeCommand(url); + } + + @Override + public Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber) { + String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; + if (pageNumber > 0) { + url += "?&page=" + pageNumber; + } + return executeCommand(url); + } + + @Override + public Map getCollectionItems(String zoteroGroupId, String collectionId) { + return getCollectionItems(zoteroGroupId, collectionId, 0); + } + + @Override + public Map getItemInfo(String zoteroGroupId, String itemId) { + String url = api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId; + return executeCommand(url); + } + + @Override + public Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId) { + String url = api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"; + return executeCommand(url); + } + + @Override + public Object addItem(String groupId, Map data, String filePath) { + String url = api + "/v1/groups/" + groupId + "/items/create"; + return executePostRequest(url, data, filePath); + } +} diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index d1708279e..0ef0a1d56 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -3092,47 +3092,133 @@
Add New Video Block
- + - + + From 5e639072a8106e236e9a6034902ee89ebf3dce6c Mon Sep 17 00:00:00 2001 From: ajay3568yadav Date: Fri, 8 Aug 2025 16:40:26 -0700 Subject: [PATCH 07/31] VSPC-189 filed selection fix --- .../views/staff/modules/slides/slide.html | 100 ------------------ 1 file changed, 100 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 5c7317dc8..1c1feb1e9 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -3183,106 +3183,6 @@
Add new Reference
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - -
-
From 179306f372b80489d2ab949a4ae5367ec9b01ed6 Mon Sep 17 00:00:00 2001 From: ajay3568yadav Date: Mon, 11 Aug 2025 16:17:05 -0700 Subject: [PATCH 08/31] VSPC-189 citesphere manager --- .../core/services/impl/CitesphereManager.java | 322 ++++++++++++------ .../views/staff/modules/slides/slide.html | 100 ++++++ 2 files changed, 313 insertions(+), 109 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index 9c90a3854..e24f00c35 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -1,10 +1,6 @@ package edu.asu.diging.vspace.core.services.impl; - -//import com.citesphere.api.CitesphereService; -//import com.citesphere.api.auth.CitesphereAuthToken; import com.fasterxml.jackson.databind.ObjectMapper; - import edu.asu.diging.vspace.core.services.CitesphereAuthToken; import edu.asu.diging.vspace.core.services.ICitesphereManager; @@ -13,215 +9,310 @@ import java.util.Base64; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; +import java.util.logging.Level; + import okhttp3.*; /** - * Implementation of CitesphereService for API operations + * Implementation of ICitesphereManager for Citesphere API operations. + * + * This class handles authentication, HTTP requests, and data management + * for interactions with the Citesphere API service. + * + * @author ASU Digital Innovation Group + * @version 1.0 */ public class CitesphereManager implements ICitesphereManager { - private final String api; + private static final Logger LOGGER = Logger.getLogger(CitesphereManager.class.getName()); + + private static final String OAUTH_AUTH_TYPE = "oauth"; + private static final String BASIC_AUTH_TYPE = "basic"; + private static final String AUTHORIZATION_HEADER = "Authorization"; + private static final String BEARER_PREFIX = "Bearer "; + private static final String BASIC_PREFIX = "Basic "; + private static final String API_VERSION_PATH = "/v1"; + + private final String apiBaseUrl; private final CitesphereAuthToken authTokenObject; - private final OkHttpClient client; + private final OkHttpClient httpClient; private final ObjectMapper objectMapper; /** - * Constructor - * @param api API base URL - * @param authTokenObject Authentication token object - * @return + * Constructor for CitesphereManager. + * + * @param apiBaseUrl The base URL for the Citesphere API + * @param authTokenObject Authentication token object containing credentials + * @throws IllegalArgumentException if authentication parameters are invalid */ - public CitesphereManager(String api, CitesphereAuthToken authTokenObject) { - this.api = api; + public CitesphereManager(String apiBaseUrl, CitesphereAuthToken authTokenObject) { + this.apiBaseUrl = apiBaseUrl; this.authTokenObject = authTokenObject; - this.client = new OkHttpClient(); + this.httpClient = new OkHttpClient(); this.objectMapper = new ObjectMapper(); - validate(); - handleApiParams(); + validateAuthenticationParameters(); + configureAuthenticationHeaders(); } - /** - * Validate authentication token object + * Validates the authentication token object parameters. + * + * @throws IllegalArgumentException if authentication parameters are missing or invalid */ - private void validate() { + private void validateAuthenticationParameters() { if (authTokenObject.getAuthType() == null) { - throw new IllegalArgumentException("Missing authType attribute"); + throw new IllegalArgumentException("Authentication type (authType) is required"); } if (authTokenObject.getAccessToken() == null) { if (authTokenObject.getUsername() == null || authTokenObject.getPassword() == null) { throw new IllegalArgumentException( - "Either username and password or access_token should be present"); + "Either access token or username/password combination is required"); } } - if (!"oauth".equals(authTokenObject.getAuthType()) && - !"basic".equals(authTokenObject.getAuthType())) { - throw new IllegalArgumentException("authType should be either oauth or basic"); + if (!OAUTH_AUTH_TYPE.equals(authTokenObject.getAuthType()) && + !BASIC_AUTH_TYPE.equals(authTokenObject.getAuthType())) { + throw new IllegalArgumentException( + "Authentication type must be either '" + OAUTH_AUTH_TYPE + "' or '" + BASIC_AUTH_TYPE + "'"); } } /** - * Handle API parameters and set headers + * Configures authentication headers based on the authentication type. */ - private void handleApiParams() { + private void configureAuthenticationHeaders() { Map headers = new HashMap<>(); - if ("oauth".equals(authTokenObject.getAuthType())) { - headers.put("Authorization", "Bearer " + authTokenObject.getAccessToken()); - } else if ("basic".equals(authTokenObject.getAuthType())) { - String authStr = authTokenObject.getUsername() + ":" + authTokenObject.getPassword(); - String authB64 = Base64.getEncoder().encodeToString(authStr.getBytes()); - headers.put("Authorization", "Basic " + authB64); + if (OAUTH_AUTH_TYPE.equals(authTokenObject.getAuthType())) { + headers.put(AUTHORIZATION_HEADER, BEARER_PREFIX + authTokenObject.getAccessToken()); + } else if (BASIC_AUTH_TYPE.equals(authTokenObject.getAuthType())) { + String credentials = authTokenObject.getUsername() + ":" + authTokenObject.getPassword(); + String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes()); + headers.put(AUTHORIZATION_HEADER, BASIC_PREFIX + encodedCredentials); } authTokenObject.setHeaders(headers); } /** - * Execute GET command - * @param url Request URL - * @return Response data as Map + * Executes a GET request to the specified URL. + * + * @param url The target URL for the GET request + * @return Response data as a Map, or error information if the request fails */ - private Map executeCommand(String url) { + private Map executeGetRequest(String url) { try { Request.Builder requestBuilder = new Request.Builder().url(url); - // Add headers - if (authTokenObject.getHeaders() != null) { - for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { - requestBuilder.addHeader(header.getKey(), header.getValue()); - } - } + // Add authentication headers + addAuthenticationHeaders(requestBuilder); Request request = requestBuilder.build(); - try (Response response = client.newCall(request).execute()) { - if (response.body() != null) { - String responseBody = response.body().string(); - return objectMapper.readValue(responseBody, Map.class); - } + try (Response response = httpClient.newCall(request).execute()) { + return parseJsonResponse(response); } + } catch (IOException e) { + LOGGER.log(Level.SEVERE, "Error executing GET request to " + url, e); + return createErrorResponse("Network error: " + e.getMessage()); } catch (Exception e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - return errorMap; + LOGGER.log(Level.SEVERE, "Unexpected error during GET request to " + url, e); + return createErrorResponse("Unexpected error: " + e.getMessage()); + } + } + + /** + * Adds authentication headers to the request builder. + * + * @param requestBuilder The request builder to add headers to + */ + private void addAuthenticationHeaders(Request.Builder requestBuilder) { + if (authTokenObject.getHeaders() != null) { + authTokenObject.getHeaders().forEach(requestBuilder::addHeader); + } + } + + /** + * Parses JSON response from HTTP response. + * + * @param response The HTTP response to parse + * @return Parsed JSON as Map + * @throws IOException if parsing fails + */ + @SuppressWarnings("unchecked") + private Map parseJsonResponse(Response response) throws IOException { + if (response.body() != null) { + String responseBody = response.body().string(); + if (!responseBody.isEmpty()) { + return objectMapper.readValue(responseBody, Map.class); + } } - return new HashMap<>(); } /** - * Execute POST request - * @param url Request URL - * @param data Request data - * @param filePath File path for upload - * @return Response object + * Creates an error response map. + * + * @param errorMessage The error message to include + * @return Map containing error information + */ + private Map createErrorResponse(String errorMessage) { + Map errorResponse = new HashMap<>(); + errorResponse.put("error", true); + errorResponse.put("error_message", errorMessage); + return errorResponse; + } + + /** + * Executes a POST request with optional file upload. + * + * @param url The target URL for the POST request + * @param data Form data to include in the request + * @param filePath Path to file for upload (optional) + * @return HTTP Response object or error message */ private Object executePostRequest(String url, Map data, String filePath) { try { - MultipartBody.Builder builder = new MultipartBody.Builder() + MultipartBody.Builder formBuilder = new MultipartBody.Builder() .setType(MultipartBody.FORM); - // Add data parameters - if (data != null) { - for (Map.Entry entry : data.entrySet()) { - builder.addFormDataPart(entry.getKey(), entry.getValue().toString()); - } - } + // Add form data parameters + addFormDataParameters(formBuilder, data); - // Add file if provided - if (filePath != null) { - File file = new File(filePath); - if (file.exists()) { - RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/pdf")); - builder.addFormDataPart("files", file.getName(), fileBody); - } - } - - RequestBody requestBody = builder.build(); + // Add file if specified + addFileToForm(formBuilder, filePath); + RequestBody requestBody = formBuilder.build(); Request.Builder requestBuilder = new Request.Builder() .url(url) .post(requestBody); - // Add headers - if (authTokenObject.getHeaders() != null) { - for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { - requestBuilder.addHeader(header.getKey(), header.getValue()); - } - } - + addAuthenticationHeaders(requestBuilder); Request request = requestBuilder.build(); - try (Response response = client.newCall(request).execute()) { - System.out.println("Response code: " + response.code()); + try (Response response = httpClient.newCall(request).execute()) { + LOGGER.info("POST request completed with response code: " + response.code()); return response; } + } catch (IOException e) { + LOGGER.log(Level.SEVERE, "IO error during POST request to " + url, e); + return "IO error during file upload: " + e.getMessage(); } catch (Exception e) { - System.err.println("[ERROR] -------- Error during API request with " + filePath + ": " + e.getMessage()); - return "Error loading/reading file"; + LOGGER.log(Level.SEVERE, "Unexpected error during POST request to " + url, e); + return "Unexpected error during request: " + e.getMessage(); } } + /** + * Adds form data parameters to the multipart form builder. + * + * @param formBuilder The form builder to add parameters to + * @param data The data parameters to add + */ + private void addFormDataParameters(MultipartBody.Builder formBuilder, Map data) { + if (data != null) { + data.forEach((key, value) -> + formBuilder.addFormDataPart(key, String.valueOf(value)) + ); + } + } + + /** + * Adds a file to the multipart form if the file path is provided and valid. + * + * @param formBuilder The form builder to add the file to + * @param filePath The path to the file to upload + */ + private void addFileToForm(MultipartBody.Builder formBuilder, String filePath) { + if (filePath != null && !filePath.trim().isEmpty()) { + File file = new File(filePath); + if (file.exists() && file.isFile()) { + RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/pdf")); + formBuilder.addFormDataPart("files", file.getName(), fileBody); + } else { + LOGGER.warning("File not found or invalid: " + filePath); + } + } + } + + // API endpoint methods + @Override public Map getUser() { - String url = api + "/v1/user"; - return executeCommand(url); + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/user"); } @Override public Map checkTest() { - String url = api + "/v1/test"; - return executeCommand(url); + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/test"); } @Override public Map checkAccess(String documentId) { - String url = api + "/files/giles/" + documentId + "/access/check"; - return executeCommand(url); + if (documentId == null || documentId.trim().isEmpty()) { + return createErrorResponse("Document ID is required"); + } + return executeGetRequest(apiBaseUrl + "/files/giles/" + documentId + "/access/check"); } @Override public Map getDataByEndpoint(String endpoint) { - String url = api + "/v1" + endpoint; - return executeCommand(url); + if (endpoint == null || endpoint.trim().isEmpty()) { + return createErrorResponse("Endpoint is required"); + } + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + endpoint); } @Override public Map getGroups() { - String url = api + "/v1/groups"; - return executeCommand(url); + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups"); } @Override public Map getGroupInfo(String groupId) { - String url = api + "/v1/groups/" + groupId; - return executeCommand(url); + if (groupId == null || groupId.trim().isEmpty()) { + return createErrorResponse("Group ID is required"); + } + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + groupId); } @Override public Map getGroupItems(String zoteroGroupId) { - String url = api + "/v1/groups/" + zoteroGroupId + "/items"; - return executeCommand(url); + if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { + return createErrorResponse("Zotero Group ID is required"); + } + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + "/items"); } @Override public Map getCollections(String zoteroGroupId) { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections"; - return executeCommand(url); + if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { + return createErrorResponse("Zotero Group ID is required"); + } + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + "/collections"); } @Override public Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber) { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; + if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { + return createErrorResponse("Zotero Group ID is required"); + } + if (collectionId == null || collectionId.trim().isEmpty()) { + return createErrorResponse("Collection ID is required"); + } + + String url = apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + + "/collections/" + collectionId + "/items"; + if (pageNumber > 0) { - url += "?&page=" + pageNumber; + url += "?page=" + pageNumber; } - return executeCommand(url); + + return executeGetRequest(url); } @Override @@ -231,19 +322,32 @@ public Map getCollectionItems(String zoteroGroupId, String colle @Override public Map getItemInfo(String zoteroGroupId, String itemId) { - String url = api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId; - return executeCommand(url); + if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { + return createErrorResponse("Zotero Group ID is required"); + } + if (itemId == null || itemId.trim().isEmpty()) { + return createErrorResponse("Item ID is required"); + } + return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + "/items/" + itemId); } @Override public Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId) { - String url = api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"; - return executeCommand(url); + if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { + return createErrorResponse("Zotero Group ID is required"); + } + if (collectionId == null || collectionId.trim().isEmpty()) { + return createErrorResponse("Collection ID is required"); + } + return executeGetRequest(apiBaseUrl + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"); } @Override public Object addItem(String groupId, Map data, String filePath) { - String url = api + "/v1/groups/" + groupId + "/items/create"; + if (groupId == null || groupId.trim().isEmpty()) { + return "Group ID is required"; + } + String url = apiBaseUrl + API_VERSION_PATH + "/groups/" + groupId + "/items/create"; return executePostRequest(url, data, filePath); } -} +} \ No newline at end of file diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 1c1feb1e9..5c7317dc8 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -3183,6 +3183,106 @@
Add new Reference
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
+ + +
+ + + + + +
+
From 07c444e3c2994928c48ebdf62ad83625bd882820 Mon Sep 17 00:00:00 2001 From: ajay3568yadav Date: Tue, 12 Aug 2025 16:30:26 -0700 Subject: [PATCH 09/31] VSPC-189 citation manager fixes --- .../core/services/impl/CitesphereManager.java | 322 ++++++------------ 1 file changed, 109 insertions(+), 213 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index e24f00c35..9c90a3854 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -1,6 +1,10 @@ package edu.asu.diging.vspace.core.services.impl; + +//import com.citesphere.api.CitesphereService; +//import com.citesphere.api.auth.CitesphereAuthToken; import com.fasterxml.jackson.databind.ObjectMapper; + import edu.asu.diging.vspace.core.services.CitesphereAuthToken; import edu.asu.diging.vspace.core.services.ICitesphereManager; @@ -9,310 +13,215 @@ import java.util.Base64; import java.util.HashMap; import java.util.Map; -import java.util.logging.Logger; -import java.util.logging.Level; - import okhttp3.*; /** - * Implementation of ICitesphereManager for Citesphere API operations. - * - * This class handles authentication, HTTP requests, and data management - * for interactions with the Citesphere API service. - * - * @author ASU Digital Innovation Group - * @version 1.0 + * Implementation of CitesphereService for API operations */ public class CitesphereManager implements ICitesphereManager { - private static final Logger LOGGER = Logger.getLogger(CitesphereManager.class.getName()); - - private static final String OAUTH_AUTH_TYPE = "oauth"; - private static final String BASIC_AUTH_TYPE = "basic"; - private static final String AUTHORIZATION_HEADER = "Authorization"; - private static final String BEARER_PREFIX = "Bearer "; - private static final String BASIC_PREFIX = "Basic "; - private static final String API_VERSION_PATH = "/v1"; - - private final String apiBaseUrl; + private final String api; private final CitesphereAuthToken authTokenObject; - private final OkHttpClient httpClient; + private final OkHttpClient client; private final ObjectMapper objectMapper; /** - * Constructor for CitesphereManager. - * - * @param apiBaseUrl The base URL for the Citesphere API - * @param authTokenObject Authentication token object containing credentials - * @throws IllegalArgumentException if authentication parameters are invalid + * Constructor + * @param api API base URL + * @param authTokenObject Authentication token object + * @return */ - public CitesphereManager(String apiBaseUrl, CitesphereAuthToken authTokenObject) { - this.apiBaseUrl = apiBaseUrl; + public CitesphereManager(String api, CitesphereAuthToken authTokenObject) { + this.api = api; this.authTokenObject = authTokenObject; - this.httpClient = new OkHttpClient(); + this.client = new OkHttpClient(); this.objectMapper = new ObjectMapper(); - validateAuthenticationParameters(); - configureAuthenticationHeaders(); + validate(); + handleApiParams(); } + /** - * Validates the authentication token object parameters. - * - * @throws IllegalArgumentException if authentication parameters are missing or invalid + * Validate authentication token object */ - private void validateAuthenticationParameters() { + private void validate() { if (authTokenObject.getAuthType() == null) { - throw new IllegalArgumentException("Authentication type (authType) is required"); + throw new IllegalArgumentException("Missing authType attribute"); } if (authTokenObject.getAccessToken() == null) { if (authTokenObject.getUsername() == null || authTokenObject.getPassword() == null) { throw new IllegalArgumentException( - "Either access token or username/password combination is required"); + "Either username and password or access_token should be present"); } } - if (!OAUTH_AUTH_TYPE.equals(authTokenObject.getAuthType()) && - !BASIC_AUTH_TYPE.equals(authTokenObject.getAuthType())) { - throw new IllegalArgumentException( - "Authentication type must be either '" + OAUTH_AUTH_TYPE + "' or '" + BASIC_AUTH_TYPE + "'"); + if (!"oauth".equals(authTokenObject.getAuthType()) && + !"basic".equals(authTokenObject.getAuthType())) { + throw new IllegalArgumentException("authType should be either oauth or basic"); } } /** - * Configures authentication headers based on the authentication type. + * Handle API parameters and set headers */ - private void configureAuthenticationHeaders() { + private void handleApiParams() { Map headers = new HashMap<>(); - if (OAUTH_AUTH_TYPE.equals(authTokenObject.getAuthType())) { - headers.put(AUTHORIZATION_HEADER, BEARER_PREFIX + authTokenObject.getAccessToken()); - } else if (BASIC_AUTH_TYPE.equals(authTokenObject.getAuthType())) { - String credentials = authTokenObject.getUsername() + ":" + authTokenObject.getPassword(); - String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes()); - headers.put(AUTHORIZATION_HEADER, BASIC_PREFIX + encodedCredentials); + if ("oauth".equals(authTokenObject.getAuthType())) { + headers.put("Authorization", "Bearer " + authTokenObject.getAccessToken()); + } else if ("basic".equals(authTokenObject.getAuthType())) { + String authStr = authTokenObject.getUsername() + ":" + authTokenObject.getPassword(); + String authB64 = Base64.getEncoder().encodeToString(authStr.getBytes()); + headers.put("Authorization", "Basic " + authB64); } authTokenObject.setHeaders(headers); } /** - * Executes a GET request to the specified URL. - * - * @param url The target URL for the GET request - * @return Response data as a Map, or error information if the request fails + * Execute GET command + * @param url Request URL + * @return Response data as Map */ - private Map executeGetRequest(String url) { + private Map executeCommand(String url) { try { Request.Builder requestBuilder = new Request.Builder().url(url); - // Add authentication headers - addAuthenticationHeaders(requestBuilder); + // Add headers + if (authTokenObject.getHeaders() != null) { + for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { + requestBuilder.addHeader(header.getKey(), header.getValue()); + } + } Request request = requestBuilder.build(); - try (Response response = httpClient.newCall(request).execute()) { - return parseJsonResponse(response); + try (Response response = client.newCall(request).execute()) { + if (response.body() != null) { + String responseBody = response.body().string(); + return objectMapper.readValue(responseBody, Map.class); + } } - } catch (IOException e) { - LOGGER.log(Level.SEVERE, "Error executing GET request to " + url, e); - return createErrorResponse("Network error: " + e.getMessage()); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Unexpected error during GET request to " + url, e); - return createErrorResponse("Unexpected error: " + e.getMessage()); - } - } - - /** - * Adds authentication headers to the request builder. - * - * @param requestBuilder The request builder to add headers to - */ - private void addAuthenticationHeaders(Request.Builder requestBuilder) { - if (authTokenObject.getHeaders() != null) { - authTokenObject.getHeaders().forEach(requestBuilder::addHeader); - } - } - - /** - * Parses JSON response from HTTP response. - * - * @param response The HTTP response to parse - * @return Parsed JSON as Map - * @throws IOException if parsing fails - */ - @SuppressWarnings("unchecked") - private Map parseJsonResponse(Response response) throws IOException { - if (response.body() != null) { - String responseBody = response.body().string(); - if (!responseBody.isEmpty()) { - return objectMapper.readValue(responseBody, Map.class); - } + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + return errorMap; } + return new HashMap<>(); } /** - * Creates an error response map. - * - * @param errorMessage The error message to include - * @return Map containing error information - */ - private Map createErrorResponse(String errorMessage) { - Map errorResponse = new HashMap<>(); - errorResponse.put("error", true); - errorResponse.put("error_message", errorMessage); - return errorResponse; - } - - /** - * Executes a POST request with optional file upload. - * - * @param url The target URL for the POST request - * @param data Form data to include in the request - * @param filePath Path to file for upload (optional) - * @return HTTP Response object or error message + * Execute POST request + * @param url Request URL + * @param data Request data + * @param filePath File path for upload + * @return Response object */ private Object executePostRequest(String url, Map data, String filePath) { try { - MultipartBody.Builder formBuilder = new MultipartBody.Builder() + MultipartBody.Builder builder = new MultipartBody.Builder() .setType(MultipartBody.FORM); - // Add form data parameters - addFormDataParameters(formBuilder, data); + // Add data parameters + if (data != null) { + for (Map.Entry entry : data.entrySet()) { + builder.addFormDataPart(entry.getKey(), entry.getValue().toString()); + } + } - // Add file if specified - addFileToForm(formBuilder, filePath); + // Add file if provided + if (filePath != null) { + File file = new File(filePath); + if (file.exists()) { + RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/pdf")); + builder.addFormDataPart("files", file.getName(), fileBody); + } + } + + RequestBody requestBody = builder.build(); - RequestBody requestBody = formBuilder.build(); Request.Builder requestBuilder = new Request.Builder() .url(url) .post(requestBody); - addAuthenticationHeaders(requestBuilder); + // Add headers + if (authTokenObject.getHeaders() != null) { + for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { + requestBuilder.addHeader(header.getKey(), header.getValue()); + } + } + Request request = requestBuilder.build(); - try (Response response = httpClient.newCall(request).execute()) { - LOGGER.info("POST request completed with response code: " + response.code()); + try (Response response = client.newCall(request).execute()) { + System.out.println("Response code: " + response.code()); return response; } - } catch (IOException e) { - LOGGER.log(Level.SEVERE, "IO error during POST request to " + url, e); - return "IO error during file upload: " + e.getMessage(); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Unexpected error during POST request to " + url, e); - return "Unexpected error during request: " + e.getMessage(); + System.err.println("[ERROR] -------- Error during API request with " + filePath + ": " + e.getMessage()); + return "Error loading/reading file"; } } - /** - * Adds form data parameters to the multipart form builder. - * - * @param formBuilder The form builder to add parameters to - * @param data The data parameters to add - */ - private void addFormDataParameters(MultipartBody.Builder formBuilder, Map data) { - if (data != null) { - data.forEach((key, value) -> - formBuilder.addFormDataPart(key, String.valueOf(value)) - ); - } - } - - /** - * Adds a file to the multipart form if the file path is provided and valid. - * - * @param formBuilder The form builder to add the file to - * @param filePath The path to the file to upload - */ - private void addFileToForm(MultipartBody.Builder formBuilder, String filePath) { - if (filePath != null && !filePath.trim().isEmpty()) { - File file = new File(filePath); - if (file.exists() && file.isFile()) { - RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/pdf")); - formBuilder.addFormDataPart("files", file.getName(), fileBody); - } else { - LOGGER.warning("File not found or invalid: " + filePath); - } - } - } - - // API endpoint methods - @Override public Map getUser() { - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/user"); + String url = api + "/v1/user"; + return executeCommand(url); } @Override public Map checkTest() { - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/test"); + String url = api + "/v1/test"; + return executeCommand(url); } @Override public Map checkAccess(String documentId) { - if (documentId == null || documentId.trim().isEmpty()) { - return createErrorResponse("Document ID is required"); - } - return executeGetRequest(apiBaseUrl + "/files/giles/" + documentId + "/access/check"); + String url = api + "/files/giles/" + documentId + "/access/check"; + return executeCommand(url); } @Override public Map getDataByEndpoint(String endpoint) { - if (endpoint == null || endpoint.trim().isEmpty()) { - return createErrorResponse("Endpoint is required"); - } - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + endpoint); + String url = api + "/v1" + endpoint; + return executeCommand(url); } @Override public Map getGroups() { - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups"); + String url = api + "/v1/groups"; + return executeCommand(url); } @Override public Map getGroupInfo(String groupId) { - if (groupId == null || groupId.trim().isEmpty()) { - return createErrorResponse("Group ID is required"); - } - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + groupId); + String url = api + "/v1/groups/" + groupId; + return executeCommand(url); } @Override public Map getGroupItems(String zoteroGroupId) { - if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { - return createErrorResponse("Zotero Group ID is required"); - } - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + "/items"); + String url = api + "/v1/groups/" + zoteroGroupId + "/items"; + return executeCommand(url); } @Override public Map getCollections(String zoteroGroupId) { - if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { - return createErrorResponse("Zotero Group ID is required"); - } - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + "/collections"); + String url = api + "/v1/groups/" + zoteroGroupId + "/collections"; + return executeCommand(url); } @Override public Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber) { - if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { - return createErrorResponse("Zotero Group ID is required"); - } - if (collectionId == null || collectionId.trim().isEmpty()) { - return createErrorResponse("Collection ID is required"); - } - - String url = apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + - "/collections/" + collectionId + "/items"; - + String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; if (pageNumber > 0) { - url += "?page=" + pageNumber; + url += "?&page=" + pageNumber; } - - return executeGetRequest(url); + return executeCommand(url); } @Override @@ -322,32 +231,19 @@ public Map getCollectionItems(String zoteroGroupId, String colle @Override public Map getItemInfo(String zoteroGroupId, String itemId) { - if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { - return createErrorResponse("Zotero Group ID is required"); - } - if (itemId == null || itemId.trim().isEmpty()) { - return createErrorResponse("Item ID is required"); - } - return executeGetRequest(apiBaseUrl + API_VERSION_PATH + "/groups/" + zoteroGroupId + "/items/" + itemId); + String url = api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId; + return executeCommand(url); } @Override public Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId) { - if (zoteroGroupId == null || zoteroGroupId.trim().isEmpty()) { - return createErrorResponse("Zotero Group ID is required"); - } - if (collectionId == null || collectionId.trim().isEmpty()) { - return createErrorResponse("Collection ID is required"); - } - return executeGetRequest(apiBaseUrl + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"); + String url = api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"; + return executeCommand(url); } @Override public Object addItem(String groupId, Map data, String filePath) { - if (groupId == null || groupId.trim().isEmpty()) { - return "Group ID is required"; - } - String url = apiBaseUrl + API_VERSION_PATH + "/groups/" + groupId + "/items/create"; + String url = api + "/v1/groups/" + groupId + "/items/create"; return executePostRequest(url, data, filePath); } -} \ No newline at end of file +} From 5e26a162e714e250eedcf180fdc064cfad930e13 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Mon, 8 Sep 2025 11:53:02 -0700 Subject: [PATCH 10/31] [VSPC-189] created citesphere controller to handle calls to citesphere --- vspace/pom.xml | 7 + .../web/staff/CitesphereController.java | 254 ++++++++++++++++++ vspace/src/main/resources/app.properties | 5 + vspace/src/main/resources/config.properties | 7 +- 4 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java diff --git a/vspace/pom.xml b/vspace/pom.xml index c453493ef..844afaf9a 100644 --- a/vspace/pom.xml +++ b/vspace/pom.xml @@ -219,6 +219,13 @@ 0.15.0 + + + com.squareup.okhttp3 + okhttp + 4.9.3 + + org.thymeleaf diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java new file mode 100644 index 000000000..999260800 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -0,0 +1,254 @@ +package edu.asu.diging.vspace.web.staff; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import edu.asu.diging.vspace.core.model.IReference; +import edu.asu.diging.vspace.core.services.CitesphereAuthToken; +import edu.asu.diging.vspace.core.services.ICitesphereManager; +import edu.asu.diging.vspace.core.services.IReferenceManager; +import edu.asu.diging.vspace.core.services.impl.CitesphereManager; + +@Controller +public class CitesphereController { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${citesphere_api_url:https://citesphere.org/api}") + private String citesphereApiUrl; + + @Value("${citesphere_username:}") + private String citesphereUsername; + + @Value("${citesphere_password:}") + private String citespherePassword; + + @Autowired + private IReferenceManager referenceManager; + + /** + * Get user groups from Citesphere + */ + @RequestMapping(value = "/staff/citesphere/groups", method = RequestMethod.GET) + @ResponseBody + public ResponseEntity> getGroups() { + try { + ICitesphereManager citesphereManager = createCitesphereManager(); + Map groups = citesphereManager.getGroups(); + return ResponseEntity.ok(groups); + } catch (Exception e) { + logger.error("Error fetching groups from Citesphere", e); + Map error = new HashMap<>(); + error.put("error", "Failed to fetch groups: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + /** + * Get collections for a specific group + */ + @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) + @ResponseBody + public ResponseEntity> getCollections(@PathVariable String groupId) { + try { + ICitesphereManager citesphereManager = createCitesphereManager(); + Map collections = citesphereManager.getCollections(groupId); + return ResponseEntity.ok(collections); + } catch (Exception e) { + logger.error("Error fetching collections from Citesphere for group: " + groupId, e); + Map error = new HashMap<>(); + error.put("error", "Failed to fetch collections: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + /** + * Get items for a specific collection + */ + @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) + @ResponseBody + public ResponseEntity> getCollectionItems( + @PathVariable String groupId, + @PathVariable String collectionId, + @RequestParam(value = "page", defaultValue = "0") int page) { + try { + ICitesphereManager citesphereManager = createCitesphereManager(); + Map items = citesphereManager.getCollectionItems(groupId, collectionId, page); + return ResponseEntity.ok(items); + } catch (Exception e) { + logger.error("Error fetching collection items from Citesphere", e); + Map error = new HashMap<>(); + error.put("error", "Failed to fetch collection items: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + /** + * Get all items for a specific group + */ + @RequestMapping(value = "/staff/citesphere/groups/{groupId}/items", method = RequestMethod.GET) + @ResponseBody + public ResponseEntity> getGroupItems(@PathVariable String groupId) { + try { + ICitesphereManager citesphereManager = createCitesphereManager(); + Map items = citesphereManager.getGroupItems(groupId); + return ResponseEntity.ok(items); + } catch (Exception e) { + logger.error("Error fetching group items from Citesphere for group: " + groupId, e); + Map error = new HashMap<>(); + error.put("error", "Failed to fetch group items: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + /** + * Import selected references from Citesphere to bibliography + */ + @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/bibliography/{biblioId}/citesphere/import", method = RequestMethod.POST) + @ResponseBody + public ResponseEntity> importCitesphereReferences( + @PathVariable String moduleId, + @PathVariable String slideId, + @PathVariable String biblioId, + @RequestBody List> selectedReferences) { + + try { + List createdReferences = new ArrayList<>(); + + for (Map refData : selectedReferences) { + String title = extractField(refData, "title"); + String author = extractCreators(refData); + String year = extractYear(refData); + String journal = extractField(refData, "publicationTitle"); + String url = extractField(refData, "url"); + String volume = extractField(refData, "volume"); + String issue = extractField(refData, "issue"); + String pages = extractField(refData, "pages"); + String editors = extractField(refData, "editor"); + String type = extractField(refData, "itemType"); + String note = extractField(refData, "note"); + + IReference reference = referenceManager.createReference( + biblioId, title, author, year, journal, url, volume, issue, pages, editors, type, note + ); + + createdReferences.add(reference); + logger.info("Created reference: {}", title); + } + + Map response = new HashMap<>(); + response.put("success", true); + response.put("imported_count", createdReferences.size()); + response.put("references", createdReferences); + + return ResponseEntity.ok(response); + + } catch (Exception e) { + logger.error("Error importing references from Citesphere", e); + Map error = new HashMap<>(); + error.put("error", "Failed to import references: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + } + + private ICitesphereManager createCitesphereManager() { + CitesphereAuthToken authToken = new CitesphereAuthToken(citesphereUsername, citespherePassword); + return new CitesphereManager(citesphereApiUrl, authToken); + } + + @SuppressWarnings("unchecked") + private String extractField(Map refData, String fieldName) { + try { + Map data = (Map) refData.get("data"); + if (data != null && data.containsKey(fieldName)) { + Object value = data.get(fieldName); + return value != null ? value.toString() : ""; + } + } catch (Exception e) { + logger.warn("Error extracting field {}: {}", fieldName, e.getMessage()); + } + return ""; + } + + /** + * Extract creators (authors) from Citesphere reference data + */ + @SuppressWarnings("unchecked") + private String extractCreators(Map refData) { + try { + Map data = (Map) refData.get("data"); + if (data != null && data.containsKey("creators")) { + List> creators = (List>) data.get("creators"); + StringBuilder authors = new StringBuilder(); + + for (Map creator : creators) { + if (authors.length() > 0) { + authors.append("; "); + } + String firstName = creator.getOrDefault("firstName", "").toString(); + String lastName = creator.getOrDefault("lastName", "").toString(); + + if (!lastName.isEmpty()) { + authors.append(lastName); + if (!firstName.isEmpty()) { + authors.append(", ").append(firstName); + } + } else if (!firstName.isEmpty()) { + authors.append(firstName); + } + } + + return authors.toString(); + } + } catch (Exception e) { + logger.warn("Error extracting creators: {}", e.getMessage()); + } + return ""; + } + + /** + * Extract year from Citesphere reference data + */ + @SuppressWarnings("unchecked") + private String extractYear(Map refData) { + try { + Map data = (Map) refData.get("data"); + if (data != null) { + String date = extractField(refData, "date"); + if (!date.isEmpty()) { + String[] parts = date.split("-"); + if (parts.length > 0 && parts[0].matches("\\d{4}")) { + return parts[0]; + } + } + + String accessDate = extractField(refData, "accessDate"); + if (!accessDate.isEmpty()) { + String[] parts = accessDate.split("-"); + if (parts.length > 0 && parts[0].matches("\\d{4}")) { + return parts[0]; + } + } + } + } catch (Exception e) { + logger.warn("Error extracting year: {}", e.getMessage()); + } + return ""; + } +} diff --git a/vspace/src/main/resources/app.properties b/vspace/src/main/resources/app.properties index bebd58784..12e88020f 100644 --- a/vspace/src/main/resources/app.properties +++ b/vspace/src/main/resources/app.properties @@ -15,3 +15,8 @@ file_uploads_directory=${files.directory.path} hibernate_show_sql=${hibernate.show_sql} admin_username=${admin.username} + +# Citesphere integration +citesphere.api.url=${citesphere_api_url} +citesphere.username=${citesphere_username} +citesphere.password=${citesphere_password} diff --git a/vspace/src/main/resources/config.properties b/vspace/src/main/resources/config.properties index adf448ef1..efc0a4077 100644 --- a/vspace/src/main/resources/config.properties +++ b/vspace/src/main/resources/config.properties @@ -13,4 +13,9 @@ image_category_SPACE_BACKGROUND_IMAGE=Space Background Image image_category_SLIDE_IMAGE=Slide Image image_category_LINK_IMAGE=Link Image buildNum=${buildNumber} -baseUrl=${app.url} \ No newline at end of file +baseUrl=${app.url} + +# Citesphere API Configuration +citesphere_api_url=${citesphere.api.url:https://citesphere.org/api} +citesphere_username=${citesphere.username:} +citesphere_password=${citesphere.password:} \ No newline at end of file From e8fca0ab97234674e2bf6b9697715c125e652376 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Wed, 10 Sep 2025 11:55:04 -0700 Subject: [PATCH 11/31] [VSPC-189] Added auoth flow to connect with citesphere --- .../web/staff/CitesphereController.java | 169 ++++++++++++++++-- 1 file changed, 154 insertions(+), 15 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 999260800..125c8f393 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -18,7 +18,13 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.ui.Model; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import javax.servlet.http.HttpSession; +import java.io.UnsupportedEncodingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import okhttp3.*; import edu.asu.diging.vspace.core.model.IReference; import edu.asu.diging.vspace.core.services.CitesphereAuthToken; import edu.asu.diging.vspace.core.services.ICitesphereManager; @@ -33,23 +39,100 @@ public class CitesphereController { @Value("${citesphere_api_url:https://citesphere.org/api}") private String citesphereApiUrl; - @Value("${citesphere_username:}") - private String citesphereUsername; + @Value("${citesphere_client_id:}") + private String citesphereClientId; - @Value("${citesphere_password:}") - private String citespherePassword; + @Value("${citesphere_client_secret:}") + private String citesphereClientSecret; + + @Value("${app_base_url:}") + private String appBaseUrl; @Autowired private IReferenceManager referenceManager; + + /** + * Initiate OAuth authorization with Citesphere + */ + @RequestMapping(value = "/staff/citesphere/oauth/authorize", method = RequestMethod.GET) + public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttributes) { + if (citesphereClientId == null || citesphereClientId.isEmpty()) { + redirectAttributes.addFlashAttribute("error", "Citesphere OAuth is not configured. Please contact your administrator."); + return "redirect:/staff/dashboard"; + } + + try { + // Generate state parameter for security + String state = java.util.UUID.randomUUID().toString(); + session.setAttribute("citesphere_oauth_state", state); + + // Build authorization URL + String baseUrl = citesphereApiUrl.replace("/api", ""); + String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; + + String authUrl = baseUrl + "/oauth/authorize" + + "?response_type=code" + + "&client_id=" + java.net.URLEncoder.encode(citesphereClientId, "UTF-8") + + "&state=" + java.net.URLEncoder.encode(state, "UTF-8") + + "&redirect_uri=" + java.net.URLEncoder.encode(redirectUri, "UTF-8"); + + return "redirect:" + authUrl; + } catch (UnsupportedEncodingException e) { + logger.error("Error encoding OAuth parameters", e); + redirectAttributes.addFlashAttribute("error", "Error initiating OAuth flow."); + return "redirect:/staff/dashboard"; + } + } + + /** + * Handle OAuth callback from Citesphere + */ + @RequestMapping(value = "/staff/citesphere/oauth/callback", method = RequestMethod.GET) + public String handleOAuthCallback( + @RequestParam String code, + @RequestParam String state, + HttpSession session, + RedirectAttributes redirectAttributes) { + + try { + // Verify state parameter + String sessionState = (String) session.getAttribute("citesphere_oauth_state"); + if (sessionState == null || !sessionState.equals(state)) { + redirectAttributes.addFlashAttribute("error", "Invalid OAuth state. Please try again."); + return "redirect:/staff/dashboard"; + } + + // Exchange code for access token + String accessToken = exchangeCodeForToken(code); + if (accessToken != null) { + // Store token in session + session.setAttribute("citesphere_access_token", accessToken); + redirectAttributes.addFlashAttribute("success", "Successfully connected to Citesphere!"); + } else { + redirectAttributes.addFlashAttribute("error", "Failed to obtain access token from Citesphere."); + } + + } catch (Exception e) { + logger.error("Error handling OAuth callback", e); + redirectAttributes.addFlashAttribute("error", "OAuth authentication failed: " + e.getMessage()); + } finally { + // Clean up session + session.removeAttribute("citesphere_oauth_state"); + } + + return "redirect:/staff/dashboard"; + } + + /** * Get user groups from Citesphere */ @RequestMapping(value = "/staff/citesphere/groups", method = RequestMethod.GET) @ResponseBody - public ResponseEntity> getGroups() { + public ResponseEntity> getGroups(HttpSession session) { try { - ICitesphereManager citesphereManager = createCitesphereManager(); + ICitesphereManager citesphereManager = createCitesphereManager(session); Map groups = citesphereManager.getGroups(); return ResponseEntity.ok(groups); } catch (Exception e) { @@ -65,9 +148,9 @@ public ResponseEntity> getGroups() { */ @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) @ResponseBody - public ResponseEntity> getCollections(@PathVariable String groupId) { + public ResponseEntity> getCollections(@PathVariable String groupId, HttpSession session) { try { - ICitesphereManager citesphereManager = createCitesphereManager(); + ICitesphereManager citesphereManager = createCitesphereManager(session); Map collections = citesphereManager.getCollections(groupId); return ResponseEntity.ok(collections); } catch (Exception e) { @@ -86,9 +169,10 @@ public ResponseEntity> getCollections(@PathVariable String g public ResponseEntity> getCollectionItems( @PathVariable String groupId, @PathVariable String collectionId, - @RequestParam(value = "page", defaultValue = "0") int page) { + @RequestParam(value = "page", defaultValue = "0") int page, + HttpSession session) { try { - ICitesphereManager citesphereManager = createCitesphereManager(); + ICitesphereManager citesphereManager = createCitesphereManager(session); Map items = citesphereManager.getCollectionItems(groupId, collectionId, page); return ResponseEntity.ok(items); } catch (Exception e) { @@ -104,9 +188,9 @@ public ResponseEntity> getCollectionItems( */ @RequestMapping(value = "/staff/citesphere/groups/{groupId}/items", method = RequestMethod.GET) @ResponseBody - public ResponseEntity> getGroupItems(@PathVariable String groupId) { + public ResponseEntity> getGroupItems(@PathVariable String groupId, HttpSession session) { try { - ICitesphereManager citesphereManager = createCitesphereManager(); + ICitesphereManager citesphereManager = createCitesphereManager(session); Map items = citesphereManager.getGroupItems(groupId); return ResponseEntity.ok(items); } catch (Exception e) { @@ -167,9 +251,64 @@ public ResponseEntity> importCitesphereReferences( } } - private ICitesphereManager createCitesphereManager() { - CitesphereAuthToken authToken = new CitesphereAuthToken(citesphereUsername, citespherePassword); - return new CitesphereManager(citesphereApiUrl, authToken); + private ICitesphereManager createCitesphereManager(HttpSession session) { + // Check for OAuth token + String accessToken = (String) session.getAttribute("citesphere_access_token"); + + if (accessToken != null) { + // Use OAuth token + CitesphereAuthToken authToken = new CitesphereAuthToken(accessToken); + return new CitesphereManager(citesphereApiUrl, authToken); + } else { + // No authentication available + throw new IllegalStateException("No Citesphere access token available. Please authenticate first."); + } + } + + /** + * Exchange authorization code for access token + */ + private String exchangeCodeForToken(String code) { + try { + OkHttpClient client = new OkHttpClient(); + + RequestBody formBody = new FormBody.Builder() + .add("grant_type", "authorization_code") + .add("code", code) + .add("client_id", citesphereClientId) + .add("client_secret", citesphereClientSecret) + .add("redirect_uri", getCurrentBaseUrl() + "/staff/citesphere/oauth/callback") + .build(); + + Request request = new Request.Builder() + .url(citesphereApiUrl.replace("/api", "") + "/oauth/token") + .post(formBody) + .build(); + + try (Response response = client.newCall(request).execute()) { + String responseBody = response.body() != null ? response.body().string() : ""; + logger.debug("Token exchange response: {} - {}", response.code(), responseBody); + + if (response.isSuccessful() && !responseBody.isEmpty()) { + ObjectMapper mapper = new ObjectMapper(); + @SuppressWarnings("unchecked") + Map tokenResponse = mapper.readValue(responseBody, Map.class); + return (String) tokenResponse.get("access_token"); + } else { + logger.error("Token exchange failed: {} - {}", response.code(), responseBody); + } + } + } catch (Exception e) { + logger.error("Error exchanging code for token", e); + } + return null; + } + + /** + * Get current base URL for redirect URI + */ + private String getCurrentBaseUrl() { + return appBaseUrl != null && !appBaseUrl.isEmpty() ? appBaseUrl : "http://localhost:8080"; } @SuppressWarnings("unchecked") From 6194bba7f09993e13dcdf19f67fb8eb382dc173e Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 11 Sep 2025 11:58:04 -0700 Subject: [PATCH 12/31] [VSPC-189] Added debug print, fixed endpoints, added implmentation in frontend - need to fix api errors --- .../web/staff/CitesphereController.java | 103 ++++- .../views/staff/modules/slides/slide.html | 389 ++++++++++++++++++ 2 files changed, 476 insertions(+), 16 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 125c8f393..5e2417db5 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -36,16 +36,16 @@ public class CitesphereController { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Value("${citesphere_api_url:https://citesphere.org/api}") + @Value("${citesphere.api.url:}") private String citesphereApiUrl; - @Value("${citesphere_client_id:}") + @Value("${citesphere.client.id:}") private String citesphereClientId; - @Value("${citesphere_client_secret:}") + @Value("${citesphere.client.secret:}") private String citesphereClientSecret; - @Value("${app_base_url:}") + @Value("${app.base.url:http://localhost:8080}") private String appBaseUrl; @Autowired @@ -55,9 +55,15 @@ public class CitesphereController { /** * Initiate OAuth authorization with Citesphere */ - @RequestMapping(value = "/staff/citesphere/oauth/authorize", method = RequestMethod.GET) + @RequestMapping(value = "/api/oauth/authorize", method = RequestMethod.GET) public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttributes) { + logger.info("[DEBUG] Initiating OAuth authorization with Citesphere"); + logger.info("[DEBUG] Citesphere API URL: {}", citesphereApiUrl); + logger.info("[DEBUG] Client ID configured: {}", (citesphereClientId != null && !citesphereClientId.isEmpty())); + logger.info("[DEBUG] Client Secret configured: {}", (citesphereClientSecret != null && !citesphereClientSecret.isEmpty())); + if (citesphereClientId == null || citesphereClientId.isEmpty()) { + logger.error("[DEBUG] OAuth not configured - missing client ID"); redirectAttributes.addFlashAttribute("error", "Citesphere OAuth is not configured. Please contact your administrator."); return "redirect:/staff/dashboard"; } @@ -71,12 +77,17 @@ public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttr String baseUrl = citesphereApiUrl.replace("/api", ""); String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; + logger.info("[DEBUG] Building OAuth URL - Base URL: {}", baseUrl); + logger.info("[DEBUG] Redirect URI: {}", redirectUri); + logger.info("[DEBUG] OAuth State: {}", state); + String authUrl = baseUrl + "/oauth/authorize" + "?response_type=code" + "&client_id=" + java.net.URLEncoder.encode(citesphereClientId, "UTF-8") + "&state=" + java.net.URLEncoder.encode(state, "UTF-8") + "&redirect_uri=" + java.net.URLEncoder.encode(redirectUri, "UTF-8"); + logger.info("[DEBUG] Final OAuth URL: {}", authUrl); return "redirect:" + authUrl; } catch (UnsupportedEncodingException e) { logger.error("Error encoding OAuth parameters", e); @@ -95,21 +106,35 @@ public String handleOAuthCallback( HttpSession session, RedirectAttributes redirectAttributes) { + logger.info("[DEBUG] OAuth callback received"); + logger.info("[DEBUG] Authorization code: {}", code != null ? "[PRESENT]" : "[MISSING]"); + logger.info("[DEBUG] State parameter: {}", state); + try { // Verify state parameter String sessionState = (String) session.getAttribute("citesphere_oauth_state"); + logger.info("[DEBUG] Session state: {}", sessionState); + logger.info("[DEBUG] Received state: {}", state); + logger.info("[DEBUG] State match: {}", sessionState != null && sessionState.equals(state)); + if (sessionState == null || !sessionState.equals(state)) { + logger.error("[DEBUG] OAuth state validation failed"); redirectAttributes.addFlashAttribute("error", "Invalid OAuth state. Please try again."); return "redirect:/staff/dashboard"; } // Exchange code for access token + logger.info("[DEBUG] Exchanging authorization code for access token"); String accessToken = exchangeCodeForToken(code); + logger.info("[DEBUG] Access token received: {}", accessToken != null ? "[SUCCESS]" : "[FAILED]"); + if (accessToken != null) { // Store token in session session.setAttribute("citesphere_access_token", accessToken); + logger.info("[DEBUG] Access token stored in session"); redirectAttributes.addFlashAttribute("success", "Successfully connected to Citesphere!"); } else { + logger.error("[DEBUG] Failed to obtain access token"); redirectAttributes.addFlashAttribute("error", "Failed to obtain access token from Citesphere."); } @@ -128,12 +153,17 @@ public String handleOAuthCallback( /** * Get user groups from Citesphere */ - @RequestMapping(value = "/staff/citesphere/groups", method = RequestMethod.GET) + @RequestMapping(value = "/api/v1/citesphere/groups", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroups(HttpSession session) { + logger.info("[DEBUG] API call: getGroups() - Fetching user groups from Citesphere"); + try { ICitesphereManager citesphereManager = createCitesphereManager(session); + logger.info("[DEBUG] CitesphereManager created successfully, making API call to get groups"); Map groups = citesphereManager.getGroups(); + logger.info("[DEBUG] Groups retrieved successfully: {} groups found", + groups != null && groups.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(groups); } catch (Exception e) { logger.error("Error fetching groups from Citesphere", e); @@ -146,12 +176,17 @@ public ResponseEntity> getGroups(HttpSession session) { /** * Get collections for a specific group */ - @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) + @RequestMapping(value = "/api/v1/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollections(@PathVariable String groupId, HttpSession session) { + logger.info("[DEBUG] API call: getCollections() - Group ID: {}", groupId); + try { ICitesphereManager citesphereManager = createCitesphereManager(session); + logger.info("[DEBUG] CitesphereManager created, fetching collections for group: {}", groupId); Map collections = citesphereManager.getCollections(groupId); + logger.info("[DEBUG] Collections retrieved successfully for group {}: {} collections found", + groupId, collections != null && collections.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(collections); } catch (Exception e) { logger.error("Error fetching collections from Citesphere for group: " + groupId, e); @@ -164,16 +199,21 @@ public ResponseEntity> getCollections(@PathVariable String g /** * Get items for a specific collection */ - @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) + @RequestMapping(value = "/api/v1/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollectionItems( @PathVariable String groupId, @PathVariable String collectionId, @RequestParam(value = "page", defaultValue = "0") int page, HttpSession session) { + logger.info("[DEBUG] API call: getCollectionItems() - Group: {}, Collection: {}, Page: {}", groupId, collectionId, page); + try { ICitesphereManager citesphereManager = createCitesphereManager(session); + logger.info("[DEBUG] CitesphereManager created, fetching items for collection: {} in group: {}", collectionId, groupId); Map items = citesphereManager.getCollectionItems(groupId, collectionId, page); + logger.info("[DEBUG] Collection items retrieved successfully: {} items found", + items != null && items.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(items); } catch (Exception e) { logger.error("Error fetching collection items from Citesphere", e); @@ -186,12 +226,17 @@ public ResponseEntity> getCollectionItems( /** * Get all items for a specific group */ - @RequestMapping(value = "/staff/citesphere/groups/{groupId}/items", method = RequestMethod.GET) + @RequestMapping(value = "/api/v1/groups/{groupId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroupItems(@PathVariable String groupId, HttpSession session) { + logger.info("[DEBUG] API call: getGroupItems() - Group ID: {}", groupId); + try { ICitesphereManager citesphereManager = createCitesphereManager(session); + logger.info("[DEBUG] CitesphereManager created, fetching all items for group: {}", groupId); Map items = citesphereManager.getGroupItems(groupId); + logger.info("[DEBUG] Group items retrieved successfully: {} items found", + items != null && items.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(items); } catch (Exception e) { logger.error("Error fetching group items from Citesphere for group: " + groupId, e); @@ -204,7 +249,7 @@ public ResponseEntity> getGroupItems(@PathVariable String gr /** * Import selected references from Citesphere to bibliography */ - @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/bibliography/{biblioId}/citesphere/import", method = RequestMethod.POST) + @RequestMapping(value = "/api/v1/groups/{groupId}/collections/{collectionId}/items/", method = RequestMethod.POST) @ResponseBody public ResponseEntity> importCitesphereReferences( @PathVariable String moduleId, @@ -212,6 +257,9 @@ public ResponseEntity> importCitesphereReferences( @PathVariable String biblioId, @RequestBody List> selectedReferences) { + logger.info("[DEBUG] API call: importCitesphereReferences() - Module: {}, Slide: {}, Bibliography: {}", moduleId, slideId, biblioId); + logger.info("[DEBUG] Number of references to import: {}", selectedReferences != null ? selectedReferences.size() : 0); + try { List createdReferences = new ArrayList<>(); @@ -252,15 +300,22 @@ public ResponseEntity> importCitesphereReferences( } private ICitesphereManager createCitesphereManager(HttpSession session) { + logger.info("[DEBUG] Creating CitesphereManager"); + // Check for OAuth token String accessToken = (String) session.getAttribute("citesphere_access_token"); + logger.info("[DEBUG] Access token in session: {}", accessToken != null ? "[PRESENT]" : "[MISSING]"); + logger.info("[DEBUG] API URL: {}", citesphereApiUrl); if (accessToken != null) { // Use OAuth token + logger.info("[DEBUG] Creating CitesphereAuthToken with access token"); CitesphereAuthToken authToken = new CitesphereAuthToken(accessToken); + logger.info("[DEBUG] Creating CitesphereManager with API URL: {} and auth token", citesphereApiUrl); return new CitesphereManager(citesphereApiUrl, authToken); } else { // No authentication available + logger.error("[DEBUG] No access token available in session - authentication required"); throw new IllegalStateException("No Citesphere access token available. Please authenticate first."); } } @@ -269,33 +324,49 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { * Exchange authorization code for access token */ private String exchangeCodeForToken(String code) { + logger.info("[DEBUG] Starting token exchange process"); + logger.info("[DEBUG] Authorization code: {}", code != null ? "[PRESENT]" : "[MISSING]"); + try { OkHttpClient client = new OkHttpClient(); + String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; + String tokenUrl = citesphereApiUrl.replace("/api", "") + "/oauth/token"; + + logger.info("[DEBUG] Token exchange URL: {}", tokenUrl); + logger.info("[DEBUG] Redirect URI: {}", redirectUri); + logger.info("[DEBUG] Client ID: {}", citesphereClientId != null ? "[PRESENT]" : "[MISSING]"); + logger.info("[DEBUG] Client Secret: {}", citesphereClientSecret != null ? "[PRESENT]" : "[MISSING]"); - RequestBody formBody = new FormBody.Builder() + okhttp3.RequestBody formBody = new FormBody.Builder() .add("grant_type", "authorization_code") .add("code", code) .add("client_id", citesphereClientId) .add("client_secret", citesphereClientSecret) - .add("redirect_uri", getCurrentBaseUrl() + "/staff/citesphere/oauth/callback") + .add("redirect_uri", redirectUri) .build(); Request request = new Request.Builder() - .url(citesphereApiUrl.replace("/api", "") + "/oauth/token") + .url(tokenUrl) .post(formBody) .build(); + logger.info("[DEBUG] Making token exchange request to: {}", tokenUrl); + try (Response response = client.newCall(request).execute()) { String responseBody = response.body() != null ? response.body().string() : ""; - logger.debug("Token exchange response: {} - {}", response.code(), responseBody); + logger.info("[DEBUG] Token exchange response code: {}", response.code()); + logger.info("[DEBUG] Token exchange response body: {}", responseBody); if (response.isSuccessful() && !responseBody.isEmpty()) { + logger.info("[DEBUG] Token exchange successful, parsing response"); ObjectMapper mapper = new ObjectMapper(); @SuppressWarnings("unchecked") Map tokenResponse = mapper.readValue(responseBody, Map.class); - return (String) tokenResponse.get("access_token"); + String accessToken = (String) tokenResponse.get("access_token"); + logger.info("[DEBUG] Access token extracted: {}", accessToken != null ? "[SUCCESS]" : "[FAILED]"); + return accessToken; } else { - logger.error("Token exchange failed: {} - {}", response.code(), responseBody); + logger.error("[DEBUG] Token exchange failed - Response code: {}, Body: {}", response.code(), responseBody); } } } catch (Exception e) { diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 5c7317dc8..72a83f2f8 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -2668,6 +2668,395 @@ $("#addVideoAlert").show(); } }); + + + var citesphereData = { + selectedReferences: [], + groups: [], + collections: {} + }; + + // Initialize Citesphere functionality when modal is shown + $('#addReferenceAlert').on('shown.bs.modal', function () { + // Show/hide appropriate tab content and buttons based on active tab + updateReferenceModalButtons(); + + // If Citesphere tab is active, load initial data + if ($('#citesphereRefTab').hasClass('active')) { + loadCitesphereGroups(); + } + }); + + // Tab switching handlers + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + updateReferenceModalButtons(); + + // Load Citesphere data when switching to Citesphere tab + if ($(e.target).attr('href') === '#citesphereRefTab') { + loadCitesphereGroups(); + } + }); + + function updateReferenceModalButtons() { + var isCitesphereTab = $('#citesphereRefTab').hasClass('active'); + + if (isCitesphereTab) { + $('#submitReference').hide(); + $('#submitCitesphereReferences').show(); + } else { + $('#submitReference').show(); + $('#submitCitesphereReferences').hide(); + } + } + + // Load user groups from Citesphere + function loadCitesphereGroups() { + var token = $('input[name="_csrf"]').attr('value'); + + $.ajax({ + url: '/staff/citesphere/groups', + type: 'GET', + headers: { + 'X-CSRF-Token': token + }, + success: function(data) { + displayCitesphereGroups(data); + citesphereData.groups = data; + }, + error: function(xhr, status, error) { + console.error('Error loading Citesphere groups:', error); + if (xhr.status === 500 && xhr.responseText && xhr.responseText.includes('access token')) { + // User needs to authenticate + $('#citesphereCollections').html( + '
' + + '
Authentication Required
' + + '

You need to authenticate with Citesphere to access your bibliography data.

' + + '' + + ' Connect to Citesphere' + + '' + + '
' + ); + } else { + $('#citesphereCollections').html('
Error loading groups. Please check your Citesphere credentials.
'); + } + } + }); + } + + // Display groups and collections + function displayCitesphereGroups(groupsData) { + var collectionsContainer = $('#citesphereCollections'); + collectionsContainer.empty(); + + if (!groupsData || !groupsData.data || !Array.isArray(groupsData.data)) { + collectionsContainer.html('
No groups found.
'); + return; + } + + groupsData.data.forEach(function(group) { + var groupElement = $('
' + + '
' + (group.name || 'Unnamed Group') + '
' + + 'Click to load collections' + + '
'); + + groupElement.click(function() { + loadGroupCollections(group.zoteroGroupId || group.id, group.name); + }); + + collectionsContainer.append(groupElement); + }); + } + + // Load collections for a specific group + function loadGroupCollections(groupId, groupName) { + var token = $('input[name="_csrf"]').attr('value'); + + $.ajax({ + url: '/staff/citesphere/groups/' + groupId + '/collections', + type: 'GET', + headers: { + 'X-CSRF-Token': token + }, + success: function(data) { + displayCollections(data, groupId, groupName); + loadGroupItems(groupId, groupName); // Also load individual items + }, + error: function(xhr, status, error) { + console.error('Error loading collections for group ' + groupId + ':', error); + } + }); + } + + // Display collections for a group + function displayCollections(collectionsData, groupId, groupName) { + var collectionsContainer = $('#citesphereCollections'); + collectionsContainer.empty(); + + // Add back button + var backButton = $(''); + backButton.click(function() { + loadCitesphereGroups(); + }); + collectionsContainer.append(backButton); + + var groupHeader = $('
' + groupName + ' - Collections
'); + collectionsContainer.append(groupHeader); + + if (!collectionsData || !collectionsData.data || !Array.isArray(collectionsData.data)) { + collectionsContainer.append('
No collections found in this group.
'); + return; + } + + collectionsData.data.forEach(function(collection) { + var collectionElement = $('
' + + '
' + (collection.data.name || 'Unnamed Collection') + '
' + + 'Click to load items' + + '
'); + + collectionElement.click(function() { + loadCollectionItems(groupId, collection.data.key, collection.data.name); + }); + + collectionsContainer.append(collectionElement); + }); + } + + // Load individual items for a group (not in collections) + function loadGroupItems(groupId, groupName) { + var token = $('input[name="_csrf"]').attr('value'); + + $.ajax({ + url: '/staff/citesphere/groups/' + groupId + '/items', + type: 'GET', + headers: { + 'X-CSRF-Token': token + }, + success: function(data) { + displayIndividualItems(data, 'Individual Items in ' + groupName); + }, + error: function(xhr, status, error) { + console.error('Error loading group items:', error); + } + }); + } + + // Load items from a specific collection + function loadCollectionItems(groupId, collectionId, collectionName) { + var token = $('input[name="_csrf"]').attr('value'); + + $.ajax({ + url: '/staff/citesphere/groups/' + groupId + '/collections/' + collectionId + '/items', + type: 'GET', + headers: { + 'X-CSRF-Token': token + }, + success: function(data) { + displayIndividualItems(data, 'Items in ' + collectionName); + }, + error: function(xhr, status, error) { + console.error('Error loading collection items:', error); + } + }); + } + + // Display individual references/items + function displayIndividualItems(itemsData, title) { + var referencesContainer = $('#citesphereReferences'); + referencesContainer.empty(); + + var titleElement = $('
' + title + '
'); + referencesContainer.append(titleElement); + + if (!itemsData || !itemsData.data || !Array.isArray(itemsData.data)) { + referencesContainer.append('
No items found.
'); + return; + } + + itemsData.data.forEach(function(item) { + var itemData = item.data || {}; + var title = itemData.title || 'Untitled'; + var author = extractAuthorsFromItem(itemData); + var year = extractYearFromItem(itemData); + var type = itemData.itemType || 'unknown'; + + var checkbox = $(''); + checkbox.data('item', item); + + var itemElement = $('
' + + '
' + + '
' + + '
' + + '
' + title + '
' + + '
' + author + (year ? ' (' + year + ')' : '') + '
' + + '
Type: ' + type + '
' + + '
' + + '
' + + '
'); + + itemElement.find('div').first().prepend(checkbox); + + // Handle selection + checkbox.change(function() { + if (this.checked) { + citesphereData.selectedReferences.push(item); + } else { + citesphereData.selectedReferences = citesphereData.selectedReferences.filter(function(ref) { + return ref.key !== item.key; + }); + } + updateSelectedCount(); + }); + + referencesContainer.append(itemElement); + }); + } + + // Helper function to extract authors from Citesphere item + function extractAuthorsFromItem(itemData) { + if (!itemData.creators || !Array.isArray(itemData.creators)) { + return 'Unknown Author'; + } + + var authors = itemData.creators.map(function(creator) { + var firstName = creator.firstName || ''; + var lastName = creator.lastName || ''; + + if (lastName && firstName) { + return lastName + ', ' + firstName; + } else if (lastName) { + return lastName; + } else if (firstName) { + return firstName; + } + return ''; + }).filter(Boolean); + + return authors.length > 0 ? authors.join('; ') : 'Unknown Author'; + } + + // Helper function to extract year from Citesphere item + function extractYearFromItem(itemData) { + var date = itemData.date || itemData.accessDate || ''; + if (date) { + var match = date.match(/(\d{4})/); + return match ? match[1] : ''; + } + return ''; + } + + // Update selected count display + function updateSelectedCount() { + var count = citesphereData.selectedReferences.length; + $('#selectedCountText').text(count + ' reference' + (count !== 1 ? 's' : '')); + } + + // Handle search functionality + $('#searchCitesphereBtn').click(function() { + var searchTerm = $('#citesphereSearch').val().trim(); + if (searchTerm) { + // For now, just show an informative message since Citesphere API doesn't have search endpoint yet + $('#citesphereReferences').html( + '
' + + '
Search Not Available
' + + '

Search functionality is not yet available in the Citesphere API. Please browse through your groups and collections above to find references.

' + + '
' + ); + } else { + // Reload current view + loadCitesphereGroups(); + } + }); + + // Allow search on Enter key + $('#citesphereSearch').keypress(function(e) { + if (e.which === 13) { + $('#searchCitesphereBtn').click(); + } + }); + + // Handle importing selected references + $('#submitCitesphereReferences').click(function() { + if (citesphereData.selectedReferences.length === 0) { + alert('Please select at least one reference to import.'); + return; + } + + var biblioId = $('#addReferenceTarget').val(); + if (!biblioId) { + alert('Error: Could not determine bibliography block.'); + return; + } + + var moduleId = '[[${module.id}]]'; + var slideId = '[[${slide.id}]]'; + var token = $('input[name="_csrf"]').attr('value'); + + $.ajax({ + url: '/staff/module/' + moduleId + '/slide/' + slideId + '/bibliography/' + biblioId + '/citesphere/import', + type: 'POST', + contentType: 'application/json', + headers: { + 'X-CSRF-Token': token + }, + data: JSON.stringify(citesphereData.selectedReferences), + success: function(response) { + if (response.success) { + alert('Successfully imported ' + response.imported_count + ' references from Citesphere!'); + + // Add the imported references to the bibliography block + var biblioBlock = $('[data-biblio-id="' + biblioId + '"]').closest('[data-biblio-block]'); + var referenceSpace = biblioBlock.find('#referenceSpace'); + + response.references.forEach(function(ref) { + var referenceHtml = '
' + + '

' + + 'Type: ' + (ref.type || '') + ', ' + + 'Reference Title: ' + (ref.title || '') + ', ' + + 'Author: ' + (ref.author || '') + ', ' + + 'Year: ' + (ref.year || '') + ', ' + + 'Journal: ' + (ref.journal || '') + ', ' + + 'Url: ' + (ref.url || '') + ', ' + + 'Volume: ' + (ref.volume || '') + ', ' + + 'Issue: ' + (ref.issue || '') + ', ' + + 'Pages: ' + (ref.pages || '') + ', ' + + 'Editors: ' + (ref.editors || '') + ', ' + + 'Note: ' + (ref.note || '') + '' + + '

' + + '' + + '' + + '' + + '' + + '
'; + + var refElement = $(referenceHtml); + refElement.mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(referenceBlockDoubleClick); + referenceSpace.append(refElement); + }); + + // Reset and close modal + citesphereData.selectedReferences = []; + updateSelectedCount(); + $('#addReferenceAlert').modal('hide'); + } else { + alert('Error importing references: ' + (response.error || 'Unknown error')); + } + }, + error: function(xhr, status, error) { + console.error('Error importing references:', error); + alert('Error importing references. Please try again.'); + } + }); + }); + + // Clear Citesphere data when modal is hidden + $('#addReferenceAlert').on('hidden.bs.modal', function () { + citesphereData.selectedReferences = []; + updateSelectedCount(); + $('#citesphereCollections').empty(); + $('#citesphereReferences').empty(); + $('#citesphereSearch').val(''); + }); + From 6478a4a936a548657c43cb960c52011e28cbb578 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 12 Sep 2025 14:33:21 -0700 Subject: [PATCH 13/31] [VSPC-189] Fixed oauth flow and citesphere controller --- .../diging/vspace/config/SecurityContext.java | 3 ++- .../vspace/web/staff/CitesphereController.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/config/SecurityContext.java b/vspace/src/main/java/edu/asu/diging/vspace/config/SecurityContext.java index 494ce166d..8b8cccfed 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/config/SecurityContext.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/config/SecurityContext.java @@ -51,7 +51,8 @@ protected void configure(HttpSecurity http) throws Exception { .authorizeRequests() // Anyone can access the urls .antMatchers("/", "/exhibit/**", "/api/**", "/resources/**", "/login", - "/logout", "/register", "/reset/**", "/setup/admin", "/404","/preview/**").permitAll() + "/logout", "/register", "/reset/**", "/setup/admin", "/404","/preview/**", + "/staff/citesphere/oauth/**").permitAll() // The rest of the our application is protected. .antMatchers("/users/**", "/admin/**", "/staff/user/**").hasRole("ADMIN") .antMatchers("/staff/**").hasAnyRole("STAFF", "ADMIN") diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 5e2417db5..1d77a6d38 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -55,7 +55,7 @@ public class CitesphereController { /** * Initiate OAuth authorization with Citesphere */ - @RequestMapping(value = "/api/oauth/authorize", method = RequestMethod.GET) + @RequestMapping(value = "/staff/citesphere/oauth/authorize", method = RequestMethod.GET) public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttributes) { logger.info("[DEBUG] Initiating OAuth authorization with Citesphere"); logger.info("[DEBUG] Citesphere API URL: {}", citesphereApiUrl); @@ -73,8 +73,8 @@ public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttr String state = java.util.UUID.randomUUID().toString(); session.setAttribute("citesphere_oauth_state", state); - // Build authorization URL - String baseUrl = citesphereApiUrl.replace("/api", ""); + // Build authorization URL + String baseUrl = citesphereApiUrl; String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; logger.info("[DEBUG] Building OAuth URL - Base URL: {}", baseUrl); @@ -153,7 +153,7 @@ public String handleOAuthCallback( /** * Get user groups from Citesphere */ - @RequestMapping(value = "/api/v1/citesphere/groups", method = RequestMethod.GET) + @RequestMapping(value = "/staff/citesphere/groups", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroups(HttpSession session) { logger.info("[DEBUG] API call: getGroups() - Fetching user groups from Citesphere"); @@ -176,7 +176,7 @@ public ResponseEntity> getGroups(HttpSession session) { /** * Get collections for a specific group */ - @RequestMapping(value = "/api/v1/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) + @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollections(@PathVariable String groupId, HttpSession session) { logger.info("[DEBUG] API call: getCollections() - Group ID: {}", groupId); @@ -199,7 +199,7 @@ public ResponseEntity> getCollections(@PathVariable String g /** * Get items for a specific collection */ - @RequestMapping(value = "/api/v1/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) + @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollectionItems( @PathVariable String groupId, @@ -226,7 +226,7 @@ public ResponseEntity> getCollectionItems( /** * Get all items for a specific group */ - @RequestMapping(value = "/api/v1/groups/{groupId}/items", method = RequestMethod.GET) + @RequestMapping(value = "/staff/citesphere/groups/{groupId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroupItems(@PathVariable String groupId, HttpSession session) { logger.info("[DEBUG] API call: getGroupItems() - Group ID: {}", groupId); @@ -249,7 +249,7 @@ public ResponseEntity> getGroupItems(@PathVariable String gr /** * Import selected references from Citesphere to bibliography */ - @RequestMapping(value = "/api/v1/groups/{groupId}/collections/{collectionId}/items/", method = RequestMethod.POST) + @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/bibliography/{biblioId}/citesphere/import", method = RequestMethod.POST) @ResponseBody public ResponseEntity> importCitesphereReferences( @PathVariable String moduleId, @@ -330,7 +330,7 @@ private String exchangeCodeForToken(String code) { try { OkHttpClient client = new OkHttpClient(); String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; - String tokenUrl = citesphereApiUrl.replace("/api", "") + "/oauth/token"; + String tokenUrl = citesphereApiUrl + "oauth/token"; logger.info("[DEBUG] Token exchange URL: {}", tokenUrl); logger.info("[DEBUG] Redirect URI: {}", redirectUri); From fe55e98b01f7f0794498e5d04834bd7528b8f031 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 12 Sep 2025 14:58:58 -0700 Subject: [PATCH 14/31] [VSPC-189] shows connection status to frontend --- .../views/staff/modules/slides/slide.html | 329 ++++++++++++------ 1 file changed, 230 insertions(+), 99 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 72a83f2f8..c27581c1f 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -2673,7 +2673,10 @@ var citesphereData = { selectedReferences: [], groups: [], - collections: {} + collections: {}, + currentStep: 'connection', + currentGroup: null, + currentCollection: null }; // Initialize Citesphere functionality when modal is shown @@ -2681,9 +2684,9 @@ // Show/hide appropriate tab content and buttons based on active tab updateReferenceModalButtons(); - // If Citesphere tab is active, load initial data + // If Citesphere tab is active, initialize step-by-step flow if ($('#citesphereRefTab').hasClass('active')) { - loadCitesphereGroups(); + initializeCitesphereSteps(); } }); @@ -2691,11 +2694,20 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { updateReferenceModalButtons(); - // Load Citesphere data when switching to Citesphere tab + // Initialize Citesphere step-by-step flow when switching to tab if ($(e.target).attr('href') === '#citesphereRefTab') { - loadCitesphereGroups(); + console.log('Citesphere tab activated - initializing steps'); + initializeCitesphereSteps(); } }); + + // Also trigger when tab link is clicked + $(document).on('click', 'a[href="#citesphereRefTab"]', function() { + setTimeout(function() { + console.log('Citesphere tab clicked - initializing steps'); + initializeCitesphereSteps(); + }, 100); + }); function updateReferenceModalButtons() { var isCitesphereTab = $('#citesphereRefTab').hasClass('active'); @@ -2709,143 +2721,223 @@ } } - // Load user groups from Citesphere - function loadCitesphereGroups() { + // Initialize the step-by-step Citesphere flow + function initializeCitesphereSteps() { + console.log('initializeCitesphereSteps called'); + + // Reset step data + citesphereData.currentStep = 'connection'; + citesphereData.currentGroup = null; + citesphereData.currentCollection = null; + citesphereData.selectedReferences = []; + + // Hide all steps initially + $('.citesphere-step').hide(); + console.log('Hidden all steps'); + + // Show a loading message first + $('#connectionStatusContent').html( + '
' + + ' Checking Citesphere connection...' + + '
' + ); + + // Check connection status and show appropriate step + checkCitesphereConnection(); + } + + // Check if user is connected to Citesphere + function checkCitesphereConnection() { + console.log('checkCitesphereConnection called'); var token = $('input[name="_csrf"]').attr('value'); $.ajax({ - url: '/staff/citesphere/groups', + url: '/vspace/staff/citesphere/groups', type: 'GET', headers: { 'X-CSRF-Token': token }, success: function(data) { - displayCitesphereGroups(data); + console.log('Connection successful, received data:', data); + // Connected successfully + showConnectionStatus(true); citesphereData.groups = data; + citesphereData.currentStep = 'groups'; + showStep1Groups(data); }, error: function(xhr, status, error) { - console.error('Error loading Citesphere groups:', error); - if (xhr.status === 500 && xhr.responseText && xhr.responseText.includes('access token')) { - // User needs to authenticate - $('#citesphereCollections').html( - '
' + - '
Authentication Required
' + - '

You need to authenticate with Citesphere to access your bibliography data.

' + - '' + - ' Connect to Citesphere' + - '' + - '
' - ); - } else { - $('#citesphereCollections').html('
Error loading groups. Please check your Citesphere credentials.
'); - } + console.log('Connection failed:', xhr.status, error); + // Not connected or error + showConnectionStatus(false); + citesphereData.currentStep = 'connection'; } }); } + + // Show connection status at the top + function showConnectionStatus(isConnected) { + var statusContainer = $('#connectionStatusContent'); + + if (isConnected) { + statusContainer.html( + '
' + + ' Connected to Citesphere' + + '
' + ); + } else { + statusContainer.html( + '
' + + ' Not Connected to Citesphere
' + + 'You need to authenticate to access your bibliography data.
' + + '' + + ' Connect to Citesphere' + + '' + + '
' + ); + } + } + + // Show Step 1: Groups + function showStep1Groups(groupsData) { + $('#step1-groups').show(); + displayCitesphereGroups(groupsData); + } - // Display groups and collections + // Display groups in Step 1 function displayCitesphereGroups(groupsData) { - var collectionsContainer = $('#citesphereCollections'); - collectionsContainer.empty(); + var groupsContainer = $('#citesphereGroups'); + groupsContainer.empty(); if (!groupsData || !groupsData.data || !Array.isArray(groupsData.data)) { - collectionsContainer.html('
No groups found.
'); + groupsContainer.html('
No groups found.
'); return; } groupsData.data.forEach(function(group) { - var groupElement = $('
' + + var groupElement = $('
' + + '
' + + '
' + '
' + (group.name || 'Unnamed Group') + '
' + - 'Click to load collections' + + 'Click to view collections' + + '
' + + '' + + '
' + '
'); + // Hover effect + groupElement.hover( + function() { $(this).css('background', '#e3f2fd'); }, + function() { $(this).css('background', '#f8f9fa'); } + ); + groupElement.click(function() { - loadGroupCollections(group.zoteroGroupId || group.id, group.name); + citesphereData.currentGroup = group; + showStep2Collections(group); }); - collectionsContainer.append(groupElement); + groupsContainer.append(groupElement); }); } + // Show Step 2: Collections + function showStep2Collections(group) { + $('#step1-groups').hide(); + $('#step2-collections').show(); + $('#currentGroupName').text('Group: ' + (group.name || 'Unnamed Group')); + citesphereData.currentStep = 'collections'; + + loadGroupCollections(group.zoteroGroupId || group.id, group.name); + } + // Load collections for a specific group function loadGroupCollections(groupId, groupName) { var token = $('input[name="_csrf"]').attr('value'); $.ajax({ - url: '/staff/citesphere/groups/' + groupId + '/collections', + url: '/vspace/staff/citesphere/groups/' + groupId + '/collections', type: 'GET', headers: { 'X-CSRF-Token': token }, success: function(data) { displayCollections(data, groupId, groupName); - loadGroupItems(groupId, groupName); // Also load individual items }, error: function(xhr, status, error) { console.error('Error loading collections for group ' + groupId + ':', error); + $('#citesphereCollections').html('
Error loading collections.
'); } }); } - // Display collections for a group + // Display collections for a group in Step 2 function displayCollections(collectionsData, groupId, groupName) { var collectionsContainer = $('#citesphereCollections'); collectionsContainer.empty(); - // Add back button - var backButton = $(''); - backButton.click(function() { - loadCitesphereGroups(); - }); - collectionsContainer.append(backButton); - - var groupHeader = $('
' + groupName + ' - Collections
'); - collectionsContainer.append(groupHeader); - if (!collectionsData || !collectionsData.data || !Array.isArray(collectionsData.data)) { - collectionsContainer.append('
No collections found in this group.
'); + collectionsContainer.html('
No collections found in this group.
'); return; } collectionsData.data.forEach(function(collection) { - var collectionElement = $('
' + - '
' + (collection.data.name || 'Unnamed Collection') + '
' + - 'Click to load items' + + var collectionElement = $('
' + + '
' + + '
' + + '
' + (collection.data.name || 'Unnamed Collection') + '
' + + 'Click to view references' + + '
' + + '' + + '
' + '
'); + // Hover effect + collectionElement.hover( + function() { $(this).css('background', '#e3f2fd'); }, + function() { $(this).css('background', '#f8f9fa'); } + ); + collectionElement.click(function() { - loadCollectionItems(groupId, collection.data.key, collection.data.name); + citesphereData.currentCollection = collection; + showStep3References(groupId, collection.data.key, collection.data.name); }); collectionsContainer.append(collectionElement); }); } - // Load individual items for a group (not in collections) - function loadGroupItems(groupId, groupName) { - var token = $('input[name="_csrf"]').attr('value'); + // Show Step 3: References + function showStep3References(groupId, collectionId, collectionName) { + $('#step2-collections').hide(); + $('#step3-references').show(); + $('#currentCollectionName').text('Collection: ' + (collectionName || 'Unnamed Collection')); + citesphereData.currentStep = 'references'; - $.ajax({ - url: '/staff/citesphere/groups/' + groupId + '/items', - type: 'GET', - headers: { - 'X-CSRF-Token': token - }, - success: function(data) { - displayIndividualItems(data, 'Individual Items in ' + groupName); - }, - error: function(xhr, status, error) { - console.error('Error loading group items:', error); - } - }); + loadCollectionItems(groupId, collectionId, collectionName); } + + // Navigation handlers + $(document).on('click', '#backToGroups', function() { + $('#step2-collections').hide(); + $('#step1-groups').show(); + citesphereData.currentStep = 'groups'; + citesphereData.currentGroup = null; + }); + + $(document).on('click', '#backToCollections', function() { + $('#step3-references').hide(); + $('#step2-collections').show(); + citesphereData.currentStep = 'collections'; + citesphereData.currentCollection = null; + citesphereData.selectedReferences = []; + updateSelectedCount(); + }); // Load items from a specific collection function loadCollectionItems(groupId, collectionId, collectionName) { var token = $('input[name="_csrf"]').attr('value'); $.ajax({ - url: '/staff/citesphere/groups/' + groupId + '/collections/' + collectionId + '/items', + url: '/vspace/staff/citesphere/groups/' + groupId + '/collections/' + collectionId + '/items', type: 'GET', headers: { 'X-CSRF-Token': token @@ -2992,7 +3084,7 @@ var token = $('input[name="_csrf"]').attr('value'); $.ajax({ - url: '/staff/module/' + moduleId + '/slide/' + slideId + '/bibliography/' + biblioId + '/citesphere/import', + url: '/vspace/staff/module/' + moduleId + '/slide/' + slideId + '/bibliography/' + biblioId + '/citesphere/import', type: 'POST', contentType: 'application/json', headers: { @@ -3050,11 +3142,21 @@ // Clear Citesphere data when modal is hidden $('#addReferenceAlert').on('hidden.bs.modal', function () { + // Reset Citesphere data citesphereData.selectedReferences = []; + citesphereData.currentStep = 'connection'; + citesphereData.currentGroup = null; + citesphereData.currentCollection = null; updateSelectedCount(); + + // Clear all containers + $('#citesphereGroups').empty(); $('#citesphereCollections').empty(); $('#citesphereReferences').empty(); - $('#citesphereSearch').val(''); + $('#connectionStatusContent').empty(); + + // Hide all steps + $('.citesphere-step').hide(); }); @@ -3679,45 +3781,74 @@
Add new Reference
-
Select references from Citesphere
- -
-
- -
- -
+ +
+
+
- -
- -
-
- Collections -
-
+ +
+ + + - -
-
- Individual References -
-
- + + -
- - -
- Selected: 0 references + + + +
From fb8a44b6579f3c7bf4ec08bbd9db12c8d095e8b3 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 12 Sep 2025 16:36:17 -0700 Subject: [PATCH 15/31] [VSPC-189] Groups now show after connecting to citesphere - need to fix collections and bibliographies --- .../exception/CitesphereTokenException.java | 43 +++ .../core/services/CitesphereAuthToken.java | 39 +++ .../core/services/ICitesphereManager.java | 14 + .../core/services/impl/CitesphereManager.java | 255 ++++++++++++++++-- .../web/staff/CitesphereController.java | 115 +++++++- 5 files changed, 434 insertions(+), 32 deletions(-) create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/exception/CitesphereTokenException.java diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/exception/CitesphereTokenException.java b/vspace/src/main/java/edu/asu/diging/vspace/core/exception/CitesphereTokenException.java new file mode 100644 index 000000000..9f9d69060 --- /dev/null +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/exception/CitesphereTokenException.java @@ -0,0 +1,43 @@ +package edu.asu.diging.vspace.core.exception; + +/** + * Exception thrown when there are issues with Citesphere authentication tokens + */ +public class CitesphereTokenException extends Exception { + + private static final long serialVersionUID = 1L; + private final int statusCode; + private final boolean isTokenExpired; + + public CitesphereTokenException(String message) { + super(message); + this.statusCode = 0; + this.isTokenExpired = false; + } + + public CitesphereTokenException(String message, int statusCode) { + super(message); + this.statusCode = statusCode; + this.isTokenExpired = (statusCode == 401 || statusCode == 403); + } + + public CitesphereTokenException(String message, Throwable cause) { + super(message, cause); + this.statusCode = 0; + this.isTokenExpired = false; + } + + public CitesphereTokenException(String message, int statusCode, boolean isTokenExpired) { + super(message); + this.statusCode = statusCode; + this.isTokenExpired = isTokenExpired; + } + + public int getStatusCode() { + return statusCode; + } + + public boolean isTokenExpired() { + return isTokenExpired; + } +} diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java index f0ffb4ffd..cf0a18818 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java @@ -10,8 +10,10 @@ public class CitesphereAuthToken { private String authType; private Map headers; private String accessToken; + private String refreshToken; private String username; private String password; + private long tokenExpiryTime; /** * Constructor for OAuth authentication @@ -22,6 +24,19 @@ public CitesphereAuthToken(String accessToken) { this.accessToken = accessToken; } + /** + * Constructor for OAuth authentication with refresh token + * @param accessToken OAuth access token + * @param refreshToken OAuth refresh token + * @param expiryTime Token expiry time in milliseconds + */ + public CitesphereAuthToken(String accessToken, String refreshToken, long expiryTime) { + this.authType = "oauth"; + this.accessToken = accessToken; + this.refreshToken = refreshToken; + this.tokenExpiryTime = expiryTime; + } + /** * Constructor for Basic authentication * @param username Username @@ -73,4 +88,28 @@ public String getPassword() { public void setPassword(String password) { this.password = password; } + + public String getRefreshToken() { + return refreshToken; + } + + public void setRefreshToken(String refreshToken) { + this.refreshToken = refreshToken; + } + + public long getTokenExpiryTime() { + return tokenExpiryTime; + } + + public void setTokenExpiryTime(long tokenExpiryTime) { + this.tokenExpiryTime = tokenExpiryTime; + } + + /** + * Check if the access token is expired + * @return true if token is expired, false otherwise + */ + public boolean isTokenExpired() { + return tokenExpiryTime > 0 && System.currentTimeMillis() > tokenExpiryTime; + } } \ No newline at end of file diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java index 06d6b16f1..a81444a33 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java @@ -1,6 +1,7 @@ package edu.asu.diging.vspace.core.services; import java.util.Map; +import edu.asu.diging.vspace.core.exception.CitesphereTokenException; /** * Service interface for Citesphere API operations @@ -101,4 +102,17 @@ public interface ICitesphereManager { * @return Response from API */ Object addItem(String groupId, Map data, String filePath); + + /** + * Refresh the access token using refresh token + * @return New CitesphereAuthToken with refreshed access token + * @throws CitesphereTokenException if refresh fails + */ + CitesphereAuthToken refreshToken() throws CitesphereTokenException; + + /** + * Validate if current token is still valid + * @return true if token is valid, false otherwise + */ + boolean isTokenValid(); } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index 9c90a3854..18a27a67b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -4,14 +4,17 @@ //import com.citesphere.api.CitesphereService; //import com.citesphere.api.auth.CitesphereAuthToken; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import edu.asu.diging.vspace.core.services.CitesphereAuthToken; import edu.asu.diging.vspace.core.services.ICitesphereManager; +import edu.asu.diging.vspace.core.exception.CitesphereTokenException; import java.io.File; import java.io.IOException; import java.util.Base64; import java.util.HashMap; +import java.util.List; import java.util.Map; import okhttp3.*; @@ -84,8 +87,9 @@ private void handleApiParams() { * Execute GET command * @param url Request URL * @return Response data as Map + * @throws CitesphereTokenException if token is invalid or expired */ - private Map executeCommand(String url) { + private Map executeCommand(String url) throws CitesphereTokenException { try { Request.Builder requestBuilder = new Request.Builder().url(url); @@ -99,11 +103,35 @@ private Map executeCommand(String url) { Request request = requestBuilder.build(); try (Response response = client.newCall(request).execute()) { + // Check for unauthorized or forbidden responses + if (response.code() == 401 || response.code() == 403) { + throw new CitesphereTokenException( + "Invalid or expired access token", + response.code(), + true + ); + } + if (response.body() != null) { String responseBody = response.body().string(); - return objectMapper.readValue(responseBody, Map.class); + + // Check if response is an array or object + if (responseBody.trim().startsWith("[")) { + // Response is an array, wrap it in a data object + List responseList = objectMapper.readValue(responseBody, new TypeReference>(){}); + Map responseMap = new HashMap<>(); + responseMap.put("data", responseList); + return responseMap; + } else { + // Response is an object + @SuppressWarnings("unchecked") + Map responseMap = objectMapper.readValue(responseBody, Map.class); + return responseMap; + } } } + } catch (CitesphereTokenException e) { + throw e; // Re-throw token exceptions } catch (Exception e) { Map errorMap = new HashMap<>(); errorMap.put("error_message", e.getMessage()); @@ -169,59 +197,122 @@ private Object executePostRequest(String url, Map data, String f @Override public Map getUser() { - String url = api + "/v1/user"; - return executeCommand(url); + try { + String url = api + "/v1/user"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map checkTest() { - String url = api + "/v1/test"; - return executeCommand(url); + try { + String url = api + "/v1/test"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map checkAccess(String documentId) { - String url = api + "/files/giles/" + documentId + "/access/check"; - return executeCommand(url); + try { + String url = api + "/files/giles/" + documentId + "/access/check"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getDataByEndpoint(String endpoint) { - String url = api + "/v1" + endpoint; - return executeCommand(url); + try { + String url = api + "/v1" + endpoint; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getGroups() { - String url = api + "/v1/groups"; - return executeCommand(url); + try { + String url = api + "/v1/groups"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getGroupInfo(String groupId) { - String url = api + "/v1/groups/" + groupId; - return executeCommand(url); + try { + String url = api + "/v1/groups/" + groupId; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getGroupItems(String zoteroGroupId) { - String url = api + "/v1/groups/" + zoteroGroupId + "/items"; - return executeCommand(url); + try { + String url = api + "/v1/groups/" + zoteroGroupId + "/items"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getCollections(String zoteroGroupId) { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections"; - return executeCommand(url); + try { + String url = api + "/v1/groups/" + zoteroGroupId + "/collections"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber) { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; - if (pageNumber > 0) { - url += "?&page=" + pageNumber; + try { + String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; + if (pageNumber > 0) { + url += "?&page=" + pageNumber; + } + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; } - return executeCommand(url); } @Override @@ -231,14 +322,28 @@ public Map getCollectionItems(String zoteroGroupId, String colle @Override public Map getItemInfo(String zoteroGroupId, String itemId) { - String url = api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId; - return executeCommand(url); + try { + String url = api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override public Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId) { - String url = api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"; - return executeCommand(url); + try { + String url = api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"; + return executeCommand(url); + } catch (CitesphereTokenException e) { + Map errorMap = new HashMap<>(); + errorMap.put("error_message", e.getMessage()); + errorMap.put("token_expired", e.isTokenExpired()); + return errorMap; + } } @Override @@ -246,4 +351,102 @@ public Object addItem(String groupId, Map data, String filePath) String url = api + "/v1/groups/" + groupId + "/items/create"; return executePostRequest(url, data, filePath); } + + @Override + public CitesphereAuthToken refreshToken() throws CitesphereTokenException { + if (authTokenObject.getRefreshToken() == null || authTokenObject.getRefreshToken().isEmpty()) { + throw new CitesphereTokenException("No refresh token available"); + } + + try { + String tokenUrl = api + "/oauth/token"; + + RequestBody formBody = new FormBody.Builder() + .add("grant_type", "refresh_token") + .add("refresh_token", authTokenObject.getRefreshToken()) + .build(); + + Request request = new Request.Builder() + .url(tokenUrl) + .post(formBody) + .build(); + + try (Response response = client.newCall(request).execute()) { + if (response.code() == 401 || response.code() == 403) { + throw new CitesphereTokenException( + "Refresh token is invalid or expired", + response.code(), + true + ); + } + + if (response.isSuccessful() && response.body() != null) { + String responseBody = response.body().string(); + @SuppressWarnings("unchecked") + Map tokenResponse = objectMapper.readValue(responseBody, Map.class); + + String newAccessToken = (String) tokenResponse.get("access_token"); + String newRefreshToken = (String) tokenResponse.get("refresh_token"); + Number expiresIn = (Number) tokenResponse.get("expires_in"); + + if (newAccessToken != null) { + long expiryTime = 0; + if (expiresIn != null) { + expiryTime = System.currentTimeMillis() + (expiresIn.longValue() * 1000); + } + + // Update current token object + authTokenObject.setAccessToken(newAccessToken); + if (newRefreshToken != null) { + authTokenObject.setRefreshToken(newRefreshToken); + } + authTokenObject.setTokenExpiryTime(expiryTime); + + // Re-initialize headers with new token + handleApiParams(); + + return authTokenObject; + } + } + + throw new CitesphereTokenException("Failed to refresh token: " + response.code()); + } + } catch (CitesphereTokenException e) { + throw e; + } catch (Exception e) { + throw new CitesphereTokenException("Error refreshing token: " + e.getMessage(), e); + } + } + + @Override + public boolean isTokenValid() { + if (authTokenObject.getAccessToken() == null || authTokenObject.getAccessToken().isEmpty()) { + return false; + } + + // Check if token is expired based on stored expiry time + if (authTokenObject.isTokenExpired()) { + return false; + } + + // Optionally, test token with a simple API call + try { + String url = api + "/v1/test"; + Request.Builder requestBuilder = new Request.Builder().url(url); + + if (authTokenObject.getHeaders() != null) { + for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { + requestBuilder.addHeader(header.getKey(), header.getValue()); + } + } + + Request request = requestBuilder.build(); + + try (Response response = client.newCall(request).execute()) { + return response.code() != 401 && response.code() != 403; + } + } catch (Exception e) { + return false; + } + } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 1d77a6d38..670038f27 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -30,6 +30,7 @@ import edu.asu.diging.vspace.core.services.ICitesphereManager; import edu.asu.diging.vspace.core.services.IReferenceManager; import edu.asu.diging.vspace.core.services.impl.CitesphereManager; +import edu.asu.diging.vspace.core.exception.CitesphereTokenException; @Controller public class CitesphereController { @@ -125,7 +126,7 @@ public String handleOAuthCallback( // Exchange code for access token logger.info("[DEBUG] Exchanging authorization code for access token"); - String accessToken = exchangeCodeForToken(code); + String accessToken = exchangeCodeForToken(code, session); logger.info("[DEBUG] Access token received: {}", accessToken != null ? "[SUCCESS]" : "[FAILED]"); if (accessToken != null) { @@ -162,9 +163,29 @@ public ResponseEntity> getGroups(HttpSession session) { ICitesphereManager citesphereManager = createCitesphereManager(session); logger.info("[DEBUG] CitesphereManager created successfully, making API call to get groups"); Map groups = citesphereManager.getGroups(); + + // Check for token expiry in response + if (isTokenExpiredResponse(groups)) { + logger.warn("[DEBUG] Token expired response detected, requesting re-authentication"); + session.removeAttribute("citesphere_access_token"); + session.removeAttribute("citesphere_refresh_token"); + session.removeAttribute("citesphere_token_expiry"); + Map error = new HashMap<>(); + error.put("error", "Authentication expired"); + error.put("require_auth", true); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error); + } + logger.info("[DEBUG] Groups retrieved successfully: {} groups found", groups != null && groups.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); + logger.info("[DEBUG] Groups data: {}", groups); return ResponseEntity.ok(groups); + } catch (IllegalStateException e) { + logger.error("Authentication error: {}", e.getMessage()); + Map error = new HashMap<>(); + error.put("error", e.getMessage()); + error.put("require_auth", true); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error); } catch (Exception e) { logger.error("Error fetching groups from Citesphere", e); Map error = new HashMap<>(); @@ -304,15 +325,55 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { // Check for OAuth token String accessToken = (String) session.getAttribute("citesphere_access_token"); + String refreshToken = (String) session.getAttribute("citesphere_refresh_token"); + Long expiryTime = (Long) session.getAttribute("citesphere_token_expiry"); + logger.info("[DEBUG] Access token in session: {}", accessToken != null ? "[PRESENT]" : "[MISSING]"); + logger.info("[DEBUG] Refresh token in session: {}", refreshToken != null ? "[PRESENT]" : "[MISSING]"); + logger.info("[DEBUG] Token expiry time: {}", expiryTime != null ? "[PRESENT]" : "[MISSING]"); logger.info("[DEBUG] API URL: {}", citesphereApiUrl); if (accessToken != null) { - // Use OAuth token - logger.info("[DEBUG] Creating CitesphereAuthToken with access token"); - CitesphereAuthToken authToken = new CitesphereAuthToken(accessToken); + // Create auth token with all available information + CitesphereAuthToken authToken; + if (refreshToken != null && expiryTime != null) { + authToken = new CitesphereAuthToken(accessToken, refreshToken, expiryTime); + } else { + authToken = new CitesphereAuthToken(accessToken); + } + logger.info("[DEBUG] Creating CitesphereManager with API URL: {} and auth token", citesphereApiUrl); - return new CitesphereManager(citesphereApiUrl, authToken); + ICitesphereManager manager = new CitesphereManager(citesphereApiUrl, authToken); + + // Check if token is valid and refresh if needed + if (!manager.isTokenValid()) { + logger.info("[DEBUG] Token is invalid or expired, attempting refresh"); + try { + CitesphereAuthToken refreshedToken = manager.refreshToken(); + + // Update session with new token information + session.setAttribute("citesphere_access_token", refreshedToken.getAccessToken()); + if (refreshedToken.getRefreshToken() != null) { + session.setAttribute("citesphere_refresh_token", refreshedToken.getRefreshToken()); + } + if (refreshedToken.getTokenExpiryTime() > 0) { + session.setAttribute("citesphere_token_expiry", refreshedToken.getTokenExpiryTime()); + } + + logger.info("[DEBUG] Token refreshed successfully"); + return manager; + + } catch (CitesphereTokenException e) { + logger.error("[DEBUG] Token refresh failed: {}", e.getMessage()); + // Clear invalid tokens from session + session.removeAttribute("citesphere_access_token"); + session.removeAttribute("citesphere_refresh_token"); + session.removeAttribute("citesphere_token_expiry"); + throw new IllegalStateException("Citesphere token is invalid and cannot be refreshed. Please re-authenticate.", e); + } + } + + return manager; } else { // No authentication available logger.error("[DEBUG] No access token available in session - authentication required"); @@ -323,7 +384,7 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { /** * Exchange authorization code for access token */ - private String exchangeCodeForToken(String code) { + private String exchangeCodeForToken(String code, HttpSession session) { logger.info("[DEBUG] Starting token exchange process"); logger.info("[DEBUG] Authorization code: {}", code != null ? "[PRESENT]" : "[MISSING]"); @@ -363,7 +424,22 @@ private String exchangeCodeForToken(String code) { @SuppressWarnings("unchecked") Map tokenResponse = mapper.readValue(responseBody, Map.class); String accessToken = (String) tokenResponse.get("access_token"); + String refreshToken = (String) tokenResponse.get("refresh_token"); + Number expiresIn = (Number) tokenResponse.get("expires_in"); + logger.info("[DEBUG] Access token extracted: {}", accessToken != null ? "[SUCCESS]" : "[FAILED]"); + logger.info("[DEBUG] Refresh token extracted: {}", refreshToken != null ? "[SUCCESS]" : "[MISSING]"); + logger.info("[DEBUG] Expires in: {}", expiresIn != null ? expiresIn.toString() + " seconds" : "[MISSING]"); + + // Store additional token information in session + if (refreshToken != null) { + session.setAttribute("citesphere_refresh_token", refreshToken); + } + if (expiresIn != null) { + long expiryTime = System.currentTimeMillis() + (expiresIn.longValue() * 1000); + session.setAttribute("citesphere_token_expiry", expiryTime); + } + return accessToken; } else { logger.error("[DEBUG] Token exchange failed - Response code: {}, Body: {}", response.code(), responseBody); @@ -381,6 +457,33 @@ private String exchangeCodeForToken(String code) { private String getCurrentBaseUrl() { return appBaseUrl != null && !appBaseUrl.isEmpty() ? appBaseUrl : "http://localhost:8080"; } + + /** + * Check if API response indicates token expiry + */ + private boolean isTokenExpiredResponse(Map response) { + if (response == null) { + return false; + } + + // Check for token_expired flag + Boolean tokenExpired = (Boolean) response.get("token_expired"); + if (Boolean.TRUE.equals(tokenExpired)) { + return true; + } + + // Check for error messages indicating token issues + String errorMessage = (String) response.get("error_message"); + if (errorMessage != null) { + String lowerError = errorMessage.toLowerCase(); + return lowerError.contains("invalid") && lowerError.contains("token") || + lowerError.contains("expired") && lowerError.contains("token") || + lowerError.contains("unauthorized") || + lowerError.contains("forbidden"); + } + + return false; + } @SuppressWarnings("unchecked") private String extractField(Map refData, String fieldName) { From 2e2989d1762675ed27f4bd8b10b769654eb9eaab Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Mon, 15 Sep 2025 10:06:56 -0700 Subject: [PATCH 16/31] [VSPC-189] Groups to collections to item workflow for references import from citesphere working --- .../views/staff/modules/slides/slide.html | 178 +++++++++++++++--- 1 file changed, 148 insertions(+), 30 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index c27581c1f..3b3cabc4d 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -2814,6 +2814,8 @@ } groupsData.data.forEach(function(group) { + console.log('Processing group:', group); + var groupElement = $('
' + '
' + '
' + @@ -2831,6 +2833,7 @@ ); groupElement.click(function() { + console.log('Group clicked:', group); citesphereData.currentGroup = group; showStep2Collections(group); }); @@ -2846,13 +2849,22 @@ $('#currentGroupName').text('Group: ' + (group.name || 'Unnamed Group')); citesphereData.currentStep = 'collections'; - loadGroupCollections(group.zoteroGroupId || group.id, group.name); + // Show loading message + $('#citesphereCollections').html('
Loading collections...
'); + + // Extract group ID - try multiple possible fields + var groupId = group.zoteroGroupId || group.id || group.groupId || group.key; + console.log('Extracted group ID:', groupId, 'from group object:', group); + + loadGroupCollections(groupId, group.name); } // Load collections for a specific group function loadGroupCollections(groupId, groupName) { var token = $('input[name="_csrf"]').attr('value'); + console.log('Loading collections for group:', groupId, 'with name:', groupName); + $.ajax({ url: '/vspace/staff/citesphere/groups/' + groupId + '/collections', type: 'GET', @@ -2860,11 +2872,14 @@ 'X-CSRF-Token': token }, success: function(data) { + console.log('Collections loaded successfully for group ' + groupId + ':', data); displayCollections(data, groupId, groupName); }, error: function(xhr, status, error) { console.error('Error loading collections for group ' + groupId + ':', error); - $('#citesphereCollections').html('
Error loading collections.
'); + console.error('Response status:', xhr.status); + console.error('Response text:', xhr.responseText); + $('#citesphereCollections').html('
Error loading collections: ' + error + ' (Status: ' + xhr.status + ')
'); } }); } @@ -2874,16 +2889,30 @@ var collectionsContainer = $('#citesphereCollections'); collectionsContainer.empty(); - if (!collectionsData || !collectionsData.data || !Array.isArray(collectionsData.data)) { + console.log('Displaying collections data:', collectionsData); + + // Handle both possible response structures: {data: []} or {collections: []} + var collections = collectionsData.collections || collectionsData.data || []; + + if (!collections || !Array.isArray(collections) || collections.length === 0) { + console.log('No collections data found or data is not an array'); collectionsContainer.html('
No collections found in this group.
'); return; } + + console.log('Found', collections.length, 'collections'); - collectionsData.data.forEach(function(collection) { + collections.forEach(function(collection) { + console.log('Processing collection:', collection); + + // Extract collection name and key from different possible structures + var collectionName = collection.name || (collection.data && collection.data.name) || 'Unnamed Collection'; + var collectionKey = collection.key || (collection.data && collection.data.key) || collection.id; + var collectionElement = $('
' + '
' + '
' + - '
' + (collection.data.name || 'Unnamed Collection') + '
' + + '
' + collectionName + '
' + 'Click to view references' + '
' + '' + @@ -2897,8 +2926,9 @@ ); collectionElement.click(function() { + console.log('Collection clicked:', collection, 'using key:', collectionKey); citesphereData.currentCollection = collection; - showStep3References(groupId, collection.data.key, collection.data.name); + showStep3References(groupId, collectionKey, collectionName); }); collectionsContainer.append(collectionElement); @@ -2907,11 +2937,15 @@ // Show Step 3: References function showStep3References(groupId, collectionId, collectionName) { + console.log('Showing step 3 references - Group:', groupId, 'Collection:', collectionId, 'Name:', collectionName); $('#step2-collections').hide(); $('#step3-references').show(); $('#currentCollectionName').text('Collection: ' + (collectionName || 'Unnamed Collection')); citesphereData.currentStep = 'references'; + // Show loading message + $('#citesphereReferences').html('
Loading references...
'); + loadCollectionItems(groupId, collectionId, collectionName); } @@ -2936,6 +2970,8 @@ function loadCollectionItems(groupId, collectionId, collectionName) { var token = $('input[name="_csrf"]').attr('value'); + console.log('Loading collection items - Group:', groupId, 'Collection:', collectionId); + $.ajax({ url: '/vspace/staff/citesphere/groups/' + groupId + '/collections/' + collectionId + '/items', type: 'GET', @@ -2943,10 +2979,14 @@ 'X-CSRF-Token': token }, success: function(data) { + console.log('Collection items loaded successfully:', data); displayIndividualItems(data, 'Items in ' + collectionName); }, error: function(xhr, status, error) { console.error('Error loading collection items:', error); + console.error('Response status:', xhr.status); + console.error('Response text:', xhr.responseText); + $('#citesphereReferences').html('
Error loading references: ' + error + ' (Status: ' + xhr.status + ')
'); } }); } @@ -2956,20 +2996,36 @@ var referencesContainer = $('#citesphereReferences'); referencesContainer.empty(); + console.log('Displaying individual items:', itemsData); + var titleElement = $('
' + title + '
'); referencesContainer.append(titleElement); - if (!itemsData || !itemsData.data || !Array.isArray(itemsData.data)) { + // Handle both possible response structures: {data: []} or direct array or {items: []} + var items = itemsData.items || itemsData.data || itemsData || []; + + // If itemsData is directly an array, use it + if (Array.isArray(itemsData)) { + items = itemsData; + } + + if (!items || !Array.isArray(items) || items.length === 0) { + console.log('No items data found or data is not an array'); referencesContainer.append('
No items found.
'); return; } + + console.log('Found', items.length, 'items'); - itemsData.data.forEach(function(item) { - var itemData = item.data || {}; - var title = itemData.title || 'Untitled'; - var author = extractAuthorsFromItem(itemData); - var year = extractYearFromItem(itemData); - var type = itemData.itemType || 'unknown'; + items.forEach(function(item) { + console.log('Processing item:', item); + + // Extract item data - try both direct properties and nested data structure + var itemData = item.data || item; + var title = item.title || itemData.title || item.referenceString || 'Untitled'; + var author = item.authorString || extractAuthorsFromItem(itemData) || item.author || ''; + var year = item.year || extractYearFromItem(itemData) || ''; + var type = item['@type'] || item.itemType || itemData.itemType || 'Reference'; var checkbox = $(''); checkbox.data('item', item); @@ -3005,29 +3061,39 @@ // Helper function to extract authors from Citesphere item function extractAuthorsFromItem(itemData) { - if (!itemData.creators || !Array.isArray(itemData.creators)) { - return 'Unknown Author'; + // Handle different author field structures + if (itemData.authorString) { + return itemData.authorString; } - var authors = itemData.creators.map(function(creator) { - var firstName = creator.firstName || ''; - var lastName = creator.lastName || ''; + if (itemData.creators && Array.isArray(itemData.creators)) { + var authors = itemData.creators.map(function(creator) { + var firstName = creator.firstName || ''; + var lastName = creator.lastName || ''; + + if (lastName && firstName) { + return lastName + ', ' + firstName; + } else if (lastName) { + return lastName; + } else if (firstName) { + return firstName; + } + return ''; + }).filter(Boolean); - if (lastName && firstName) { - return lastName + ', ' + firstName; - } else if (lastName) { - return lastName; - } else if (firstName) { - return firstName; - } - return ''; - }).filter(Boolean); + return authors.length > 0 ? authors.join('; ') : 'Unknown Author'; + } - return authors.length > 0 ? authors.join('; ') : 'Unknown Author'; + return 'Unknown Author'; } // Helper function to extract year from Citesphere item function extractYearFromItem(itemData) { + // Handle different year field structures + if (itemData.year) { + return itemData.year; + } + var date = itemData.date || itemData.accessDate || ''; if (date) { var match = date.match(/(\d{4})/); @@ -3079,10 +3145,59 @@ return; } + console.log('Importing references:', citesphereData.selectedReferences); + + // Transform the data to match the expected backend format + var transformedReferences = citesphereData.selectedReferences.map(function(item) { + console.log('Transforming item:', item); + + // Create the nested data structure expected by the backend + var transformedItem = { + data: { + title: item.title || item.referenceString || '', + itemType: item['@type'] || 'Reference', + date: item.year || '', + publicationTitle: item.source || '', + url: item.identifier || '', + volume: item.volume || '', + issue: '', + pages: item.firstPage && item.endPage ? item.firstPage + '-' + item.endPage : (item.firstPage || ''), + note: item.referenceString || '', + creators: [] + } + }; + + // Handle author data + if (item.authorString) { + // Split authorString and create creators array + var authors = item.authorString.split(';'); + transformedItem.data.creators = authors.map(function(author) { + var trimmedAuthor = author.trim(); + if (trimmedAuthor.includes(',')) { + var parts = trimmedAuthor.split(','); + return { + lastName: parts[0].trim(), + firstName: parts[1] ? parts[1].trim() : '' + }; + } else { + return { + lastName: trimmedAuthor, + firstName: '' + }; + } + }); + } + + console.log('Transformed item:', transformedItem); + return transformedItem; + }); + var moduleId = '[[${module.id}]]'; var slideId = '[[${slide.id}]]'; var token = $('input[name="_csrf"]').attr('value'); + console.log('Sending transformed data:', transformedReferences); + $.ajax({ url: '/vspace/staff/module/' + moduleId + '/slide/' + slideId + '/bibliography/' + biblioId + '/citesphere/import', type: 'POST', @@ -3090,8 +3205,9 @@ headers: { 'X-CSRF-Token': token }, - data: JSON.stringify(citesphereData.selectedReferences), + data: JSON.stringify(transformedReferences), success: function(response) { + console.log('Import response:', response); if (response.success) { alert('Successfully imported ' + response.imported_count + ' references from Citesphere!'); @@ -3135,7 +3251,9 @@ }, error: function(xhr, status, error) { console.error('Error importing references:', error); - alert('Error importing references. Please try again.'); + console.error('Response status:', xhr.status); + console.error('Response text:', xhr.responseText); + alert('Error importing references: ' + error + ' (Status: ' + xhr.status + ')'); } }); }); From e79aeb55da65a7eaf093652c1885b76964ad1c78 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Mon, 15 Sep 2025 11:51:37 -0700 Subject: [PATCH 17/31] [VSPC-189] Successfully implemented reference import from citesphere - need to remove debug statements, clean code --- .../web/staff/CitesphereController.java | 23 +- .../views/staff/modules/slides/slide.html | 391 ++++++++++++++---- 2 files changed, 341 insertions(+), 73 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 670038f27..9ce70c310 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -281,10 +281,17 @@ public ResponseEntity> importCitesphereReferences( logger.info("[DEBUG] API call: importCitesphereReferences() - Module: {}, Slide: {}, Bibliography: {}", moduleId, slideId, biblioId); logger.info("[DEBUG] Number of references to import: {}", selectedReferences != null ? selectedReferences.size() : 0); + // Log the raw received data + if (selectedReferences != null && !selectedReferences.isEmpty()) { + logger.info("[DEBUG] Raw received data: {}", selectedReferences.get(0)); + } + try { List createdReferences = new ArrayList<>(); for (Map refData : selectedReferences) { + logger.info("[DEBUG] Processing refData: {}", refData); + String title = extractField(refData, "title"); String author = extractCreators(refData); String year = extractYear(refData); @@ -300,7 +307,6 @@ public ResponseEntity> importCitesphereReferences( IReference reference = referenceManager.createReference( biblioId, title, author, year, journal, url, volume, issue, pages, editors, type, note ); - createdReferences.add(reference); logger.info("Created reference: {}", title); } @@ -310,6 +316,12 @@ public ResponseEntity> importCitesphereReferences( response.put("imported_count", createdReferences.size()); response.put("references", createdReferences); + + + if (!createdReferences.isEmpty()) { + IReference firstRef = createdReferences.get(0); + } + return ResponseEntity.ok(response); } catch (Exception e) { @@ -488,10 +500,17 @@ private boolean isTokenExpiredResponse(Map response) { @SuppressWarnings("unchecked") private String extractField(Map refData, String fieldName) { try { + logger.debug("[DEBUG] Extracting field '{}' from refData keys: {}", fieldName, refData.keySet()); + Map data = (Map) refData.get("data"); if (data != null && data.containsKey(fieldName)) { Object value = data.get(fieldName); - return value != null ? value.toString() : ""; + String result = value != null ? value.toString() : ""; + logger.debug("[DEBUG] Found field '{}' in data: '{}'", fieldName, result); + return result; + } else { + logger.debug("[DEBUG] Field '{}' not found in data section. Data keys: {}", + fieldName, data != null ? data.keySet() : "data is null"); } } catch (Exception e) { logger.warn("Error extracting field {}: {}", fieldName, e.getMessage()); diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 3b3cabc4d..db076ffbc 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -1687,6 +1687,9 @@ $("#submitReference").on("click", function(e) { + console.log('*** REGULAR SUBMIT BUTTON CLICKED ***'); + console.log('Button visibility:', $('#submitReference').is(':visible')); + console.log('Citesphere tab active:', $('#citesphereRefTab').hasClass('active')); e.preventDefault(); // ------------- creating reference ------------ @@ -2705,13 +2708,28 @@ $(document).on('click', 'a[href="#citesphereRefTab"]', function() { setTimeout(function() { console.log('Citesphere tab clicked - initializing steps'); + console.log('Manually updating button visibility after tab click'); + updateReferenceModalButtons(); initializeCitesphereSteps(); }, 100); }); + + // Handle manual tab click to update buttons + $(document).on('click', 'a[href="#manualRefTab"]', function() { + setTimeout(function() { + console.log('Manual tab clicked - updating buttons'); + updateReferenceModalButtons(); + }, 100); + }); function updateReferenceModalButtons() { var isCitesphereTab = $('#citesphereRefTab').hasClass('active'); + console.log('*** UPDATING MODAL BUTTONS ***'); + console.log('Citesphere tab active:', isCitesphereTab); + console.log('Before - Submit button visible:', $('#submitReference').is(':visible')); + console.log('Before - Citesphere button visible:', $('#submitCitesphereReferences').is(':visible')); + if (isCitesphereTab) { $('#submitReference').hide(); $('#submitCitesphereReferences').show(); @@ -2719,6 +2737,9 @@ $('#submitReference').show(); $('#submitCitesphereReferences').hide(); } + + console.log('After - Submit button visible:', $('#submitReference').is(':visible')); + console.log('After - Citesphere button visible:', $('#submitCitesphereReferences').is(':visible')); } // Initialize the step-by-step Citesphere flow @@ -2731,7 +2752,8 @@ citesphereData.currentCollection = null; citesphereData.selectedReferences = []; - // Hide all steps initially + // Hide success message and all steps initially + hideImportSuccessMessage(); $('.citesphere-step').hide(); console.log('Hidden all steps'); @@ -2774,6 +2796,29 @@ }); } + // Show import success message + function showImportSuccessMessage(message) { + var successContainer = $('#importSuccessStatus'); + + successContainer.html( + '
' + + ' ' + message + '' + + '
' + ); + + successContainer.show(); + + // Auto-hide after 5 seconds + setTimeout(function() { + successContainer.fadeOut(); + }, 5000); + } + + // Function to hide success message + function hideImportSuccessMessage() { + $('#importSuccessStatus').hide(); + } + // Show connection status at the top function showConnectionStatus(isConnected) { var statusContainer = $('#connectionStatusContent'); @@ -3017,39 +3062,133 @@ console.log('Found', items.length, 'items'); - items.forEach(function(item) { + items.forEach(function(item, index) { console.log('Processing item:', item); // Extract item data - try both direct properties and nested data structure var itemData = item.data || item; - var title = item.title || itemData.title || item.referenceString || 'Untitled'; - var author = item.authorString || extractAuthorsFromItem(itemData) || item.author || ''; - var year = item.year || extractYearFromItem(itemData) || ''; - var type = item['@type'] || item.itemType || itemData.itemType || 'Reference'; - var checkbox = $(''); - checkbox.data('item', item); + // Better title extraction - handle empty or missing titles + var title = item.title || itemData.title || item.referenceString || 'Untitled Reference'; + if (title.trim() === '') { + title = 'Untitled Reference'; + } - var itemElement = $('
' + + // Better author extraction - handle the complex authors array structure + var author = ''; + if (item.authors && Array.isArray(item.authors) && item.authors.length > 0) { + // Take the first few authors and format them properly + var displayAuthors = item.authors.slice(0, 3).map(function(auth) { + var firstName = (auth.firstName || '').trim(); + var lastName = (auth.lastName || '').trim(); + + if (firstName && lastName) { + return firstName + ' ' + lastName; + } else if (lastName) { + return lastName; + } else if (firstName) { + return firstName; + } else if (auth.name) { + return auth.name.trim(); + } + return ''; + }).filter(function(name) { return name !== ''; }); + + if (displayAuthors.length > 0) { + author = displayAuthors.join(', '); + if (item.authors.length > 3) { + author += ' et al.'; + } + } + } + + // Fallback to other author fields if authors array didn't work + if (!author) { + author = item.authorString || extractAuthorsFromItem(itemData) || item.author || 'Unknown Author'; + } + + // Better year extraction + var year = ''; + if (item.date) { + var match = item.date.match(/(\d{4})/); + year = match ? match[1] : ''; + } + if (!year && item.dateFreetext) { + var match = item.dateFreetext.match(/(\d{4})/); + year = match ? match[1] : ''; + } + if (!year) { + year = item.year || extractYearFromItem(itemData) || ''; + } + + // Better type extraction + var type = 'Reference'; + if (item.itemType) { + switch(item.itemType) { + case 'JOURNAL_ARTICLE': type = 'Journal Article'; break; + case 'BOOK': type = 'Book'; break; + case 'BOOK_SECTION': type = 'Book Section'; break; + case 'CONFERENCE_PAPER': type = 'Conference Paper'; break; + default: type = item.itemType.replace(/_/g, ' '); + } + } else if (item['@type']) { + type = item['@type']; + } else if (itemData.itemType) { + type = itemData.itemType; + } + + // Use radio button instead of checkbox for single selection + var radioButton = $(''); + radioButton.data('item', item); + radioButton.attr('value', item.key || item.id || index); + + var itemElement = $('
' + '
' + '
' + '
' + - '
' + title + '
' + - '
' + author + (year ? ' (' + year + ')' : '') + '
' + + '
' + title + '
' + + '
' + author + (year ? ' (' + year + ')' : '') + '
' + '
Type: ' + type + '
' + '
' + '
' + '
'); - itemElement.find('div').first().prepend(checkbox); + itemElement.find('div').first().prepend(radioButton); + + // Add hover effects + itemElement.hover( + function() { $(this).css('background-color', '#f8f9fa'); }, + function() { + if (!radioButton.prop('checked')) { + $(this).css('background-color', 'white'); + } + } + ); + + // Handle selection - allow clicking on the whole item div + itemElement.click(function(e) { + if (e.target.type !== 'radio') { + radioButton.prop('checked', true); + radioButton.trigger('change'); + } + }); - // Handle selection - checkbox.change(function() { + // Handle radio button selection + radioButton.change(function() { + // Clear visual selection from all items + $('.reference-item').css({ + 'background-color': 'white', + 'border-color': '#ddd' + }); + + // Clear previous selection and set new one + citesphereData.selectedReferences = []; if (this.checked) { citesphereData.selectedReferences.push(item); - } else { - citesphereData.selectedReferences = citesphereData.selectedReferences.filter(function(ref) { - return ref.key !== item.key; + // Highlight selected item + itemElement.css({ + 'background-color': '#e3f2fd', + 'border-color': '#2196f3' }); } updateSelectedCount(); @@ -3105,7 +3244,11 @@ // Update selected count display function updateSelectedCount() { var count = citesphereData.selectedReferences.length; - $('#selectedCountText').text(count + ' reference' + (count !== 1 ? 's' : '')); + if (count === 0) { + $('#selectedCountText').text('No reference selected'); + } else { + $('#selectedCountText').text('1 reference selected'); + } } // Handle search functionality @@ -3132,13 +3275,29 @@ } }); - // Handle importing selected references - $('#submitCitesphereReferences').click(function() { + // Dedicated function to handle Citesphere import + function handleCitesphereImport() { + console.log('*** CITESPHERE IMPORT FUNCTION CALLED ***'); + console.log('Selected references count:', citesphereData.selectedReferences.length); + console.log('Button visibility:', $('#submitCitesphereReferences').is(':visible')); + console.log('Citesphere tab active:', $('#citesphereRefTab').hasClass('active')); + if (citesphereData.selectedReferences.length === 0) { - alert('Please select at least one reference to import.'); + alert('Please select a reference to import.'); return; } + if (citesphereData.selectedReferences.length > 1) { + alert('Please select only one reference at a time.'); + return; + } + + // Continue with the import process + performCitesphereImport(); + } + + // Function to perform the actual import + function performCitesphereImport() { var biblioId = $('#addReferenceTarget').val(); if (!biblioId) { alert('Error: Could not determine bibliography block.'); @@ -3146,48 +3305,106 @@ } console.log('Importing references:', citesphereData.selectedReferences); + console.log('Original Citesphere item structure:', citesphereData.selectedReferences[0]); // Transform the data to match the expected backend format var transformedReferences = citesphereData.selectedReferences.map(function(item) { console.log('Transforming item:', item); - // Create the nested data structure expected by the backend - var transformedItem = { - data: { - title: item.title || item.referenceString || '', - itemType: item['@type'] || 'Reference', - date: item.year || '', - publicationTitle: item.source || '', - url: item.identifier || '', - volume: item.volume || '', - issue: '', - pages: item.firstPage && item.endPage ? item.firstPage + '-' + item.endPage : (item.firstPage || ''), - note: item.referenceString || '', - creators: [] - } - }; + // Extract creators from the authors array or fallback to authorString + var creators = []; + console.log('Processing authors from item:', item.authors); - // Handle author data - if (item.authorString) { - // Split authorString and create creators array + if (item.authors && Array.isArray(item.authors)) { + creators = item.authors.map(function(author) { + console.log('Processing author:', author); + return { + firstName: author.firstName || '', + lastName: author.lastName || author.name || '', + creatorType: 'author' + }; + }); + } else if (item.authorString) { + console.log('Using authorString:', item.authorString); + // Fallback to authorString parsing var authors = item.authorString.split(';'); - transformedItem.data.creators = authors.map(function(author) { + creators = authors.map(function(author) { var trimmedAuthor = author.trim(); if (trimmedAuthor.includes(',')) { var parts = trimmedAuthor.split(','); return { lastName: parts[0].trim(), - firstName: parts[1] ? parts[1].trim() : '' + firstName: parts[1] ? parts[1].trim() : '', + creatorType: 'author' }; } else { return { lastName: trimmedAuthor, - firstName: '' + firstName: '', + creatorType: 'author' }; } }); } + console.log('Final creators array:', creators); + + // Extract date from various possible fields + var dateValue = ''; + if (item.date) { + dateValue = item.date; + } else if (item.dateFreetext) { + dateValue = item.dateFreetext; + } else if (item.year) { + dateValue = item.year; + } + + // Map itemType from Citesphere to Zotero format + var itemType = 'journalArticle'; // default + if (item.itemType) { + switch(item.itemType) { + case 'JOURNAL_ARTICLE': itemType = 'journalArticle'; break; + case 'BOOK': itemType = 'book'; break; + case 'BOOK_SECTION': itemType = 'bookSection'; break; + case 'CONFERENCE_PAPER': itemType = 'conferencePaper'; break; + default: itemType = 'journalArticle'; + } + } else if (item['@type']) { + itemType = item['@type']; + } + + // Create the nested data structure expected by the backend + console.log('Extracting title from item.title:', item.title); + console.log('Extracting publicationTitle from item.publicationTitle:', item.publicationTitle); + + var transformedItem = { + data: { + title: item.title || 'Untitled', + itemType: itemType, + date: dateValue, + publicationTitle: item.publicationTitle || item.source || '', + url: item.url || '', + volume: item.volume || '', + issue: item.issue || '', + pages: item.pages || (item.firstPage && item.endPage ? item.firstPage + '-' + item.endPage : (item.firstPage || '')), + DOI: item.doi || (item.identifier && item.identifierType === 'doi' ? item.identifier : ''), + abstractNote: item.abstractNote || '', + language: item.language || '', + ISSN: item.issn || '', + journalAbbreviation: item.journalAbbreviation || '', + series: item.series || '', + seriesTitle: item.seriesTitle || '', + archive: item.archive || '', + archiveLocation: item.archiveLocation || '', + callNumber: item.callNumber || '', + rights: item.rights || '', + shortTitle: item.shortTitle || '', + note: item.note || item.referenceString || '', + extra: 'Imported from Citesphere - Key: ' + (item.key || item.id || ''), + creators: creators + } + }; + console.log('Transformed item:', transformedItem); return transformedItem; }); @@ -3208,38 +3425,56 @@ data: JSON.stringify(transformedReferences), success: function(response) { console.log('Import response:', response); + console.log('Response type:', typeof response); + console.log('Response keys:', Object.keys(response)); + console.log('References array:', response.references); + console.log('References array type:', typeof response.references); + console.log('References array length:', response.references ? response.references.length : 'undefined'); + if (response.success) { - alert('Successfully imported ' + response.imported_count + ' references from Citesphere!'); + // Show success message instead of alert + showImportSuccessMessage('Bibliography imported successfully!'); // Add the imported references to the bibliography block var biblioBlock = $('[data-biblio-id="' + biblioId + '"]').closest('[data-biblio-block]'); var referenceSpace = biblioBlock.find('#referenceSpace'); - response.references.forEach(function(ref) { - var referenceHtml = '
' + - '

' + - 'Type: ' + (ref.type || '') + ', ' + - 'Reference Title: ' + (ref.title || '') + ', ' + - 'Author: ' + (ref.author || '') + ', ' + - 'Year: ' + (ref.year || '') + ', ' + - 'Journal: ' + (ref.journal || '') + ', ' + - 'Url: ' + (ref.url || '') + ', ' + - 'Volume: ' + (ref.volume || '') + ', ' + - 'Issue: ' + (ref.issue || '') + ', ' + - 'Pages: ' + (ref.pages || '') + ', ' + - 'Editors: ' + (ref.editors || '') + ', ' + - 'Note: ' + (ref.note || '') + '' + - '

' + - '' + - '' + - '' + - '' + - '
'; - - var refElement = $(referenceHtml); - refElement.mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(referenceBlockDoubleClick); - referenceSpace.append(refElement); - }); + if (response.references && Array.isArray(response.references)) { + response.references.forEach(function(ref, index) { + console.log('Reference #' + index + ' object from server:', ref); + console.log('Reference #' + index + ' keys:', Object.keys(ref)); + console.log('Reference #' + index + ' title:', ref.title); + console.log('Reference #' + index + ' author:', ref.author); + console.log('Reference #' + index + ' id:', ref.id); + + // Use the same format as existing references in the application + var referenceHtml = '
' + + '

' + + 'Reference Title: ' + (ref.title || 'NO TITLE') + ', ' + + 'Author: ' + (ref.author || 'NO AUTHOR') + ', ' + + 'Year: ' + (ref.year || 'NO YEAR') + ', ' + + 'Journal: ' + (ref.journal || 'NO JOURNAL') + ', ' + + 'Url: ' + (ref.url || '') + ', ' + + 'Volume: ' + (ref.volume || '') + ', ' + + 'Issue: ' + (ref.issue || '') + ', ' + + 'Pages: ' + (ref.pages || '') + ', ' + + 'Editors: ' + (ref.editors || '') + ', ' + + 'Type: ' + (ref.type || '') + ', ' + + 'Note: ' + (ref.note || '') + '' + + '

' + + '' + + '' + + '' + + '' + + '
'; + + var refElement = $(referenceHtml); + refElement.mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(referenceBlockDoubleClick); + referenceSpace.append(refElement); + }); + } else { + console.error('References is not an array or is undefined:', response.references); + } // Reset and close modal citesphereData.selectedReferences = []; @@ -3256,6 +3491,12 @@ alert('Error importing references: ' + error + ' (Status: ' + xhr.status + ')'); } }); + } + + // Handle importing selected reference (jQuery event handler for compatibility) + $('#submitCitesphereReferences').click(function() { + console.log('*** CITESPHERE IMPORT BUTTON CLICKED VIA JQUERY ***'); + handleCitesphereImport(); }); // Clear Citesphere data when modal is hidden @@ -3267,6 +3508,9 @@ citesphereData.currentCollection = null; updateSelectedCount(); + // Hide success message + hideImportSuccessMessage(); + // Clear all containers $('#citesphereGroups').empty(); $('#citesphereCollections').empty(); @@ -3907,6 +4151,11 @@
Add new Reference
+ + +
@@ -3951,7 +4200,7 @@
- Step 3: Select References to Import + Step 3: Select Reference to Import
@@ -3962,7 +4211,7 @@
- Selected: 0 references + Selected: No reference selected
@@ -3978,7 +4227,7 @@
- +
From c0ce36cc39729454155c30cf3d948a1db23dc6cf Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 18 Sep 2025 08:36:15 -0700 Subject: [PATCH 18/31] [VSPC-189] Removed debug comments, debug logs, cleaneed code --- .../core/services/impl/CitesphereManager.java | 2 - .../web/staff/CitesphereController.java | 170 ++++-------------- .../views/staff/modules/slides/slide.html | 95 +--------- 3 files changed, 33 insertions(+), 234 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index 18a27a67b..a7e6c1cc7 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -185,12 +185,10 @@ private Object executePostRequest(String url, Map data, String f Request request = requestBuilder.build(); try (Response response = client.newCall(request).execute()) { - System.out.println("Response code: " + response.code()); return response; } } catch (Exception e) { - System.err.println("[ERROR] -------- Error during API request with " + filePath + ": " + e.getMessage()); return "Error loading/reading file"; } } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 9ce70c310..ecfe1a822 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -53,42 +53,30 @@ public class CitesphereController { private IReferenceManager referenceManager; - /** - * Initiate OAuth authorization with Citesphere - */ + // initiate oauth authorization with citesphere @RequestMapping(value = "/staff/citesphere/oauth/authorize", method = RequestMethod.GET) public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttributes) { - logger.info("[DEBUG] Initiating OAuth authorization with Citesphere"); - logger.info("[DEBUG] Citesphere API URL: {}", citesphereApiUrl); - logger.info("[DEBUG] Client ID configured: {}", (citesphereClientId != null && !citesphereClientId.isEmpty())); - logger.info("[DEBUG] Client Secret configured: {}", (citesphereClientSecret != null && !citesphereClientSecret.isEmpty())); if (citesphereClientId == null || citesphereClientId.isEmpty()) { - logger.error("[DEBUG] OAuth not configured - missing client ID"); + logger.error("OAuth not configured - missing client ID"); redirectAttributes.addFlashAttribute("error", "Citesphere OAuth is not configured. Please contact your administrator."); return "redirect:/staff/dashboard"; } try { - // Generate state parameter for security + // generate state parameter for security String state = java.util.UUID.randomUUID().toString(); session.setAttribute("citesphere_oauth_state", state); - // Build authorization URL + // build authorization url String baseUrl = citesphereApiUrl; String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; - logger.info("[DEBUG] Building OAuth URL - Base URL: {}", baseUrl); - logger.info("[DEBUG] Redirect URI: {}", redirectUri); - logger.info("[DEBUG] OAuth State: {}", state); - String authUrl = baseUrl + "/oauth/authorize" + "?response_type=code" + "&client_id=" + java.net.URLEncoder.encode(citesphereClientId, "UTF-8") + "&state=" + java.net.URLEncoder.encode(state, "UTF-8") + "&redirect_uri=" + java.net.URLEncoder.encode(redirectUri, "UTF-8"); - - logger.info("[DEBUG] Final OAuth URL: {}", authUrl); return "redirect:" + authUrl; } catch (UnsupportedEncodingException e) { logger.error("Error encoding OAuth parameters", e); @@ -97,9 +85,7 @@ public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttr } } - /** - * Handle OAuth callback from Citesphere - */ + // handle oauth callback from citesphere @RequestMapping(value = "/staff/citesphere/oauth/callback", method = RequestMethod.GET) public String handleOAuthCallback( @RequestParam String code, @@ -107,35 +93,23 @@ public String handleOAuthCallback( HttpSession session, RedirectAttributes redirectAttributes) { - logger.info("[DEBUG] OAuth callback received"); - logger.info("[DEBUG] Authorization code: {}", code != null ? "[PRESENT]" : "[MISSING]"); - logger.info("[DEBUG] State parameter: {}", state); - try { - // Verify state parameter + // verify state parameter String sessionState = (String) session.getAttribute("citesphere_oauth_state"); - logger.info("[DEBUG] Session state: {}", sessionState); - logger.info("[DEBUG] Received state: {}", state); - logger.info("[DEBUG] State match: {}", sessionState != null && sessionState.equals(state)); if (sessionState == null || !sessionState.equals(state)) { - logger.error("[DEBUG] OAuth state validation failed"); + logger.error("OAuth state validation failed"); redirectAttributes.addFlashAttribute("error", "Invalid OAuth state. Please try again."); return "redirect:/staff/dashboard"; } - // Exchange code for access token - logger.info("[DEBUG] Exchanging authorization code for access token"); + // exchange code for access token String accessToken = exchangeCodeForToken(code, session); - logger.info("[DEBUG] Access token received: {}", accessToken != null ? "[SUCCESS]" : "[FAILED]"); if (accessToken != null) { - // Store token in session session.setAttribute("citesphere_access_token", accessToken); - logger.info("[DEBUG] Access token stored in session"); redirectAttributes.addFlashAttribute("success", "Successfully connected to Citesphere!"); } else { - logger.error("[DEBUG] Failed to obtain access token"); redirectAttributes.addFlashAttribute("error", "Failed to obtain access token from Citesphere."); } @@ -143,7 +117,7 @@ public String handleOAuthCallback( logger.error("Error handling OAuth callback", e); redirectAttributes.addFlashAttribute("error", "OAuth authentication failed: " + e.getMessage()); } finally { - // Clean up session + // clean up session session.removeAttribute("citesphere_oauth_state"); } @@ -151,22 +125,17 @@ public String handleOAuthCallback( } - /** - * Get user groups from Citesphere - */ + // get user groups from citesphere @RequestMapping(value = "/staff/citesphere/groups", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroups(HttpSession session) { - logger.info("[DEBUG] API call: getGroups() - Fetching user groups from Citesphere"); try { ICitesphereManager citesphereManager = createCitesphereManager(session); - logger.info("[DEBUG] CitesphereManager created successfully, making API call to get groups"); Map groups = citesphereManager.getGroups(); - // Check for token expiry in response + // check for token expiry in response if (isTokenExpiredResponse(groups)) { - logger.warn("[DEBUG] Token expired response detected, requesting re-authentication"); session.removeAttribute("citesphere_access_token"); session.removeAttribute("citesphere_refresh_token"); session.removeAttribute("citesphere_token_expiry"); @@ -175,10 +144,6 @@ public ResponseEntity> getGroups(HttpSession session) { error.put("require_auth", true); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error); } - - logger.info("[DEBUG] Groups retrieved successfully: {} groups found", - groups != null && groups.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); - logger.info("[DEBUG] Groups data: {}", groups); return ResponseEntity.ok(groups); } catch (IllegalStateException e) { logger.error("Authentication error: {}", e.getMessage()); @@ -194,20 +159,14 @@ public ResponseEntity> getGroups(HttpSession session) { } } - /** - * Get collections for a specific group - */ + // get collections for a specific group @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollections(@PathVariable String groupId, HttpSession session) { - logger.info("[DEBUG] API call: getCollections() - Group ID: {}", groupId); try { ICitesphereManager citesphereManager = createCitesphereManager(session); - logger.info("[DEBUG] CitesphereManager created, fetching collections for group: {}", groupId); Map collections = citesphereManager.getCollections(groupId); - logger.info("[DEBUG] Collections retrieved successfully for group {}: {} collections found", - groupId, collections != null && collections.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(collections); } catch (Exception e) { logger.error("Error fetching collections from Citesphere for group: " + groupId, e); @@ -217,9 +176,7 @@ public ResponseEntity> getCollections(@PathVariable String g } } - /** - * Get items for a specific collection - */ + // get items for a specific collection @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollectionItems( @@ -227,14 +184,10 @@ public ResponseEntity> getCollectionItems( @PathVariable String collectionId, @RequestParam(value = "page", defaultValue = "0") int page, HttpSession session) { - logger.info("[DEBUG] API call: getCollectionItems() - Group: {}, Collection: {}, Page: {}", groupId, collectionId, page); try { ICitesphereManager citesphereManager = createCitesphereManager(session); - logger.info("[DEBUG] CitesphereManager created, fetching items for collection: {} in group: {}", collectionId, groupId); Map items = citesphereManager.getCollectionItems(groupId, collectionId, page); - logger.info("[DEBUG] Collection items retrieved successfully: {} items found", - items != null && items.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(items); } catch (Exception e) { logger.error("Error fetching collection items from Citesphere", e); @@ -244,20 +197,14 @@ public ResponseEntity> getCollectionItems( } } - /** - * Get all items for a specific group - */ + // get all items for a specific group @RequestMapping(value = "/staff/citesphere/groups/{groupId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroupItems(@PathVariable String groupId, HttpSession session) { - logger.info("[DEBUG] API call: getGroupItems() - Group ID: {}", groupId); try { ICitesphereManager citesphereManager = createCitesphereManager(session); - logger.info("[DEBUG] CitesphereManager created, fetching all items for group: {}", groupId); Map items = citesphereManager.getGroupItems(groupId); - logger.info("[DEBUG] Group items retrieved successfully: {} items found", - items != null && items.containsKey("data") ? "[DATA_PRESENT]" : "[NO_DATA]"); return ResponseEntity.ok(items); } catch (Exception e) { logger.error("Error fetching group items from Citesphere for group: " + groupId, e); @@ -267,9 +214,7 @@ public ResponseEntity> getGroupItems(@PathVariable String gr } } - /** - * Import selected references from Citesphere to bibliography - */ + // import selected references from citesphere to bibliography @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/bibliography/{biblioId}/citesphere/import", method = RequestMethod.POST) @ResponseBody public ResponseEntity> importCitesphereReferences( @@ -278,19 +223,10 @@ public ResponseEntity> importCitesphereReferences( @PathVariable String biblioId, @RequestBody List> selectedReferences) { - logger.info("[DEBUG] API call: importCitesphereReferences() - Module: {}, Slide: {}, Bibliography: {}", moduleId, slideId, biblioId); - logger.info("[DEBUG] Number of references to import: {}", selectedReferences != null ? selectedReferences.size() : 0); - - // Log the raw received data - if (selectedReferences != null && !selectedReferences.isEmpty()) { - logger.info("[DEBUG] Raw received data: {}", selectedReferences.get(0)); - } - try { List createdReferences = new ArrayList<>(); for (Map refData : selectedReferences) { - logger.info("[DEBUG] Processing refData: {}", refData); String title = extractField(refData, "title"); String author = extractCreators(refData); @@ -333,20 +269,13 @@ public ResponseEntity> importCitesphereReferences( } private ICitesphereManager createCitesphereManager(HttpSession session) { - logger.info("[DEBUG] Creating CitesphereManager"); - - // Check for OAuth token + // check for oauth token String accessToken = (String) session.getAttribute("citesphere_access_token"); String refreshToken = (String) session.getAttribute("citesphere_refresh_token"); Long expiryTime = (Long) session.getAttribute("citesphere_token_expiry"); - logger.info("[DEBUG] Access token in session: {}", accessToken != null ? "[PRESENT]" : "[MISSING]"); - logger.info("[DEBUG] Refresh token in session: {}", refreshToken != null ? "[PRESENT]" : "[MISSING]"); - logger.info("[DEBUG] Token expiry time: {}", expiryTime != null ? "[PRESENT]" : "[MISSING]"); - logger.info("[DEBUG] API URL: {}", citesphereApiUrl); - if (accessToken != null) { - // Create auth token with all available information + // create auth token with all available information CitesphereAuthToken authToken; if (refreshToken != null && expiryTime != null) { authToken = new CitesphereAuthToken(accessToken, refreshToken, expiryTime); @@ -354,16 +283,14 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { authToken = new CitesphereAuthToken(accessToken); } - logger.info("[DEBUG] Creating CitesphereManager with API URL: {} and auth token", citesphereApiUrl); ICitesphereManager manager = new CitesphereManager(citesphereApiUrl, authToken); - // Check if token is valid and refresh if needed + // check if token is valid and refresh if needed if (!manager.isTokenValid()) { - logger.info("[DEBUG] Token is invalid or expired, attempting refresh"); try { CitesphereAuthToken refreshedToken = manager.refreshToken(); - // Update session with new token information + // update session with new token information session.setAttribute("citesphere_access_token", refreshedToken.getAccessToken()); if (refreshedToken.getRefreshToken() != null) { session.setAttribute("citesphere_refresh_token", refreshedToken.getRefreshToken()); @@ -372,12 +299,11 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { session.setAttribute("citesphere_token_expiry", refreshedToken.getTokenExpiryTime()); } - logger.info("[DEBUG] Token refreshed successfully"); return manager; } catch (CitesphereTokenException e) { - logger.error("[DEBUG] Token refresh failed: {}", e.getMessage()); - // Clear invalid tokens from session + logger.error("Token refresh failed: {}", e.getMessage()); + // clear invalid tokens from session session.removeAttribute("citesphere_access_token"); session.removeAttribute("citesphere_refresh_token"); session.removeAttribute("citesphere_token_expiry"); @@ -387,29 +313,20 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { return manager; } else { - // No authentication available - logger.error("[DEBUG] No access token available in session - authentication required"); + // no authentication available + logger.error("No access token available in session - authentication required"); throw new IllegalStateException("No Citesphere access token available. Please authenticate first."); } } - /** - * Exchange authorization code for access token - */ + // exchange authorization code for access token private String exchangeCodeForToken(String code, HttpSession session) { - logger.info("[DEBUG] Starting token exchange process"); - logger.info("[DEBUG] Authorization code: {}", code != null ? "[PRESENT]" : "[MISSING]"); try { OkHttpClient client = new OkHttpClient(); String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; String tokenUrl = citesphereApiUrl + "oauth/token"; - logger.info("[DEBUG] Token exchange URL: {}", tokenUrl); - logger.info("[DEBUG] Redirect URI: {}", redirectUri); - logger.info("[DEBUG] Client ID: {}", citesphereClientId != null ? "[PRESENT]" : "[MISSING]"); - logger.info("[DEBUG] Client Secret: {}", citesphereClientSecret != null ? "[PRESENT]" : "[MISSING]"); - okhttp3.RequestBody formBody = new FormBody.Builder() .add("grant_type", "authorization_code") .add("code", code) @@ -422,16 +339,11 @@ private String exchangeCodeForToken(String code, HttpSession session) { .url(tokenUrl) .post(formBody) .build(); - - logger.info("[DEBUG] Making token exchange request to: {}", tokenUrl); try (Response response = client.newCall(request).execute()) { String responseBody = response.body() != null ? response.body().string() : ""; - logger.info("[DEBUG] Token exchange response code: {}", response.code()); - logger.info("[DEBUG] Token exchange response body: {}", responseBody); if (response.isSuccessful() && !responseBody.isEmpty()) { - logger.info("[DEBUG] Token exchange successful, parsing response"); ObjectMapper mapper = new ObjectMapper(); @SuppressWarnings("unchecked") Map tokenResponse = mapper.readValue(responseBody, Map.class); @@ -439,11 +351,7 @@ private String exchangeCodeForToken(String code, HttpSession session) { String refreshToken = (String) tokenResponse.get("refresh_token"); Number expiresIn = (Number) tokenResponse.get("expires_in"); - logger.info("[DEBUG] Access token extracted: {}", accessToken != null ? "[SUCCESS]" : "[FAILED]"); - logger.info("[DEBUG] Refresh token extracted: {}", refreshToken != null ? "[SUCCESS]" : "[MISSING]"); - logger.info("[DEBUG] Expires in: {}", expiresIn != null ? expiresIn.toString() + " seconds" : "[MISSING]"); - - // Store additional token information in session + // store additional token information in session if (refreshToken != null) { session.setAttribute("citesphere_refresh_token", refreshToken); } @@ -454,7 +362,7 @@ private String exchangeCodeForToken(String code, HttpSession session) { return accessToken; } else { - logger.error("[DEBUG] Token exchange failed - Response code: {}, Body: {}", response.code(), responseBody); + logger.error("Token exchange failed - Response code: {}, Body: {}", response.code(), responseBody); } } } catch (Exception e) { @@ -463,28 +371,24 @@ private String exchangeCodeForToken(String code, HttpSession session) { return null; } - /** - * Get current base URL for redirect URI - */ + // get current base url for redirect uri private String getCurrentBaseUrl() { return appBaseUrl != null && !appBaseUrl.isEmpty() ? appBaseUrl : "http://localhost:8080"; } - /** - * Check if API response indicates token expiry - */ + // check if api response indicates token expiry private boolean isTokenExpiredResponse(Map response) { if (response == null) { return false; } - // Check for token_expired flag + // check for token_expired flag Boolean tokenExpired = (Boolean) response.get("token_expired"); if (Boolean.TRUE.equals(tokenExpired)) { return true; } - // Check for error messages indicating token issues + // check for error messages indicating token issues String errorMessage = (String) response.get("error_message"); if (errorMessage != null) { String lowerError = errorMessage.toLowerCase(); @@ -500,17 +404,11 @@ private boolean isTokenExpiredResponse(Map response) { @SuppressWarnings("unchecked") private String extractField(Map refData, String fieldName) { try { - logger.debug("[DEBUG] Extracting field '{}' from refData keys: {}", fieldName, refData.keySet()); - Map data = (Map) refData.get("data"); if (data != null && data.containsKey(fieldName)) { Object value = data.get(fieldName); String result = value != null ? value.toString() : ""; - logger.debug("[DEBUG] Found field '{}' in data: '{}'", fieldName, result); return result; - } else { - logger.debug("[DEBUG] Field '{}' not found in data section. Data keys: {}", - fieldName, data != null ? data.keySet() : "data is null"); } } catch (Exception e) { logger.warn("Error extracting field {}: {}", fieldName, e.getMessage()); @@ -518,9 +416,7 @@ private String extractField(Map refData, String fieldName) { return ""; } - /** - * Extract creators (authors) from Citesphere reference data - */ + // extract creators (authors) from citesphere reference data @SuppressWarnings("unchecked") private String extractCreators(Map refData) { try { @@ -554,9 +450,7 @@ private String extractCreators(Map refData) { return ""; } - /** - * Extract year from Citesphere reference data - */ + // extract year from citesphere reference data @SuppressWarnings("unchecked") private String extractYear(Map refData) { try { diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index db076ffbc..359a6b957 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -305,7 +305,6 @@ // Extract values - if Type is first in display, adjust indices accordingly // Check if the current display has Type first or not var fullText = $("div.open p:eq(0)").text(); - console.log("Full reference text:", fullText); var type, title, author, year, journal, url, volume, issue, pages, editors, note; @@ -366,7 +365,6 @@ // Enhanced type selection logic var trimmedType = type ? type.trim() : ''; - console.log("Setting type field with value:", trimmedType); // First, reset the select to default $("#editTypeRef").prop('selectedIndex', 0); @@ -376,7 +374,6 @@ var exactMatch = $("#editTypeRef option[value='" + trimmedType + "']"); if (exactMatch.length > 0) { $("#editTypeRef").val(trimmedType); - console.log("Exact match found for type:", trimmedType); } else { // Try case-insensitive match var foundOption = false; @@ -388,21 +385,14 @@ optionText.toLowerCase() === trimmedType.toLowerCase()) { $("#editTypeRef").val(optionValue); foundOption = true; - console.log("Case-insensitive match found. Set to:", optionValue); return false; // break } }); if (!foundOption) { - console.log("No match found for type:", trimmedType); - console.log("Available options:"); - $("#editTypeRef option").each(function() { - console.log("- Value:", $(this).val(), "Text:", $(this).text()); - }); } } } else { - console.log("Type is empty, leaving as default"); } // Store original values for cancel functionality @@ -1651,7 +1641,6 @@ }, data: jsonData, success: function(data) { - console.log(data); // Updated biblioblock creation with data attributes var biblioblock = $( @@ -1687,9 +1676,6 @@ $("#submitReference").on("click", function(e) { - console.log('*** REGULAR SUBMIT BUTTON CLICKED ***'); - console.log('Button visibility:', $('#submitReference').is(':visible')); - console.log('Citesphere tab active:', $('#citesphereRefTab').hasClass('active')); e.preventDefault(); // ------------- creating reference ------------ @@ -2699,7 +2685,6 @@ // Initialize Citesphere step-by-step flow when switching to tab if ($(e.target).attr('href') === '#citesphereRefTab') { - console.log('Citesphere tab activated - initializing steps'); initializeCitesphereSteps(); } }); @@ -2707,8 +2692,6 @@ // Also trigger when tab link is clicked $(document).on('click', 'a[href="#citesphereRefTab"]', function() { setTimeout(function() { - console.log('Citesphere tab clicked - initializing steps'); - console.log('Manually updating button visibility after tab click'); updateReferenceModalButtons(); initializeCitesphereSteps(); }, 100); @@ -2717,7 +2700,6 @@ // Handle manual tab click to update buttons $(document).on('click', 'a[href="#manualRefTab"]', function() { setTimeout(function() { - console.log('Manual tab clicked - updating buttons'); updateReferenceModalButtons(); }, 100); }); @@ -2725,11 +2707,6 @@ function updateReferenceModalButtons() { var isCitesphereTab = $('#citesphereRefTab').hasClass('active'); - console.log('*** UPDATING MODAL BUTTONS ***'); - console.log('Citesphere tab active:', isCitesphereTab); - console.log('Before - Submit button visible:', $('#submitReference').is(':visible')); - console.log('Before - Citesphere button visible:', $('#submitCitesphereReferences').is(':visible')); - if (isCitesphereTab) { $('#submitReference').hide(); $('#submitCitesphereReferences').show(); @@ -2737,14 +2714,10 @@ $('#submitReference').show(); $('#submitCitesphereReferences').hide(); } - - console.log('After - Submit button visible:', $('#submitReference').is(':visible')); - console.log('After - Citesphere button visible:', $('#submitCitesphereReferences').is(':visible')); } // Initialize the step-by-step Citesphere flow function initializeCitesphereSteps() { - console.log('initializeCitesphereSteps called'); // Reset step data citesphereData.currentStep = 'connection'; @@ -2755,7 +2728,6 @@ // Hide success message and all steps initially hideImportSuccessMessage(); $('.citesphere-step').hide(); - console.log('Hidden all steps'); // Show a loading message first $('#connectionStatusContent').html( @@ -2770,7 +2742,6 @@ // Check if user is connected to Citesphere function checkCitesphereConnection() { - console.log('checkCitesphereConnection called'); var token = $('input[name="_csrf"]').attr('value'); $.ajax({ @@ -2780,7 +2751,6 @@ 'X-CSRF-Token': token }, success: function(data) { - console.log('Connection successful, received data:', data); // Connected successfully showConnectionStatus(true); citesphereData.groups = data; @@ -2788,7 +2758,6 @@ showStep1Groups(data); }, error: function(xhr, status, error) { - console.log('Connection failed:', xhr.status, error); // Not connected or error showConnectionStatus(false); citesphereData.currentStep = 'connection'; @@ -2859,7 +2828,6 @@ } groupsData.data.forEach(function(group) { - console.log('Processing group:', group); var groupElement = $('
' + '
' + @@ -2878,7 +2846,6 @@ ); groupElement.click(function() { - console.log('Group clicked:', group); citesphereData.currentGroup = group; showStep2Collections(group); }); @@ -2899,7 +2866,6 @@ // Extract group ID - try multiple possible fields var groupId = group.zoteroGroupId || group.id || group.groupId || group.key; - console.log('Extracted group ID:', groupId, 'from group object:', group); loadGroupCollections(groupId, group.name); } @@ -2908,8 +2874,6 @@ function loadGroupCollections(groupId, groupName) { var token = $('input[name="_csrf"]').attr('value'); - console.log('Loading collections for group:', groupId, 'with name:', groupName); - $.ajax({ url: '/vspace/staff/citesphere/groups/' + groupId + '/collections', type: 'GET', @@ -2917,13 +2881,9 @@ 'X-CSRF-Token': token }, success: function(data) { - console.log('Collections loaded successfully for group ' + groupId + ':', data); displayCollections(data, groupId, groupName); }, error: function(xhr, status, error) { - console.error('Error loading collections for group ' + groupId + ':', error); - console.error('Response status:', xhr.status); - console.error('Response text:', xhr.responseText); $('#citesphereCollections').html('
Error loading collections: ' + error + ' (Status: ' + xhr.status + ')
'); } }); @@ -2934,21 +2894,15 @@ var collectionsContainer = $('#citesphereCollections'); collectionsContainer.empty(); - console.log('Displaying collections data:', collectionsData); - // Handle both possible response structures: {data: []} or {collections: []} var collections = collectionsData.collections || collectionsData.data || []; if (!collections || !Array.isArray(collections) || collections.length === 0) { - console.log('No collections data found or data is not an array'); collectionsContainer.html('
No collections found in this group.
'); return; } - - console.log('Found', collections.length, 'collections'); collections.forEach(function(collection) { - console.log('Processing collection:', collection); // Extract collection name and key from different possible structures var collectionName = collection.name || (collection.data && collection.data.name) || 'Unnamed Collection'; @@ -2971,7 +2925,6 @@ ); collectionElement.click(function() { - console.log('Collection clicked:', collection, 'using key:', collectionKey); citesphereData.currentCollection = collection; showStep3References(groupId, collectionKey, collectionName); }); @@ -2982,7 +2935,6 @@ // Show Step 3: References function showStep3References(groupId, collectionId, collectionName) { - console.log('Showing step 3 references - Group:', groupId, 'Collection:', collectionId, 'Name:', collectionName); $('#step2-collections').hide(); $('#step3-references').show(); $('#currentCollectionName').text('Collection: ' + (collectionName || 'Unnamed Collection')); @@ -3015,8 +2967,6 @@ function loadCollectionItems(groupId, collectionId, collectionName) { var token = $('input[name="_csrf"]').attr('value'); - console.log('Loading collection items - Group:', groupId, 'Collection:', collectionId); - $.ajax({ url: '/vspace/staff/citesphere/groups/' + groupId + '/collections/' + collectionId + '/items', type: 'GET', @@ -3024,13 +2974,9 @@ 'X-CSRF-Token': token }, success: function(data) { - console.log('Collection items loaded successfully:', data); displayIndividualItems(data, 'Items in ' + collectionName); }, error: function(xhr, status, error) { - console.error('Error loading collection items:', error); - console.error('Response status:', xhr.status); - console.error('Response text:', xhr.responseText); $('#citesphereReferences').html('
Error loading references: ' + error + ' (Status: ' + xhr.status + ')
'); } }); @@ -3041,8 +2987,6 @@ var referencesContainer = $('#citesphereReferences'); referencesContainer.empty(); - console.log('Displaying individual items:', itemsData); - var titleElement = $('
' + title + '
'); referencesContainer.append(titleElement); @@ -3055,15 +2999,11 @@ } if (!items || !Array.isArray(items) || items.length === 0) { - console.log('No items data found or data is not an array'); referencesContainer.append('
No items found.
'); return; } - - console.log('Found', items.length, 'items'); items.forEach(function(item, index) { - console.log('Processing item:', item); // Extract item data - try both direct properties and nested data structure var itemData = item.data || item; @@ -3277,10 +3217,6 @@ // Dedicated function to handle Citesphere import function handleCitesphereImport() { - console.log('*** CITESPHERE IMPORT FUNCTION CALLED ***'); - console.log('Selected references count:', citesphereData.selectedReferences.length); - console.log('Button visibility:', $('#submitCitesphereReferences').is(':visible')); - console.log('Citesphere tab active:', $('#citesphereRefTab').hasClass('active')); if (citesphereData.selectedReferences.length === 0) { alert('Please select a reference to import.'); @@ -3304,20 +3240,15 @@ return; } - console.log('Importing references:', citesphereData.selectedReferences); - console.log('Original Citesphere item structure:', citesphereData.selectedReferences[0]); // Transform the data to match the expected backend format var transformedReferences = citesphereData.selectedReferences.map(function(item) { - console.log('Transforming item:', item); // Extract creators from the authors array or fallback to authorString var creators = []; - console.log('Processing authors from item:', item.authors); if (item.authors && Array.isArray(item.authors)) { creators = item.authors.map(function(author) { - console.log('Processing author:', author); return { firstName: author.firstName || '', lastName: author.lastName || author.name || '', @@ -3325,7 +3256,6 @@ }; }); } else if (item.authorString) { - console.log('Using authorString:', item.authorString); // Fallback to authorString parsing var authors = item.authorString.split(';'); creators = authors.map(function(author) { @@ -3347,8 +3277,6 @@ }); } - console.log('Final creators array:', creators); - // Extract date from various possible fields var dateValue = ''; if (item.date) { @@ -3374,8 +3302,6 @@ } // Create the nested data structure expected by the backend - console.log('Extracting title from item.title:', item.title); - console.log('Extracting publicationTitle from item.publicationTitle:', item.publicationTitle); var transformedItem = { data: { @@ -3405,7 +3331,6 @@ } }; - console.log('Transformed item:', transformedItem); return transformedItem; }); @@ -3413,7 +3338,6 @@ var slideId = '[[${slide.id}]]'; var token = $('input[name="_csrf"]').attr('value'); - console.log('Sending transformed data:', transformedReferences); $.ajax({ url: '/vspace/staff/module/' + moduleId + '/slide/' + slideId + '/bibliography/' + biblioId + '/citesphere/import', @@ -3424,12 +3348,6 @@ }, data: JSON.stringify(transformedReferences), success: function(response) { - console.log('Import response:', response); - console.log('Response type:', typeof response); - console.log('Response keys:', Object.keys(response)); - console.log('References array:', response.references); - console.log('References array type:', typeof response.references); - console.log('References array length:', response.references ? response.references.length : 'undefined'); if (response.success) { // Show success message instead of alert @@ -3441,11 +3359,6 @@ if (response.references && Array.isArray(response.references)) { response.references.forEach(function(ref, index) { - console.log('Reference #' + index + ' object from server:', ref); - console.log('Reference #' + index + ' keys:', Object.keys(ref)); - console.log('Reference #' + index + ' title:', ref.title); - console.log('Reference #' + index + ' author:', ref.author); - console.log('Reference #' + index + ' id:', ref.id); // Use the same format as existing references in the application var referenceHtml = '
' + @@ -3472,8 +3385,6 @@ refElement.mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(referenceBlockDoubleClick); referenceSpace.append(refElement); }); - } else { - console.error('References is not an array or is undefined:', response.references); } // Reset and close modal @@ -3485,9 +3396,6 @@ } }, error: function(xhr, status, error) { - console.error('Error importing references:', error); - console.error('Response status:', xhr.status); - console.error('Response text:', xhr.responseText); alert('Error importing references: ' + error + ' (Status: ' + xhr.status + ')'); } }); @@ -3495,7 +3403,6 @@ // Handle importing selected reference (jQuery event handler for compatibility) $('#submitCitesphereReferences').click(function() { - console.log('*** CITESPHERE IMPORT BUTTON CLICKED VIA JQUERY ***'); handleCitesphereImport(); }); @@ -4227,7 +4134,7 @@
- +
From 1a645b5b13a57b74a773bbb1e115c8cdab2e9387 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 18 Sep 2025 11:20:51 -0700 Subject: [PATCH 19/31] [VSPC-189] Citesphere config update --- vspace/pom.xml | 4 ++++ .../asu/diging/vspace/web/staff/CitesphereController.java | 2 +- vspace/src/main/resources/app.properties | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vspace/pom.xml b/vspace/pom.xml index 844afaf9a..7e677b9e8 100644 --- a/vspace/pom.xml +++ b/vspace/pom.xml @@ -34,6 +34,10 @@ + + + + vspace TomcatServer diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index ecfe1a822..42296085b 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -46,7 +46,7 @@ public class CitesphereController { @Value("${citesphere.client.secret:}") private String citesphereClientSecret; - @Value("${app.base.url:http://localhost:8080}") + @Value("${app_url}") private String appBaseUrl; @Autowired diff --git a/vspace/src/main/resources/app.properties b/vspace/src/main/resources/app.properties index 12e88020f..48e5ebf0e 100644 --- a/vspace/src/main/resources/app.properties +++ b/vspace/src/main/resources/app.properties @@ -16,7 +16,6 @@ file_uploads_directory=${files.directory.path} hibernate_show_sql=${hibernate.show_sql} admin_username=${admin.username} -# Citesphere integration citesphere.api.url=${citesphere_api_url} -citesphere.username=${citesphere_username} -citesphere.password=${citesphere_password} +citesphere.client.id=${citesphere_client_id} +citesphere.client.secret=${citesphere_client_secret} \ No newline at end of file From ff11d7340687d668545b7e4e5c6f4b9de095be8f Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 18 Sep 2025 11:23:04 -0700 Subject: [PATCH 20/31] [VSPC-189] revert config properties to orignal --- vspace/src/main/resources/config.properties | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/vspace/src/main/resources/config.properties b/vspace/src/main/resources/config.properties index efc0a4077..adf448ef1 100644 --- a/vspace/src/main/resources/config.properties +++ b/vspace/src/main/resources/config.properties @@ -13,9 +13,4 @@ image_category_SPACE_BACKGROUND_IMAGE=Space Background Image image_category_SLIDE_IMAGE=Slide Image image_category_LINK_IMAGE=Link Image buildNum=${buildNumber} -baseUrl=${app.url} - -# Citesphere API Configuration -citesphere_api_url=${citesphere.api.url:https://citesphere.org/api} -citesphere_username=${citesphere.username:} -citesphere_password=${citesphere.password:} \ No newline at end of file +baseUrl=${app.url} \ No newline at end of file From cdcc35d5db6e09ca1df1c7fd00adac38ac2a160f Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 18 Sep 2025 11:40:35 -0700 Subject: [PATCH 21/31] [VSPC-189] code cleanup --- .../WEB-INF/views/staff/modules/slides/slide.html | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 359a6b957..4aa76f68e 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -305,6 +305,7 @@ // Extract values - if Type is first in display, adjust indices accordingly // Check if the current display has Type first or not var fullText = $("div.open p:eq(0)").text(); + console.log("Full reference text:", fullText); var type, title, author, year, journal, url, volume, issue, pages, editors, note; @@ -363,10 +364,9 @@ $("#editEditorsRef").val(editors || ''); $("#editNoteRef").val(note || ''); - // Enhanced type selection logic var trimmedType = type ? type.trim() : ''; + console.log("Setting type field with value:", trimmedType); - // First, reset the select to default $("#editTypeRef").prop('selectedIndex', 0); if (trimmedType) { @@ -374,8 +374,8 @@ var exactMatch = $("#editTypeRef option[value='" + trimmedType + "']"); if (exactMatch.length > 0) { $("#editTypeRef").val(trimmedType); + console.log("Exact match found for type:", trimmedType); } else { - // Try case-insensitive match var foundOption = false; $("#editTypeRef option").each(function() { var optionValue = $(this).val(); @@ -385,14 +385,21 @@ optionText.toLowerCase() === trimmedType.toLowerCase()) { $("#editTypeRef").val(optionValue); foundOption = true; + console.log("Case-insensitive match found. Set to:", optionValue); return false; // break } }); if (!foundOption) { + console.log("No match found for type:", trimmedType); + console.log("Available options:"); + $("#editTypeRef option").each(function() { + console.log("- Value:", $(this).val(), "Text:", $(this).text()); + }); } } } else { + console.log("Type is empty, leaving as default"); } // Store original values for cancel functionality @@ -1641,8 +1648,8 @@ }, data: jsonData, success: function(data) { + console.log(data); - // Updated biblioblock creation with data attributes var biblioblock = $( '
' + '

' + From c5575fe0f519bbfd447a025aaef8ebeb0b835790 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 18 Sep 2025 11:42:27 -0700 Subject: [PATCH 22/31] [VSPC-189] added comments that were removed unintentionally --- .../main/webapp/WEB-INF/views/staff/modules/slides/slide.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 4aa76f68e..482236481 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -364,9 +364,11 @@ $("#editEditorsRef").val(editors || ''); $("#editNoteRef").val(note || ''); + // Enhanced type selection logic var trimmedType = type ? type.trim() : ''; console.log("Setting type field with value:", trimmedType); + // First, reset the select to default $("#editTypeRef").prop('selectedIndex', 0); if (trimmedType) { @@ -376,6 +378,7 @@ $("#editTypeRef").val(trimmedType); console.log("Exact match found for type:", trimmedType); } else { + // Try case-insensitive match var foundOption = false; $("#editTypeRef option").each(function() { var optionValue = $(this).val(); @@ -1650,6 +1653,7 @@ success: function(data) { console.log(data); + // Updated biblioblock creation with data attributes var biblioblock = $( '

' + '

' + From 87f628903e80c3b14c579c45518b4f7326ba7cc0 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Wed, 14 Jan 2026 16:59:11 -0700 Subject: [PATCH 23/31] [VSPC-189] Removed basic auth support, auth validation and header creation, replaced HTTP status numbers with status constants, removed file upload code, and reverted gitignore to orignal --- vspace/.gitignore | 1 - .../core/services/CitesphereAuthToken.java | 31 +---- .../core/services/ICitesphereManager.java | 11 +- .../core/services/impl/CitesphereManager.java | 113 +++--------------- 4 files changed, 21 insertions(+), 135 deletions(-) diff --git a/vspace/.gitignore b/vspace/.gitignore index 116975289..d507c0bee 100644 --- a/vspace/.gitignore +++ b/vspace/.gitignore @@ -2,4 +2,3 @@ /Users/ /.settings/ .DS_Store - diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java index cf0a18818..d7dfd3aad 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/CitesphereAuthToken.java @@ -11,8 +11,6 @@ public class CitesphereAuthToken { private Map headers; private String accessToken; private String refreshToken; - private String username; - private String password; private long tokenExpiryTime; /** @@ -37,17 +35,6 @@ public CitesphereAuthToken(String accessToken, String refreshToken, long expiryT this.tokenExpiryTime = expiryTime; } - /** - * Constructor for Basic authentication - * @param username Username - * @param password Password - */ - public CitesphereAuthToken(String username, String password) { - this.authType = "basic"; - this.username = username; - this.password = password; - } - // Getters and setters public String getAuthType() { return authType; @@ -72,23 +59,7 @@ public String getAccessToken() { public void setAccessToken(String accessToken) { this.accessToken = accessToken; } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - + public String getRefreshToken() { return refreshToken; } diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java index a81444a33..e5f22fa33 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java @@ -93,16 +93,7 @@ public interface ICitesphereManager { * @return Collections as Map */ Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId); - - /** - * Add item to group - * @param groupId Group ID - * @param data Item data - * @param filePath Path to file to upload - * @return Response from API - */ - Object addItem(String groupId, Map data, String filePath); - + /** * Refresh the access token using refresh token * @return New CitesphereAuthToken with refreshed access token diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index a7e6c1cc7..2a0e1467f 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -10,13 +10,12 @@ import edu.asu.diging.vspace.core.services.ICitesphereManager; import edu.asu.diging.vspace.core.exception.CitesphereTokenException; -import java.io.File; import java.io.IOException; -import java.util.Base64; import java.util.HashMap; import java.util.List; import java.util.Map; import okhttp3.*; +import org.springframework.http.HttpStatus; /** * Implementation of CitesphereService for API operations @@ -52,17 +51,13 @@ private void validate() { if (authTokenObject.getAuthType() == null) { throw new IllegalArgumentException("Missing authType attribute"); } - + if (authTokenObject.getAccessToken() == null) { - if (authTokenObject.getUsername() == null || authTokenObject.getPassword() == null) { - throw new IllegalArgumentException( - "Either username and password or access_token should be present"); - } + throw new IllegalArgumentException("access_token is required"); } - - if (!"oauth".equals(authTokenObject.getAuthType()) && - !"basic".equals(authTokenObject.getAuthType())) { - throw new IllegalArgumentException("authType should be either oauth or basic"); + + if (!"oauth".equals(authTokenObject.getAuthType())) { + throw new IllegalArgumentException("authType should be oauth"); } } @@ -71,15 +66,7 @@ private void validate() { */ private void handleApiParams() { Map headers = new HashMap<>(); - - if ("oauth".equals(authTokenObject.getAuthType())) { - headers.put("Authorization", "Bearer " + authTokenObject.getAccessToken()); - } else if ("basic".equals(authTokenObject.getAuthType())) { - String authStr = authTokenObject.getUsername() + ":" + authTokenObject.getPassword(); - String authB64 = Base64.getEncoder().encodeToString(authStr.getBytes()); - headers.put("Authorization", "Basic " + authB64); - } - + headers.put("Authorization", "Bearer " + authTokenObject.getAccessToken()); authTokenObject.setHeaders(headers); } @@ -104,10 +91,10 @@ private Map executeCommand(String url) throws CitesphereTokenExc try (Response response = client.newCall(request).execute()) { // Check for unauthorized or forbidden responses - if (response.code() == 401 || response.code() == 403) { + if (response.code() == HttpStatus.UNAUTHORIZED.value() || response.code() == HttpStatus.FORBIDDEN.value()) { throw new CitesphereTokenException( - "Invalid or expired access token", - response.code(), + "Invalid or expired access token", + response.code(), true ); } @@ -130,69 +117,15 @@ private Map executeCommand(String url) throws CitesphereTokenExc } } } - } catch (CitesphereTokenException e) { - throw e; // Re-throw token exceptions - } catch (Exception e) { + } catch (IOException e) { Map errorMap = new HashMap<>(); errorMap.put("error_message", e.getMessage()); return errorMap; } - + return new HashMap<>(); } - /** - * Execute POST request - * @param url Request URL - * @param data Request data - * @param filePath File path for upload - * @return Response object - */ - private Object executePostRequest(String url, Map data, String filePath) { - try { - MultipartBody.Builder builder = new MultipartBody.Builder() - .setType(MultipartBody.FORM); - - // Add data parameters - if (data != null) { - for (Map.Entry entry : data.entrySet()) { - builder.addFormDataPart(entry.getKey(), entry.getValue().toString()); - } - } - - // Add file if provided - if (filePath != null) { - File file = new File(filePath); - if (file.exists()) { - RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/pdf")); - builder.addFormDataPart("files", file.getName(), fileBody); - } - } - - RequestBody requestBody = builder.build(); - - Request.Builder requestBuilder = new Request.Builder() - .url(url) - .post(requestBody); - - // Add headers - if (authTokenObject.getHeaders() != null) { - for (Map.Entry header : authTokenObject.getHeaders().entrySet()) { - requestBuilder.addHeader(header.getKey(), header.getValue()); - } - } - - Request request = requestBuilder.build(); - - try (Response response = client.newCall(request).execute()) { - return response; - } - - } catch (Exception e) { - return "Error loading/reading file"; - } - } - @Override public Map getUser() { try { @@ -343,13 +276,7 @@ public Map getCollectionsByCollectionId(String zoteroGroupId, St return errorMap; } } - - @Override - public Object addItem(String groupId, Map data, String filePath) { - String url = api + "/v1/groups/" + groupId + "/items/create"; - return executePostRequest(url, data, filePath); - } - + @Override public CitesphereAuthToken refreshToken() throws CitesphereTokenException { if (authTokenObject.getRefreshToken() == null || authTokenObject.getRefreshToken().isEmpty()) { @@ -370,10 +297,10 @@ public CitesphereAuthToken refreshToken() throws CitesphereTokenException { .build(); try (Response response = client.newCall(request).execute()) { - if (response.code() == 401 || response.code() == 403) { + if (response.code() == HttpStatus.UNAUTHORIZED.value() || response.code() == HttpStatus.FORBIDDEN.value()) { throw new CitesphereTokenException( - "Refresh token is invalid or expired", - response.code(), + "Refresh token is invalid or expired", + response.code(), true ); } @@ -409,9 +336,7 @@ public CitesphereAuthToken refreshToken() throws CitesphereTokenException { throw new CitesphereTokenException("Failed to refresh token: " + response.code()); } - } catch (CitesphereTokenException e) { - throw e; - } catch (Exception e) { + } catch (IOException e) { throw new CitesphereTokenException("Error refreshing token: " + e.getMessage(), e); } } @@ -441,9 +366,9 @@ public boolean isTokenValid() { Request request = requestBuilder.build(); try (Response response = client.newCall(request).execute()) { - return response.code() != 401 && response.code() != 403; + return response.code() != HttpStatus.UNAUTHORIZED.value() && response.code() != HttpStatus.FORBIDDEN.value(); } - } catch (Exception e) { + } catch (IOException e) { return false; } } From 925a95317f0b80de43952769bdd434581a4dc0f1 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Thu, 15 Jan 2026 12:26:39 -0700 Subject: [PATCH 24/31] [VSPC-189] refactored duplicate error handling method, added http status constants, removed check Access --- .../core/services/ICitesphereManager.java | 15 +- .../core/services/impl/CitesphereManager.java | 141 ++++-------------- 2 files changed, 31 insertions(+), 125 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java index e5f22fa33..0af625c67 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ICitesphereManager.java @@ -13,20 +13,7 @@ public interface ICitesphereManager { * @return User data as Map */ Map getUser(); - - /** - * Check test endpoint - * @return Test response as Map - */ - Map checkTest(); - - /** - * Check access for a document - * @param documentId Document ID to check access for - * @return Access check response as Map - */ - Map checkAccess(String documentId); - + /** * Get data by endpoint * @param endpoint API endpoint path diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index 2a0e1467f..8b9ea1eaf 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -125,24 +125,14 @@ private Map executeCommand(String url) throws CitesphereTokenExc return new HashMap<>(); } - - @Override - public Map getUser() { - try { - String url = api + "/v1/user"; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } - } - - @Override - public Map checkTest() { + + /** + * Execute command with error handling + * @param url Request URL + * @return Response data as Map, or error map if exception occurs + */ + private Map executeWithErrorHandling(String url) { try { - String url = api + "/v1/test"; return executeCommand(url); } catch (CitesphereTokenException e) { Map errorMap = new HashMap<>(); @@ -151,130 +141,59 @@ public Map checkTest() { return errorMap; } } - + @Override - public Map checkAccess(String documentId) { - try { - String url = api + "/files/giles/" + documentId + "/access/check"; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + public Map getUser() { + return executeWithErrorHandling(api + "/v1/user"); } - + @Override public Map getDataByEndpoint(String endpoint) { - try { - String url = api + "/v1" + endpoint; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/v1" + endpoint); } - + @Override public Map getGroups() { - try { - String url = api + "/v1/groups"; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/v1/groups"); } - + @Override public Map getGroupInfo(String groupId) { - try { - String url = api + "/v1/groups/" + groupId; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/v1/groups/" + groupId); } - + @Override public Map getGroupItems(String zoteroGroupId) { - try { - String url = api + "/v1/groups/" + zoteroGroupId + "/items"; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/v1/groups/" + zoteroGroupId + "/items"); } - + @Override public Map getCollections(String zoteroGroupId) { - try { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections"; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/v1/groups/" + zoteroGroupId + "/collections"); } - + @Override public Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber) { - try { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; - if (pageNumber > 0) { - url += "?&page=" + pageNumber; - } - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; + String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; + if (pageNumber > 0) { + url += "?&page=" + pageNumber; } + return executeWithErrorHandling(url); } - + @Override public Map getCollectionItems(String zoteroGroupId, String collectionId) { return getCollectionItems(zoteroGroupId, collectionId, 0); } - + @Override public Map getItemInfo(String zoteroGroupId, String itemId) { - try { - String url = api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId); } - + @Override public Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId) { - try { - String url = api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"; - return executeCommand(url); - } catch (CitesphereTokenException e) { - Map errorMap = new HashMap<>(); - errorMap.put("error_message", e.getMessage()); - errorMap.put("token_expired", e.isTokenExpired()); - return errorMap; - } + return executeWithErrorHandling(api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"); } @Override From e09516ffaede9ce27776d4b784825c5e83ff10b9 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 11:52:11 -0700 Subject: [PATCH 25/31] [VSPC-189] PR comments --- .../web/staff/CitesphereController.java | 46 +++++++++++++------ vspace/src/main/resources/app.properties | 6 +-- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 42296085b..08c6bd168 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -21,6 +21,7 @@ import org.springframework.ui.Model; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.UnsupportedEncodingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -55,8 +56,8 @@ public class CitesphereController { // initiate oauth authorization with citesphere @RequestMapping(value = "/staff/citesphere/oauth/authorize", method = RequestMethod.GET) - public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttributes) { - + public String initiateOAuth(HttpServletRequest request, HttpSession session, RedirectAttributes redirectAttributes) { + if (citesphereClientId == null || citesphereClientId.isEmpty()) { logger.error("OAuth not configured - missing client ID"); redirectAttributes.addFlashAttribute("error", "Citesphere OAuth is not configured. Please contact your administrator."); @@ -70,11 +71,12 @@ public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttr // build authorization url String baseUrl = citesphereApiUrl; - String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; + String redirectUri = getCurrentBaseUrl(request) + "/staff/citesphere/oauth/callback"; - String authUrl = baseUrl + "/oauth/authorize" + + String authUrl = baseUrl + "/api/oauth/authorize" + "?response_type=code" + "&client_id=" + java.net.URLEncoder.encode(citesphereClientId, "UTF-8") + + "&scope=read" + "&state=" + java.net.URLEncoder.encode(state, "UTF-8") + "&redirect_uri=" + java.net.URLEncoder.encode(redirectUri, "UTF-8"); return "redirect:" + authUrl; @@ -90,21 +92,22 @@ public String initiateOAuth(HttpSession session, RedirectAttributes redirectAttr public String handleOAuthCallback( @RequestParam String code, @RequestParam String state, + HttpServletRequest request, HttpSession session, RedirectAttributes redirectAttributes) { - + try { // verify state parameter String sessionState = (String) session.getAttribute("citesphere_oauth_state"); - + if (sessionState == null || !sessionState.equals(state)) { logger.error("OAuth state validation failed"); redirectAttributes.addFlashAttribute("error", "Invalid OAuth state. Please try again."); return "redirect:/staff/dashboard"; } - + // exchange code for access token - String accessToken = exchangeCodeForToken(code, session); + String accessToken = exchangeCodeForToken(code, session, request); if (accessToken != null) { session.setAttribute("citesphere_access_token", accessToken); @@ -320,12 +323,12 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { } // exchange authorization code for access token - private String exchangeCodeForToken(String code, HttpSession session) { - + private String exchangeCodeForToken(String code, HttpSession session, HttpServletRequest httpRequest) { + try { OkHttpClient client = new OkHttpClient(); - String redirectUri = getCurrentBaseUrl() + "/staff/citesphere/oauth/callback"; - String tokenUrl = citesphereApiUrl + "oauth/token"; + String redirectUri = getCurrentBaseUrl(httpRequest) + "/staff/citesphere/oauth/callback"; + String tokenUrl = citesphereApiUrl + "/api/oauth/token"; okhttp3.RequestBody formBody = new FormBody.Builder() .add("grant_type", "authorization_code") @@ -372,8 +375,23 @@ private String exchangeCodeForToken(String code, HttpSession session) { } // get current base url for redirect uri - private String getCurrentBaseUrl() { - return appBaseUrl != null && !appBaseUrl.isEmpty() ? appBaseUrl : "http://localhost:8080"; + private String getCurrentBaseUrl(HttpServletRequest request) { + if (appBaseUrl != null && !appBaseUrl.isEmpty()) { + return appBaseUrl; + } + // Build URL dynamically from request + String scheme = request.getScheme(); + String serverName = request.getServerName(); + int serverPort = request.getServerPort(); + String contextPath = request.getContextPath(); + + StringBuilder url = new StringBuilder(); + url.append(scheme).append("://").append(serverName); + if ((scheme.equals("http") && serverPort != 80) || (scheme.equals("https") && serverPort != 443)) { + url.append(":").append(serverPort); + } + url.append(contextPath); + return url.toString(); } // check if api response indicates token expiry diff --git a/vspace/src/main/resources/app.properties b/vspace/src/main/resources/app.properties index 48e5ebf0e..de1666ef3 100644 --- a/vspace/src/main/resources/app.properties +++ b/vspace/src/main/resources/app.properties @@ -16,6 +16,6 @@ file_uploads_directory=${files.directory.path} hibernate_show_sql=${hibernate.show_sql} admin_username=${admin.username} -citesphere.api.url=${citesphere_api_url} -citesphere.client.id=${citesphere_client_id} -citesphere.client.secret=${citesphere_client_secret} \ No newline at end of file +citesphere.api.url=${citesphere.api.url} +citesphere.client.id=${citesphere.client.id} +citesphere.client.secret=${citesphere.client.secret} \ No newline at end of file From 29a6162efdd37217d6e5bd1438581e2523a9c56e Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 12:32:41 -0700 Subject: [PATCH 26/31] [VSPC-189] Fixed endpoints --- .../core/services/impl/CitesphereManager.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index 8b9ea1eaf..d8ee5eb5c 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -144,39 +144,39 @@ private Map executeWithErrorHandling(String url) { @Override public Map getUser() { - return executeWithErrorHandling(api + "/v1/user"); + return executeWithErrorHandling(api + "/api/v1/user"); } @Override public Map getDataByEndpoint(String endpoint) { - return executeWithErrorHandling(api + "/v1" + endpoint); + return executeWithErrorHandling(api + "/api/v1" + endpoint); } @Override public Map getGroups() { - return executeWithErrorHandling(api + "/v1/groups"); + return executeWithErrorHandling(api + "/api/v1/groups"); } @Override public Map getGroupInfo(String groupId) { - return executeWithErrorHandling(api + "/v1/groups/" + groupId); + return executeWithErrorHandling(api + "/api/v1/groups/" + groupId); } @Override public Map getGroupItems(String zoteroGroupId) { - return executeWithErrorHandling(api + "/v1/groups/" + zoteroGroupId + "/items"); + return executeWithErrorHandling(api + "/api/v1/groups/" + zoteroGroupId + "/items"); } @Override public Map getCollections(String zoteroGroupId) { - return executeWithErrorHandling(api + "/v1/groups/" + zoteroGroupId + "/collections"); + return executeWithErrorHandling(api + "/api/v1/groups/" + zoteroGroupId + "/collections"); } @Override public Map getCollectionItems(String zoteroGroupId, String collectionId, int pageNumber) { - String url = api + "/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; + String url = api + "/api/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/items"; if (pageNumber > 0) { - url += "?&page=" + pageNumber; + url += "?page=" + pageNumber; } return executeWithErrorHandling(url); } @@ -188,12 +188,12 @@ public Map getCollectionItems(String zoteroGroupId, String colle @Override public Map getItemInfo(String zoteroGroupId, String itemId) { - return executeWithErrorHandling(api + "/v1/groups/" + zoteroGroupId + "/items/" + itemId); + return executeWithErrorHandling(api + "/api/v1/groups/" + zoteroGroupId + "/items/" + itemId); } @Override public Map getCollectionsByCollectionId(String zoteroGroupId, String collectionId) { - return executeWithErrorHandling(api + "/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"); + return executeWithErrorHandling(api + "/api/v1/groups/" + zoteroGroupId + "/collections/" + collectionId + "/collections"); } @Override @@ -203,7 +203,7 @@ public CitesphereAuthToken refreshToken() throws CitesphereTokenException { } try { - String tokenUrl = api + "/oauth/token"; + String tokenUrl = api + "/api/oauth/token"; RequestBody formBody = new FormBody.Builder() .add("grant_type", "refresh_token") @@ -273,7 +273,7 @@ public boolean isTokenValid() { // Optionally, test token with a simple API call try { - String url = api + "/v1/test"; + String url = api + "/api/v1/test"; Request.Builder requestBuilder = new Request.Builder().url(url); if (authTokenObject.getHeaders() != null) { From e6df999f7ecf917a55857c4e33f47d4ed1231747 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 15:18:43 -0700 Subject: [PATCH 27/31] [VSPC-189] Fixed multiple --- .../views/staff/modules/slides/slide.html | 120 ++++++++++++------ 1 file changed, 79 insertions(+), 41 deletions(-) diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 58974f297..52bc0d515 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -3401,10 +3401,10 @@ type = itemData.itemType; } - // Use radio button instead of checkbox for single selection - var radioButton = $(''); - radioButton.data('item', item); - radioButton.attr('value', item.key || item.id || index); + // Use checkbox for multiple selection + var checkbox = $(''); + checkbox.data('item', item); + checkbox.attr('value', item.key || item.id || index); var itemElement = $('

' + '
' + @@ -3417,43 +3417,53 @@ '
' + '
'); - itemElement.find('div').first().prepend(radioButton); - + itemElement.find('div').first().prepend(checkbox); + // Add hover effects itemElement.hover( function() { $(this).css('background-color', '#f8f9fa'); }, - function() { - if (!radioButton.prop('checked')) { - $(this).css('background-color', 'white'); + function() { + if (!checkbox.prop('checked')) { + $(this).css('background-color', 'white'); } } ); - + // Handle selection - allow clicking on the whole item div itemElement.click(function(e) { - if (e.target.type !== 'radio') { - radioButton.prop('checked', true); - radioButton.trigger('change'); + if (e.target.type !== 'checkbox') { + checkbox.prop('checked', !checkbox.prop('checked')); + checkbox.trigger('change'); } }); - - // Handle radio button selection - radioButton.change(function() { - // Clear visual selection from all items - $('.reference-item').css({ - 'background-color': 'white', - 'border-color': '#ddd' - }); - - // Clear previous selection and set new one - citesphereData.selectedReferences = []; + + // Handle checkbox selection + checkbox.change(function() { if (this.checked) { - citesphereData.selectedReferences.push(item); + // Add to selected references if not already present + var itemKey = item.key || item.id; + var alreadySelected = citesphereData.selectedReferences.some(function(ref) { + return (ref.key || ref.id) === itemKey; + }); + if (!alreadySelected) { + citesphereData.selectedReferences.push(item); + } // Highlight selected item itemElement.css({ 'background-color': '#e3f2fd', 'border-color': '#2196f3' }); + } else { + // Remove from selected references + var itemKey = item.key || item.id; + citesphereData.selectedReferences = citesphereData.selectedReferences.filter(function(ref) { + return (ref.key || ref.id) !== itemKey; + }); + // Remove highlight + itemElement.css({ + 'background-color': 'white', + 'border-color': '#ddd' + }); } updateSelectedCount(); }); @@ -3509,12 +3519,34 @@ function updateSelectedCount() { var count = citesphereData.selectedReferences.length; if (count === 0) { - $('#selectedCountText').text('No reference selected'); - } else { + $('#selectedCountText').text('No references selected'); + } else if (count === 1) { $('#selectedCountText').text('1 reference selected'); + } else { + $('#selectedCountText').text(count + ' references selected'); } } + // Select All button handler + $(document).on('click', '#selectAllReferences', function() { + $('.citesphere-item-checkbox').each(function() { + if (!$(this).prop('checked')) { + $(this).prop('checked', true); + $(this).trigger('change'); + } + }); + }); + + // Deselect All button handler + $(document).on('click', '#deselectAllReferences', function() { + $('.citesphere-item-checkbox').each(function() { + if ($(this).prop('checked')) { + $(this).prop('checked', false); + $(this).trigger('change'); + } + }); + }); + // Handle search functionality $('#searchCitesphereBtn').click(function() { var searchTerm = $('#citesphereSearch').val().trim(); @@ -3541,17 +3573,12 @@ // Dedicated function to handle Citesphere import function handleCitesphereImport() { - + if (citesphereData.selectedReferences.length === 0) { - alert('Please select a reference to import.'); - return; - } - - if (citesphereData.selectedReferences.length > 1) { - alert('Please select only one reference at a time.'); + alert('Please select at least one reference to import.'); return; } - + // Continue with the import process performCitesphereImport(); } @@ -3672,10 +3699,12 @@ }, data: JSON.stringify(transformedReferences), success: function(response) { - + if (response.success) { - // Show success message instead of alert - showImportSuccessMessage('Bibliography imported successfully!'); + // Show success message with count + var count = response.imported_count || citesphereData.selectedReferences.length; + var message = count === 1 ? '1 reference imported successfully!' : count + ' references imported successfully!'; + showImportSuccessMessage(message); // Add the imported references to the bibliography block var biblioBlock = $('[data-biblio-id="' + biblioId + '"]').closest('[data-biblio-block]'); @@ -4466,18 +4495,27 @@
- Step 3: Select Reference to Import + Step 3: Select References to Import
+ +
+ + +
- +
- Selected: No reference selected + Selected: No references selected
From 49a6ece679a8aafb59efde2ed451a6339a38f130 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 15:19:41 -0700 Subject: [PATCH 28/31] [VSPC-189] Restored gitignore --- vspace/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vspace/.gitignore b/vspace/.gitignore index d507c0bee..926e0ae96 100644 --- a/vspace/.gitignore +++ b/vspace/.gitignore @@ -2,3 +2,6 @@ /Users/ /.settings/ .DS_Store +/target/ +.settings/ +**/.settings/ \ No newline at end of file From 8abe14b2e2abd592ca20db09a0eaaf03ff195eb5 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 15:21:05 -0700 Subject: [PATCH 29/31] [VSPC-189] Fixed correct gitignore --- .gitignore | 3 +++ vspace/.classpath | 14 ++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5afd379ca..95792fab4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ vspace/.factorypath vspace/.project vspace/.classpath +/target/ +.settings/ +**/.settings/ \ No newline at end of file diff --git a/vspace/.classpath b/vspace/.classpath index 3aa72561a..ea0786261 100644 --- a/vspace/.classpath +++ b/vspace/.classpath @@ -10,11 +10,13 @@ + + @@ -27,6 +29,7 @@ + @@ -34,19 +37,10 @@ - - - - - - - - - - \ No newline at end of file + From 979fe6fb7387113f4cca848eb049e508024206c3 Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 15:23:39 -0700 Subject: [PATCH 30/31] [VSPC-189] fixed gitignore and classpath final --- vspace/.classpath | 14 ++++++++++---- vspace/.gitignore | 5 +---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/vspace/.classpath b/vspace/.classpath index ea0786261..3aa72561a 100644 --- a/vspace/.classpath +++ b/vspace/.classpath @@ -10,13 +10,11 @@ - - @@ -29,7 +27,6 @@ - @@ -37,10 +34,19 @@ + + + + + + + + + - + \ No newline at end of file diff --git a/vspace/.gitignore b/vspace/.gitignore index 926e0ae96..1cdd434db 100644 --- a/vspace/.gitignore +++ b/vspace/.gitignore @@ -1,7 +1,4 @@ /target/ /Users/ /.settings/ -.DS_Store -/target/ -.settings/ -**/.settings/ \ No newline at end of file +.DS_Store \ No newline at end of file From c126f6ff7e35de83f004a795e4536747e854b79e Mon Sep 17 00:00:00 2001 From: Girik1105 Date: Fri, 16 Jan 2026 15:31:47 -0700 Subject: [PATCH 31/31] [VSPC-189] Removed all debug comments, improved comments --- .../core/services/impl/CitesphereManager.java | 2 - .../web/staff/CitesphereController.java | 24 +----- .../views/staff/modules/slides/slide.html | 83 +------------------ 3 files changed, 5 insertions(+), 104 deletions(-) diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java index d8ee5eb5c..a324a5570 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/CitesphereManager.java @@ -266,12 +266,10 @@ public boolean isTokenValid() { return false; } - // Check if token is expired based on stored expiry time if (authTokenObject.isTokenExpired()) { return false; } - // Optionally, test token with a simple API call try { String url = api + "/api/v1/test"; Request.Builder requestBuilder = new Request.Builder().url(url); diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java index 08c6bd168..69f140443 100644 --- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java +++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/CitesphereController.java @@ -54,7 +54,6 @@ public class CitesphereController { private IReferenceManager referenceManager; - // initiate oauth authorization with citesphere @RequestMapping(value = "/staff/citesphere/oauth/authorize", method = RequestMethod.GET) public String initiateOAuth(HttpServletRequest request, HttpSession session, RedirectAttributes redirectAttributes) { @@ -65,11 +64,8 @@ public String initiateOAuth(HttpServletRequest request, HttpSession session, Red } try { - // generate state parameter for security String state = java.util.UUID.randomUUID().toString(); session.setAttribute("citesphere_oauth_state", state); - - // build authorization url String baseUrl = citesphereApiUrl; String redirectUri = getCurrentBaseUrl(request) + "/staff/citesphere/oauth/callback"; @@ -87,7 +83,6 @@ public String initiateOAuth(HttpServletRequest request, HttpSession session, Red } } - // handle oauth callback from citesphere @RequestMapping(value = "/staff/citesphere/oauth/callback", method = RequestMethod.GET) public String handleOAuthCallback( @RequestParam String code, @@ -97,7 +92,6 @@ public String handleOAuthCallback( RedirectAttributes redirectAttributes) { try { - // verify state parameter String sessionState = (String) session.getAttribute("citesphere_oauth_state"); if (sessionState == null || !sessionState.equals(state)) { @@ -106,7 +100,6 @@ public String handleOAuthCallback( return "redirect:/staff/dashboard"; } - // exchange code for access token String accessToken = exchangeCodeForToken(code, session, request); if (accessToken != null) { @@ -120,7 +113,6 @@ public String handleOAuthCallback( logger.error("Error handling OAuth callback", e); redirectAttributes.addFlashAttribute("error", "OAuth authentication failed: " + e.getMessage()); } finally { - // clean up session session.removeAttribute("citesphere_oauth_state"); } @@ -137,7 +129,6 @@ public ResponseEntity> getGroups(HttpSession session) { ICitesphereManager citesphereManager = createCitesphereManager(session); Map groups = citesphereManager.getGroups(); - // check for token expiry in response if (isTokenExpiredResponse(groups)) { session.removeAttribute("citesphere_access_token"); session.removeAttribute("citesphere_refresh_token"); @@ -162,7 +153,6 @@ public ResponseEntity> getGroups(HttpSession session) { } } - // get collections for a specific group @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollections(@PathVariable String groupId, HttpSession session) { @@ -179,7 +169,6 @@ public ResponseEntity> getCollections(@PathVariable String g } } - // get items for a specific collection @RequestMapping(value = "/staff/citesphere/groups/{groupId}/collections/{collectionId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getCollectionItems( @@ -200,7 +189,6 @@ public ResponseEntity> getCollectionItems( } } - // get all items for a specific group @RequestMapping(value = "/staff/citesphere/groups/{groupId}/items", method = RequestMethod.GET) @ResponseBody public ResponseEntity> getGroupItems(@PathVariable String groupId, HttpSession session) { @@ -217,7 +205,6 @@ public ResponseEntity> getGroupItems(@PathVariable String gr } } - // import selected references from citesphere to bibliography @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/bibliography/{biblioId}/citesphere/import", method = RequestMethod.POST) @ResponseBody public ResponseEntity> importCitesphereReferences( @@ -306,7 +293,6 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { } catch (CitesphereTokenException e) { logger.error("Token refresh failed: {}", e.getMessage()); - // clear invalid tokens from session session.removeAttribute("citesphere_access_token"); session.removeAttribute("citesphere_refresh_token"); session.removeAttribute("citesphere_token_expiry"); @@ -316,13 +302,11 @@ private ICitesphereManager createCitesphereManager(HttpSession session) { return manager; } else { - // no authentication available logger.error("No access token available in session - authentication required"); throw new IllegalStateException("No Citesphere access token available. Please authenticate first."); } } - // exchange authorization code for access token private String exchangeCodeForToken(String code, HttpSession session, HttpServletRequest httpRequest) { try { @@ -374,12 +358,10 @@ private String exchangeCodeForToken(String code, HttpSession session, HttpServle return null; } - // get current base url for redirect uri private String getCurrentBaseUrl(HttpServletRequest request) { if (appBaseUrl != null && !appBaseUrl.isEmpty()) { return appBaseUrl; } - // Build URL dynamically from request String scheme = request.getScheme(); String serverName = request.getServerName(); int serverPort = request.getServerPort(); @@ -394,19 +376,16 @@ private String getCurrentBaseUrl(HttpServletRequest request) { return url.toString(); } - // check if api response indicates token expiry private boolean isTokenExpiredResponse(Map response) { if (response == null) { return false; } - // check for token_expired flag Boolean tokenExpired = (Boolean) response.get("token_expired"); if (Boolean.TRUE.equals(tokenExpired)) { return true; } - // check for error messages indicating token issues String errorMessage = (String) response.get("error_message"); if (errorMessage != null) { String lowerError = errorMessage.toLowerCase(); @@ -434,7 +413,7 @@ private String extractField(Map refData, String fieldName) { return ""; } - // extract creators (authors) from citesphere reference data + // extract authors from citesphere reference data @SuppressWarnings("unchecked") private String extractCreators(Map refData) { try { @@ -468,7 +447,6 @@ private String extractCreators(Map refData) { return ""; } - // extract year from citesphere reference data @SuppressWarnings("unchecked") private String extractYear(Map refData) { try { diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html index 52bc0d515..4a5dc79b7 100644 --- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html +++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html @@ -2992,12 +2992,9 @@ currentCollection: null }; - // Initialize Citesphere functionality when modal is shown $('#addReferenceAlert').on('shown.bs.modal', function () { - // Show/hide appropriate tab content and buttons based on active tab updateReferenceModalButtons(); - // If Citesphere tab is active, initialize step-by-step flow if ($('#citesphereRefTab').hasClass('active')) { initializeCitesphereSteps(); } @@ -3007,13 +3004,11 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { updateReferenceModalButtons(); - // Initialize Citesphere step-by-step flow when switching to tab if ($(e.target).attr('href') === '#citesphereRefTab') { initializeCitesphereSteps(); } }); - // Also trigger when tab link is clicked $(document).on('click', 'a[href="#citesphereRefTab"]', function() { setTimeout(function() { updateReferenceModalButtons(); @@ -3040,10 +3035,8 @@ } } - // Initialize the step-by-step Citesphere flow function initializeCitesphereSteps() { - // Reset step data citesphereData.currentStep = 'connection'; citesphereData.currentGroup = null; citesphereData.currentCollection = null; @@ -3053,18 +3046,16 @@ hideImportSuccessMessage(); $('.citesphere-step').hide(); - // Show a loading message first + // Show a loading message $('#connectionStatusContent').html( '
' + ' Checking Citesphere connection...' + '
' ); - // Check connection status and show appropriate step checkCitesphereConnection(); } - // Check if user is connected to Citesphere function checkCitesphereConnection() { var token = $('input[name="_csrf"]').attr('value'); @@ -3075,21 +3066,18 @@ 'X-CSRF-Token': token }, success: function(data) { - // Connected successfully showConnectionStatus(true); citesphereData.groups = data; citesphereData.currentStep = 'groups'; showStep1Groups(data); }, error: function(xhr, status, error) { - // Not connected or error showConnectionStatus(false); citesphereData.currentStep = 'connection'; } }); } - // Show import success message function showImportSuccessMessage(message) { var successContainer = $('#importSuccessStatus'); @@ -3101,18 +3089,15 @@ successContainer.show(); - // Auto-hide after 5 seconds setTimeout(function() { successContainer.fadeOut(); }, 5000); } - // Function to hide success message function hideImportSuccessMessage() { $('#importSuccessStatus').hide(); } - // Show connection status at the top function showConnectionStatus(isConnected) { var statusContainer = $('#connectionStatusContent'); @@ -3135,13 +3120,11 @@ } } - // Show Step 1: Groups function showStep1Groups(groupsData) { $('#step1-groups').show(); displayCitesphereGroups(groupsData); } - // Display groups in Step 1 function displayCitesphereGroups(groupsData) { var groupsContainer = $('#citesphereGroups'); groupsContainer.empty(); @@ -3163,7 +3146,6 @@ '' + ''); - // Hover effect groupElement.hover( function() { $(this).css('background', '#e3f2fd'); }, function() { $(this).css('background', '#f8f9fa'); } @@ -3178,23 +3160,20 @@ }); } - // Show Step 2: Collections function showStep2Collections(group) { $('#step1-groups').hide(); $('#step2-collections').show(); $('#currentGroupName').text('Group: ' + (group.name || 'Unnamed Group')); citesphereData.currentStep = 'collections'; - // Show loading message $('#citesphereCollections').html('
Loading collections...
'); - // Extract group ID - try multiple possible fields + // Extract group ID var groupId = group.zoteroGroupId || group.id || group.groupId || group.key; loadGroupCollections(groupId, group.name); } - // Load collections for a specific group function loadGroupCollections(groupId, groupName) { var token = $('input[name="_csrf"]').attr('value'); @@ -3213,12 +3192,10 @@ }); } - // Display collections for a group in Step 2 function displayCollections(collectionsData, groupId, groupName) { var collectionsContainer = $('#citesphereCollections'); collectionsContainer.empty(); - // Handle both possible response structures: {data: []} or {collections: []} var collections = collectionsData.collections || collectionsData.data || []; if (!collections || !Array.isArray(collections) || collections.length === 0) { @@ -3228,7 +3205,6 @@ collections.forEach(function(collection) { - // Extract collection name and key from different possible structures var collectionName = collection.name || (collection.data && collection.data.name) || 'Unnamed Collection'; var collectionKey = collection.key || (collection.data && collection.data.key) || collection.id; @@ -3242,7 +3218,6 @@ '' + ''); - // Hover effect collectionElement.hover( function() { $(this).css('background', '#e3f2fd'); }, function() { $(this).css('background', '#f8f9fa'); } @@ -3257,7 +3232,6 @@ }); } - // Show Step 3: References function showStep3References(groupId, collectionId, collectionName) { $('#step2-collections').hide(); $('#step3-references').show(); @@ -3270,7 +3244,6 @@ loadCollectionItems(groupId, collectionId, collectionName); } - // Navigation handlers $(document).on('click', '#backToGroups', function() { $('#step2-collections').hide(); $('#step1-groups').show(); @@ -3287,7 +3260,6 @@ updateSelectedCount(); }); - // Load items from a specific collection function loadCollectionItems(groupId, collectionId, collectionName) { var token = $('input[name="_csrf"]').attr('value'); @@ -3306,7 +3278,6 @@ }); } - // Display individual references/items function displayIndividualItems(itemsData, title) { var referencesContainer = $('#citesphereReferences'); referencesContainer.empty(); @@ -3314,10 +3285,8 @@ var titleElement = $('
' + title + '
'); referencesContainer.append(titleElement); - // Handle both possible response structures: {data: []} or direct array or {items: []} var items = itemsData.items || itemsData.data || itemsData || []; - // If itemsData is directly an array, use it if (Array.isArray(itemsData)) { items = itemsData; } @@ -3329,19 +3298,15 @@ items.forEach(function(item, index) { - // Extract item data - try both direct properties and nested data structure var itemData = item.data || item; - // Better title extraction - handle empty or missing titles var title = item.title || itemData.title || item.referenceString || 'Untitled Reference'; if (title.trim() === '') { title = 'Untitled Reference'; } - // Better author extraction - handle the complex authors array structure var author = ''; if (item.authors && Array.isArray(item.authors) && item.authors.length > 0) { - // Take the first few authors and format them properly var displayAuthors = item.authors.slice(0, 3).map(function(auth) { var firstName = (auth.firstName || '').trim(); var lastName = (auth.lastName || '').trim(); @@ -3366,12 +3331,10 @@ } } - // Fallback to other author fields if authors array didn't work if (!author) { author = item.authorString || extractAuthorsFromItem(itemData) || item.author || 'Unknown Author'; } - // Better year extraction var year = ''; if (item.date) { var match = item.date.match(/(\d{4})/); @@ -3385,7 +3348,6 @@ year = item.year || extractYearFromItem(itemData) || ''; } - // Better type extraction var type = 'Reference'; if (item.itemType) { switch(item.itemType) { @@ -3401,7 +3363,6 @@ type = itemData.itemType; } - // Use checkbox for multiple selection var checkbox = $(''); checkbox.data('item', item); checkbox.attr('value', item.key || item.id || index); @@ -3419,7 +3380,6 @@ itemElement.find('div').first().prepend(checkbox); - // Add hover effects itemElement.hover( function() { $(this).css('background-color', '#f8f9fa'); }, function() { @@ -3429,7 +3389,6 @@ } ); - // Handle selection - allow clicking on the whole item div itemElement.click(function(e) { if (e.target.type !== 'checkbox') { checkbox.prop('checked', !checkbox.prop('checked')); @@ -3437,10 +3396,8 @@ } }); - // Handle checkbox selection checkbox.change(function() { if (this.checked) { - // Add to selected references if not already present var itemKey = item.key || item.id; var alreadySelected = citesphereData.selectedReferences.some(function(ref) { return (ref.key || ref.id) === itemKey; @@ -3448,18 +3405,15 @@ if (!alreadySelected) { citesphereData.selectedReferences.push(item); } - // Highlight selected item itemElement.css({ 'background-color': '#e3f2fd', 'border-color': '#2196f3' }); } else { - // Remove from selected references var itemKey = item.key || item.id; citesphereData.selectedReferences = citesphereData.selectedReferences.filter(function(ref) { return (ref.key || ref.id) !== itemKey; }); - // Remove highlight itemElement.css({ 'background-color': 'white', 'border-color': '#ddd' @@ -3472,9 +3426,7 @@ }); } - // Helper function to extract authors from Citesphere item function extractAuthorsFromItem(itemData) { - // Handle different author field structures if (itemData.authorString) { return itemData.authorString; } @@ -3500,9 +3452,7 @@ return 'Unknown Author'; } - // Helper function to extract year from Citesphere item function extractYearFromItem(itemData) { - // Handle different year field structures if (itemData.year) { return itemData.year; } @@ -3515,7 +3465,6 @@ return ''; } - // Update selected count display function updateSelectedCount() { var count = citesphereData.selectedReferences.length; if (count === 0) { @@ -3527,7 +3476,6 @@ } } - // Select All button handler $(document).on('click', '#selectAllReferences', function() { $('.citesphere-item-checkbox').each(function() { if (!$(this).prop('checked')) { @@ -3537,7 +3485,6 @@ }); }); - // Deselect All button handler $(document).on('click', '#deselectAllReferences', function() { $('.citesphere-item-checkbox').each(function() { if ($(this).prop('checked')) { @@ -3547,11 +3494,9 @@ }); }); - // Handle search functionality $('#searchCitesphereBtn').click(function() { var searchTerm = $('#citesphereSearch').val().trim(); if (searchTerm) { - // For now, just show an informative message since Citesphere API doesn't have search endpoint yet $('#citesphereReferences').html( '
' + '
Search Not Available
' + @@ -3559,19 +3504,16 @@ '
' ); } else { - // Reload current view loadCitesphereGroups(); } }); - // Allow search on Enter key $('#citesphereSearch').keypress(function(e) { if (e.which === 13) { $('#searchCitesphereBtn').click(); } }); - // Dedicated function to handle Citesphere import function handleCitesphereImport() { if (citesphereData.selectedReferences.length === 0) { @@ -3579,11 +3521,9 @@ return; } - // Continue with the import process performCitesphereImport(); } - // Function to perform the actual import function performCitesphereImport() { var biblioId = $('#addReferenceTarget').val(); if (!biblioId) { @@ -3592,10 +3532,8 @@ } - // Transform the data to match the expected backend format var transformedReferences = citesphereData.selectedReferences.map(function(item) { - // Extract creators from the authors array or fallback to authorString var creators = []; if (item.authors && Array.isArray(item.authors)) { @@ -3607,7 +3545,6 @@ }; }); } else if (item.authorString) { - // Fallback to authorString parsing var authors = item.authorString.split(';'); creators = authors.map(function(author) { var trimmedAuthor = author.trim(); @@ -3628,7 +3565,6 @@ }); } - // Extract date from various possible fields var dateValue = ''; if (item.date) { dateValue = item.date; @@ -3638,8 +3574,7 @@ dateValue = item.year; } - // Map itemType from Citesphere to Zotero format - var itemType = 'journalArticle'; // default + var itemType = 'journalArticle'; // Default to journal article if (item.itemType) { switch(item.itemType) { case 'JOURNAL_ARTICLE': itemType = 'journalArticle'; break; @@ -3652,7 +3587,6 @@ itemType = item['@type']; } - // Create the nested data structure expected by the backend var transformedItem = { data: { @@ -3701,19 +3635,16 @@ success: function(response) { if (response.success) { - // Show success message with count var count = response.imported_count || citesphereData.selectedReferences.length; var message = count === 1 ? '1 reference imported successfully!' : count + ' references imported successfully!'; showImportSuccessMessage(message); - // Add the imported references to the bibliography block var biblioBlock = $('[data-biblio-id="' + biblioId + '"]').closest('[data-biblio-block]'); var referenceSpace = biblioBlock.find('#referenceSpace'); if (response.references && Array.isArray(response.references)) { response.references.forEach(function(ref, index) { - // Use the same format as existing references in the application var referenceHtml = '
' + '

' + 'Reference Title: ' + (ref.title || 'NO TITLE') + ', ' + @@ -3754,30 +3685,24 @@ }); } - // Handle importing selected reference (jQuery event handler for compatibility) $('#submitCitesphereReferences').click(function() { handleCitesphereImport(); }); - // Clear Citesphere data when modal is hidden $('#addReferenceAlert').on('hidden.bs.modal', function () { - // Reset Citesphere data citesphereData.selectedReferences = []; citesphereData.currentStep = 'connection'; citesphereData.currentGroup = null; citesphereData.currentCollection = null; updateSelectedCount(); - // Hide success message hideImportSuccessMessage(); - // Clear all containers $('#citesphereGroups').empty(); $('#citesphereCollections').empty(); $('#citesphereReferences').empty(); $('#connectionStatusContent').empty(); - // Hide all steps $('.citesphere-step').hide(); }); @@ -4486,7 +4411,7 @@