Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retrieve attributes from directory search basic API #12

Merged
merged 1 commit into from
Aug 14, 2024
Merged

Retrieve attributes from directory search basic API #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/ueberauth/strategy/nusso/api.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ defmodule Ueberauth.Strategy.NuSSO.API do

@doc "Returns the URL to the NuSSO server's login page"
def login_url(callback) do
with {:ok, response} <- get("get-ldap-redirect-url", goto: callback) do
with {:ok, response} <- get("/agentless-websso/get-ldap-redirect-url", goto: callback) do
response |> Map.get(:redirecturl)
end
end

@doc "Redeem an NuSSO SSO Token for the user attributes"
def redeem_token(token) do
case get("validateWebSSOToken", webssotoken: token) do
case get("/agentless-websso/validateWebSSOToken", webssotoken: token) do
{:ok, %{netid: netid}} ->
if settings(:include_attributes, false),
do: get_directory_attributes(token, %{uid: netid}),
do: get_directory_attributes(%{uid: netid}, token),
else: {:ok, %{uid: netid}}

other ->
Expand All @@ -41,9 +41,9 @@ defmodule Ueberauth.Strategy.NuSSO.API do

defp consumer_key, do: settings(:consumer_key)

defp get_directory_attributes(token, extra) do
defp get_directory_attributes(%{uid: uid} = extra, token) do
response =
case get("validate-with-directory-search-response", webssotoken: token) do
case get("/directory-search/res/netid/bas/#{uid}", webssotoken: token) do
{:ok, response} -> response
_ -> %{results: []}
end
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule UeberauthOpenam.MixProject do
use Mix.Project

@version "2.0.0"
@version "2.1.0"
@url "https://github.com/nulib/ueberauth_nusso"

def project do
Expand Down
8 changes: 4 additions & 4 deletions test/support/mock_endpoint.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Ueberauth.NuSSO.MockEndpoint do
"""

@behaviour HTTPoison.Base
@base_url "https://test.example.edu/agentless-websso"
@base_url "https://test.example.edu"
@non_json_response """
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
Expand All @@ -13,20 +13,20 @@ defmodule Ueberauth.NuSSO.MockEndpoint do
"""
@redirecturl "https://test-nusso.example.edu/nusso/XUI/?#login&realm=test&authIndexType=service&service=ldap-registry"

def get("#{@base_url}/get-ldap-redirect-url", headers) do
def get("#{@base_url}/agentless-websso/get-ldap-redirect-url", headers) do
with goto <- headers |> Enum.into(%{}) |> Map.get("goto"),
url <- [@redirecturl, "goto=#{goto}"] |> Enum.join("&") do
send_headers(headers)
http_response(%{redirecturl: url})
end
end

def get("#{@base_url}/validateWebSSOToken", headers) do
def get("#{@base_url}/agentless-websso/validateWebSSOToken", headers) do
send_headers(headers)
headers |> Enum.into(%{}) |> get_in(["webssotoken"]) |> validate_response()
end

def get("#{@base_url}/validate-with-directory-search-response", headers) do
def get("#{@base_url}/directory-search/res/netid/bas/" <> _uid, headers) do
send_headers(headers)
headers |> Enum.into(%{}) |> get_in(["webssotoken"]) |> directory_search_response()
end
Expand Down
Loading