From 8b67d062721ce65e8bbc4643da4cf351d0759229 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 21 Sep 2022 14:29:23 -0700 Subject: [PATCH] modify sso queries for schema change --- controller/PostgreSQL.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index ffe9b0f1f..eb4c8c1e2 100644 --- a/controller/PostgreSQL.cpp +++ b/controller/PostgreSQL.cpp @@ -442,9 +442,13 @@ AuthInfo PostgreSQL::getSSOAuthInfo(const nlohmann::json &member, const std::str exit(7); } - r = w.exec_params("SELECT org.client_id, org.authorization_endpoint, org.issuer, org.sso_impl_version " - "FROM ztc_network AS nw, ztc_org AS org " - "WHERE nw.id = $1 AND nw.sso_enabled = true AND org.owner_id = nw.owner_id", networkId); + r = w.exec_params("SELECT oc.client_id, oc.authorization_endpoint, oc.issuer, oc.sso_impl_version " + "FROM ztc_network n " + "INNER JOIN ztc_network_oidc_config noc " + " ON noc.network_id = n.id " + "INNER JOIN ztc_oidc_config oc " + " ON noc.client_id = oc.client_id " + "WHERE n.id = $1 AND n.sso_enabled = true", networkId); std::string client_id = ""; std::string authorization_endpoint = "";