Skip to content

Commit

Permalink
fix: refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@sattvikc
sattvikc committed Sep 9, 2024
1 parent 1eddb69 commit 84fda3f
Show file tree
Hide file tree
Showing 17 changed files with 856 additions and 825 deletions.
9 changes: 7 additions & 2 deletions src/main/java/io/supertokens/oauth/OAuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,13 @@ public static HttpRequest.Response handleOAuthProxyFormPOST(Main main, AppIdenti
formFields = Transformations.transformFormFieldsForHydra(formFields);
headers = Transformations.transformRequestHeadersForHydra(headers);

String publicOAuthProviderServiceUrl = Config.getConfig(appIdentifier.getAsPublicTenantIdentifier(), main).getOAuthProviderPublicServiceUrl();
String fullUrl = publicOAuthProviderServiceUrl + path;
String baseURL;
if (proxyToAdmin) {
baseURL = Config.getConfig(appIdentifier.getAsPublicTenantIdentifier(), main).getOAuthProviderAdminServiceUrl();
} else {
baseURL = Config.getConfig(appIdentifier.getAsPublicTenantIdentifier(), main).getOAuthProviderPublicServiceUrl();
}
String fullUrl = baseURL + path;

HttpRequest.Response response = HttpRequest.doFormPost(fullUrl, headers, formFields);

Expand Down
211 changes: 112 additions & 99 deletions src/main/java/io/supertokens/webserver/api/oauth/CreateUpdateOrGetOAuthClientAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.google.gson.JsonElement;
Expand All @@ -33,146 +32,160 @@
import io.supertokens.oauth.OAuth;
import io.supertokens.oauth.exceptions.OAuthAPIException;
import io.supertokens.oauth.exceptions.OAuthClientNotFoundException;
import io.supertokens.pluginInterface.RECIPE_ID;
import io.supertokens.pluginInterface.exceptions.InvalidConfigException;
import io.supertokens.pluginInterface.exceptions.StorageQueryException;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.pluginInterface.oauth.exceptions.OAuth2ClientAlreadyExistsForAppException;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

public class CreateUpdateOrGetOAuthClientAPI extends OAuthProxyBase {
public class CreateUpdateOrGetOAuthClientAPI extends WebserverAPI {
@Override
public String getPath() {
return "/recipe/oauth/clients";
}

public CreateUpdateOrGetOAuthClientAPI(Main main){
super(main);
super(main, RECIPE_ID.OAUTH.toString());
}

@Override
public ProxyProps[] getProxyProperties(HttpServletRequest req, JsonObject input) throws ServletException {
String clientId = "";

if (req.getMethod().equals("GET")) {
clientId = InputParser.getQueryParamOrThrowError(req, "clientId", false);
} else if (req.getMethod().equals("PUT")) {
clientId = InputParser.parseStringOrThrowError(input, "clientId", false);
}

return new ProxyProps[] {
new ProxyProps(
"GET", // apiMethod
"GET", // method
"/admin/clients/" + clientId, // path
true, // proxyToAdmin
true // camelToSnakeCaseConversion
),
new ProxyProps(
"POST", // apiMethod
"POST_JSON", // method
"/admin/clients", // path
true, // proxyToAdmin
true // camelToSnakeCaseConversion
),
new ProxyProps(
"PUT", // apiMethod
"PUT_JSON", // method
"/admin/clients/" + clientId, // path
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
String clientId = InputParser.getQueryParamOrThrowError(req, "clientId", false);

try {
OAuthProxyHelper.proxyGET(
main, req, resp,
getAppIdentifier(req),
enforcePublicTenantAndGetPublicTenantStorage(req),
"/admin/clients/" + clientId, // proxyPath
true, // proxyToAdmin
true // camelToSnakeCaseConversion
)
};
}

@Override
protected Map<String, String> getQueryParamsForProxy(HttpServletRequest req, JsonObject input) throws IOException, ServletException {
Map<String, String> queryParams = new HashMap<>();

String queryString = req.getQueryString();
if (queryString != null) {
String[] queryParamsParts = queryString.split("&");
for (String queryParam : queryParamsParts) {
String[] keyValue = queryParam.split("=");
if (keyValue.length == 2) {
queryParams.put(keyValue[0], URLDecoder.decode(keyValue[1], StandardCharsets.UTF_8));
true, // camelToSnakeCaseConversion
() -> { // getQueryParamsForProxy
Map<String, String> queryParams = new HashMap<>();

String queryString = req.getQueryString();
if (queryString != null) {
String[] queryParamsParts = queryString.split("&");
for (String queryParam : queryParamsParts) {
String[] keyValue = queryParam.split("=");
if (keyValue.length == 2) {
queryParams.put(keyValue[0], URLDecoder.decode(keyValue[1], StandardCharsets.UTF_8));
}
}
}

return queryParams;
},
() -> { // getHeadersForProxy
return new HashMap<>();
},
(statusCode, headers, rawBody, jsonBody) -> { // handleResponse
this.sendJsonResponse(200, jsonBody, resp);
}
}
);
} catch (IOException | TenantOrAppNotFoundException | BadPermissionException e) {
throw new ServletException(e);
}

return queryParams;
}

@Override
protected JsonObject getJsonBodyForProxyPOST(HttpServletRequest req, JsonObject input)
throws IOException, ServletException {
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
JsonObject input = InputParser.parseJsonObjectOrThrowError(req);

// Defaults that we require
input.addProperty("accessTokenStrategy", "jwt");
input.addProperty("skipConsent", true);
input.addProperty("subjectType", "public");

return input;
}

@Override
protected JsonObject getJsonBodyForProxyPUT(HttpServletRequest req, JsonObject input)
throws IOException, ServletException {
// fetch existing config and the apply input on top of it
String clientId = input.get("clientId").getAsString();

try {
Map<String, String> queryParams = new HashMap<>();
queryParams.put("client_id", clientId);
HttpRequest.Response response = OAuth.handleOAuthProxyGET(
main,
OAuthProxyHelper.proxyJsonPOST(
main, req, resp,
getAppIdentifier(req),
enforcePublicTenantAndGetPublicTenantStorage(req),
"/admin/clients/" + clientId,
true, queryParams, null);

JsonObject existingConfig = response.jsonResponse.getAsJsonObject();
existingConfig = OAuth.convertSnakeCaseToCamelCaseRecursively(existingConfig).getAsJsonObject();
for (Map.Entry<String, JsonElement> entry : existingConfig.entrySet()) {
String key = entry.getKey();
if (!input.has(key)) {
input.add(key, entry.getValue());
"/admin/clients", // proxyPath
true, // proxyToAdmin
true, // camelToSnakeCaseConversion
() -> { // getJsonBody
return input;
},
() -> { // getHeadersForProxy
return new HashMap<>();
},
(statusCode, headers, rawBody, jsonBody) -> { // handleResponse
String clientId = jsonBody.getAsJsonObject().get("clientId").getAsString();

try {
OAuth.addClientId(main, getAppIdentifier(req), enforcePublicTenantAndGetPublicTenantStorage(req), clientId);
} catch (StorageQueryException | TenantOrAppNotFoundException | BadPermissionException e) {
throw new ServletException(e);
} catch (OAuth2ClientAlreadyExistsForAppException e) {
// ignore
}
this.sendJsonResponse(200, jsonBody, resp);
}
}
} catch (StorageQueryException | TenantOrAppNotFoundException | FeatureNotEnabledException | InvalidConfigException | BadPermissionException e) {
);
} catch (IOException | TenantOrAppNotFoundException | BadPermissionException e) {
throw new ServletException(e);
} catch (OAuthClientNotFoundException | OAuthAPIException e) {
// ignore since the PUT API will throw one of this error later on
}

return input;
}

@Override
protected void handleResponseFromProxyGET(HttpServletRequest req, HttpServletResponse resp, int statusCode,
Map<String, List<String>> headers, String rawBody, JsonElement jsonBody)
throws IOException, ServletException {
this.sendJsonResponse(200, jsonBody, resp);
}

@Override
protected void handleResponseFromProxyPOST(HttpServletRequest req, HttpServletResponse resp, JsonObject input, int statusCode, Map<String, List<String>> headers, String rawBody, JsonElement jsonBody) throws IOException, ServletException {
String clientId = jsonBody.getAsJsonObject().get("clientId").getAsString();
protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
JsonObject input = InputParser.parseJsonObjectOrThrowError(req);
String clientId = InputParser.parseStringOrThrowError(input, "clientId", false);

try {
OAuth.addClientId(main, getAppIdentifier(req), enforcePublicTenantAndGetPublicTenantStorage(req), clientId);
} catch (StorageQueryException | TenantOrAppNotFoundException | BadPermissionException e) {
OAuthProxyHelper.proxyJsonPUT(
main, req, resp,
getAppIdentifier(req),
enforcePublicTenantAndGetPublicTenantStorage(req),
"/admin/clients/" + clientId,
true, // proxyToAdmin
true, // camelToSnakeCaseConversion
() -> { // getJsonBody
return new HashMap<>();
},
() -> { // getHeadersForProxy
try {
Map<String, String> queryParams = new HashMap<>();
queryParams.put("client_id", clientId);
HttpRequest.Response response = OAuth.handleOAuthProxyGET(
main,
getAppIdentifier(req),
enforcePublicTenantAndGetPublicTenantStorage(req),
"/admin/clients/" + clientId,
true, queryParams, null);

JsonObject existingConfig = response.jsonResponse.getAsJsonObject();
existingConfig = OAuth.convertSnakeCaseToCamelCaseRecursively(existingConfig).getAsJsonObject();
for (Map.Entry<String, JsonElement> entry : existingConfig.entrySet()) {
String key = entry.getKey();
if (!input.has(key)) {
input.add(key, entry.getValue());
}
}
} catch (StorageQueryException | TenantOrAppNotFoundException | FeatureNotEnabledException | InvalidConfigException | BadPermissionException e) {
throw new ServletException(e);
} catch (OAuthClientNotFoundException | OAuthAPIException e) {
// ignore since the PUT API will throw one of this error later on
}

return input;
},
() -> { // getHeadersForProxy
return new HashMap<>();
},
(statusCode, headers, rawBody, jsonBody) -> { // handleResponse
this.sendJsonResponse(200, jsonBody, resp);
}
);
} catch (IOException | TenantOrAppNotFoundException | BadPermissionException e) {
throw new ServletException(e);
} catch (OAuth2ClientAlreadyExistsForAppException e) {
// ignore
}
this.sendJsonResponse(200, jsonBody, resp);
}

@Override
protected void handleResponseFromProxyPUT(HttpServletRequest req, HttpServletResponse resp, JsonObject input, int statusCode, Map<String, List<String>> headers, String rawBody, JsonElement jsonBody) throws IOException, ServletException {
this.sendJsonResponse(200, jsonBody, resp);
}
}
52 changes: 32 additions & 20 deletions src/main/java/io/supertokens/webserver/api/oauth/OAuthAcceptAuthConsentRequestAPI.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
package io.supertokens.webserver.api.oauth;

import java.io.IOException;
import java.util.List;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;

import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import io.supertokens.Main;
import io.supertokens.multitenancy.exception.BadPermissionException;
import io.supertokens.pluginInterface.RECIPE_ID;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

public class OAuthAcceptAuthConsentRequestAPI extends OAuthProxyBase {
public class OAuthAcceptAuthConsentRequestAPI extends WebserverAPI {

public OAuthAcceptAuthConsentRequestAPI(Main main) {
super(main);
super(main, RECIPE_ID.OAUTH.toString());
}

@Override
Expand All @@ -24,22 +30,28 @@ public String getPath() {
}

@Override
public ProxyProps[] getProxyProperties(HttpServletRequest req, JsonObject input) {
return new ProxyProps[] {
new ProxyProps(
"PUT", // apiMethod
"PUT_JSON", // method
"/admin/oauth2/auth/requests/consent/accept", // path
protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
JsonObject input = InputParser.parseJsonObjectOrThrowError(req);

try {
OAuthProxyHelper.proxyJsonPUT(
main, req, resp,
getAppIdentifier(req),
enforcePublicTenantAndGetPublicTenantStorage(req),
"/admin/oauth2/auth/requests/consent/accept", // proxyPath
true, // proxyToAdmin
true // camelToSnakeCaseConversion
)
};
}

@Override
protected void handleResponseFromProxyPUT(HttpServletRequest req, HttpServletResponse resp, JsonObject input, int statusCode, Map<String, List<String>> headers, String rawBody, JsonElement jsonBody) throws IOException, ServletException {
JsonObject response = jsonBody.getAsJsonObject();
response.addProperty("status", "OK");
sendJsonResponse(200, response, resp);
true, // camelToSnakeCaseConversion
() -> OAuthProxyHelper.defaultGetQueryParamsFromRequest(req),
() -> input, // getJsonBody
HashMap::new, // getHeadersForProxy
(statusCode, headers, rawBody, jsonBody) -> { // handleResponse
JsonObject response = jsonBody.getAsJsonObject();
response.addProperty("status", "OK");
sendJsonResponse(200, response, resp);
}
);
} catch (IOException | TenantOrAppNotFoundException | BadPermissionException e) {
throw new ServletException(e);
}
}
}
Loading

0 comments on commit 84fda3f

Please sign in to comment.