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

[BUGFIX] [MER-2591] Update Canvas JSON for new integrations #4338

Merged
merged 2 commits into from
Oct 22, 2023
Merged

[BUGFIX] [MER-2591] Update Canvas JSON for new integrations #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0808da
[MER-2591] Update Canvas JSON config to disable Torus by default and …
gastonabella Oct 20, 2023
9296d47
[MER-2591] Update tests
gastonabella Oct 20, 2023
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
23 changes: 9 additions & 14 deletions lib/oli_web/controllers/lti_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,12 @@ defmodule OliWeb.LtiController do
"placement" => "assignment_selection",
"message_type" => "LtiResourceLinkRequest"
},
case Map.get(params, "course_navigation_default") do
"disabled" ->
%{
"default" => "disabled",
"placement" => "course_navigation",
"message_type" => "LtiResourceLinkRequest"
}

_ ->
%{
"placement" => "course_navigation",
"message_type" => "LtiResourceLinkRequest"
}
end
%{
"placement" => "course_navigation",
"message_type" => "LtiResourceLinkRequest",
"default" => get_course_navigation_default(params),
"windowTarget" => "_blank"
}
## TODO: add support for more placement types in the future, possibly configurable by LMS admin
# assignment_selection when we support deep linking
# %{
Expand Down Expand Up @@ -232,6 +224,9 @@ defmodule OliWeb.LtiController do
|> json(developer_key_config)
end

defp get_course_navigation_default(%{"course_navigation_default" => "enabled"}), do: "enabled"
defp get_course_navigation_default(_params), do: "disabled"

def jwks(conn, _params) do
conn
|> json(Lti_1p3.get_all_public_keys())
Expand Down
14 changes: 10 additions & 4 deletions test/oli_web/controllers/lti_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,12 @@ defmodule OliWeb.LtiControllerTest do
"message_type" => "LtiResourceLinkRequest",
"placement" => "assignment_selection"
},
%{"message_type" => "LtiResourceLinkRequest", "placement" => "course_navigation"}
%{
"message_type" => "LtiResourceLinkRequest",
"placement" => "course_navigation",
"default" => "disabled",
"windowTarget" => "_blank"
}
]

assert json_response(conn, 200) |> Map.get("public_jwk") |> Map.get("kid") ==
Expand All @@ -483,11 +488,11 @@ defmodule OliWeb.LtiControllerTest do
assert json_response(conn, 200) |> Map.get("public_jwk") |> Map.get("n") == public_jwk["n"]
end

test "returns developer key json with course navigation disabled", %{conn: conn} do
test "returns developer key json with course navigation enabled", %{conn: conn} do
conn =
get(
conn,
Routes.lti_path(conn, :developer_key_json, course_navigation_default: "disabled")
Routes.lti_path(conn, :developer_key_json, course_navigation_default: "enabled")
)

%{"extensions" => [%{"settings" => %{"placements" => placements}} | _]} =
Expand All @@ -506,7 +511,8 @@ defmodule OliWeb.LtiControllerTest do
%{
"message_type" => "LtiResourceLinkRequest",
"placement" => "course_navigation",
"default" => "disabled"
"default" => "enabled",
"windowTarget" => "_blank"
}
]
end
Expand Down