Skip to content

Let Sawyer handle the base URL #29

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

Open
frankywahl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Let Sawyer handle the base URL #29

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
4 changes: 2 additions & 2 deletions lib/oktakit/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def request(method, path, data:, query:, headers:, accept:, content_type:, pagin
options[:headers][:accept] = accept if accept
options[:headers][:content_type] = content_type if content_type

uri = URI::DEFAULT_PARSER.escape("/api/v1" + path.to_s)
uri = URI::DEFAULT_PARSER.escape(path.to_s)
@last_response = resp = sawyer_agent.call(method, uri, data, options)

response = [resp.data, resp.status]
Expand All @@ -196,7 +196,7 @@ def sawyer_options
def absolute_to_relative_url(next_ref)
return unless next_ref

next_ref.href.sub(api_endpoint, '')
next_ref.href.sub(api_endpoint + '/', '')
end
end
end
18 changes: 9 additions & 9 deletions lib/oktakit/client/admin_roles.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module AdminRoles
# @example
# Oktakit.list_roles_assigned_to_user('id')
def list_roles_assigned_to_user(id, options = {})
get("/users/#{id}/roles", options)
get("users/#{id}/roles", options)
end

# Assign Role to User
Expand All @@ -30,7 +30,7 @@ def list_roles_assigned_to_user(id, options = {})
# @example
# Oktakit.assign_role_to_user('id')
def assign_role_to_user(id, options = {})
post("/users/#{id}/roles", options)
post("users/#{id}/roles", options)
end

# Unassign Role from User
Expand All @@ -47,7 +47,7 @@ def assign_role_to_user(id, options = {})
# @example
# Oktakit.unassign_role_from_user('user_id', 'role_id')
def unassign_role_from_user(user_id, role_id, options = {})
delete("/users/#{user_id}/roles/#{role_id}", options)
delete("users/#{user_id}/roles/#{role_id}", options)
end

# List Group Targets for User Admin Role
Expand All @@ -64,7 +64,7 @@ def unassign_role_from_user(user_id, role_id, options = {})
# @example
# Oktakit.list_group_targets_for_user_admin_role('user_id', 'role_id')
def list_group_targets_for_user_admin_role(user_id, role_id, options = {})
get("/users/#{user_id}/roles/#{role_id}/targets/groups", options)
get("users/#{user_id}/roles/#{role_id}/targets/groups", options)
end

# Add Group Target to User Admin Role
Expand All @@ -82,7 +82,7 @@ def list_group_targets_for_user_admin_role(user_id, role_id, options = {})
# @example
# Oktakit.add_group_target_to_user_admin_role('group_id', 'user_id', 'role_id')
def add_group_target_to_user_admin_role(user_id, role_id, group_id, options = {})
put("/users/#{user_id}/roles/#{role_id}/targets/groups/#{group_id}", options)
put("users/#{user_id}/roles/#{role_id}/targets/groups/#{group_id}", options)
end

# Remove Group Target from User Admin Role
Expand All @@ -100,7 +100,7 @@ def add_group_target_to_user_admin_role(user_id, role_id, group_id, options = {}
# @example
# Oktakit.remove_group_target_from_user_admin_role('group_id', 'user_id', 'role_id')
def remove_group_target_from_user_admin_role(user_id, role_id, group_id, options = {})
delete("/users/#{user_id}/roles/#{role_id}/targets/groups/#{group_id}", options)
delete("users/#{user_id}/roles/#{role_id}/targets/groups/#{group_id}", options)
end

# List App Targets for App Admin Role
Expand All @@ -117,7 +117,7 @@ def remove_group_target_from_user_admin_role(user_id, role_id, group_id, options
# @example
# Oktakit.list_app_targets_for_app_admin_role('user_id', 'role_id')
def list_app_targets_for_app_admin_role(user_id, role_id, options = {})
get("/users/#{user_id}/roles/#{role_id}/targets/catalog/apps", options)
get("users/#{user_id}/roles/#{role_id}/targets/catalog/apps", options)
end

# Add App Target to App Admin Role
Expand All @@ -135,7 +135,7 @@ def list_app_targets_for_app_admin_role(user_id, role_id, options = {})
# @example
# Oktakit.add_app_target_to_app_admin_role('user_id', 'role_id')
def add_app_target_to_app_admin_role(user_id, role_id, app_name, options = {})
put("/users/#{user_id}/roles/#{role_id}/targets/catalog/apps/#{app_name}", options)
put("users/#{user_id}/roles/#{role_id}/targets/catalog/apps/#{app_name}", options)
end

# Remove App Target from App Admin Role
Expand All @@ -153,7 +153,7 @@ def add_app_target_to_app_admin_role(user_id, role_id, app_name, options = {})
# @example
# Oktakit.remove_app_target_from_app_admin_role('user_id', 'role_id')
def remove_app_target_from_app_admin_role(user_id, role_id, app_name, options = {})
delete("/users/#{user_id}/roles/#{role_id}/targets/catalog/apps/#{app_name}", options)
delete("users/#{user_id}/roles/#{role_id}/targets/catalog/apps/#{app_name}", options)
end
end
end
Expand Down
46 changes: 23 additions & 23 deletions lib/oktakit/client/apps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module Apps
# @example
# Oktakit.add_application
def add_application(options = {})
post('/apps', options)
post('apps', options)
end

# Get Application
Expand All @@ -29,7 +29,7 @@ def add_application(options = {})
# @example
# Oktakit.get_application('id')
def get_application(id, options = {})
get("/apps/#{id}", options)
get("apps/#{id}", options)
end

# List Applications
Expand All @@ -44,7 +44,7 @@ def get_application(id, options = {})
# @example
# Oktakit.list_applications
def list_applications(options = {})
get('/apps', options)
get('apps', options)
end

# Update Application
Expand All @@ -60,7 +60,7 @@ def list_applications(options = {})
# @example
# Oktakit.update_application('id')
def update_application(id, options = {})
put("/apps/#{id}", options)
put("apps/#{id}", options)
end

# Delete Application
Expand All @@ -76,7 +76,7 @@ def update_application(id, options = {})
# @example
# Oktakit.delete_application('id')
def delete_application(id, options = {})
delete("/apps/#{id}", options)
delete("apps/#{id}", options)
end

# Activate Application
Expand All @@ -92,7 +92,7 @@ def delete_application(id, options = {})
# @example
# Oktakit.activate_application('id')
def activate_application(id, options = {})
post("/apps/#{id}/lifecycle/activate", options)
post("apps/#{id}/lifecycle/activate", options)
end

# Deactivate Application
Expand All @@ -108,7 +108,7 @@ def activate_application(id, options = {})
# @example
# Oktakit.deactivate_application('id')
def deactivate_application(id, options = {})
post("/apps/#{id}/lifecycle/deactivate", options)
post("apps/#{id}/lifecycle/deactivate", options)
end

# Assign User to Application for SSO
Expand All @@ -124,7 +124,7 @@ def deactivate_application(id, options = {})
# @example
# Oktakit.assign_user_to_application_for_sso('id')
def assign_user_to_application_for_sso(id, options = {})
post("/apps/#{id}/users", options)
post("apps/#{id}/users", options)
end

# Assign User to Application for SSO & Provisioning
Expand All @@ -140,7 +140,7 @@ def assign_user_to_application_for_sso(id, options = {})
# @example
# Oktakit.assign_user_to_application_for_sso_provisioning('id')
def assign_user_to_application_for_sso_provisioning(id, options = {})
post("/apps/#{id}/users", options)
post("apps/#{id}/users", options)
end

# Get Assigned User for Application
Expand All @@ -157,7 +157,7 @@ def assign_user_to_application_for_sso_provisioning(id, options = {})
# @example
# Oktakit.get_assigned_user_for_application('user_id', 'app_id')
def get_assigned_user_for_application(app_id, user_id, options = {})
get("/apps/#{app_id}/users/#{user_id}", options)
get("apps/#{app_id}/users/#{user_id}", options)
end

# List Users Assigned to Application
Expand All @@ -173,7 +173,7 @@ def get_assigned_user_for_application(app_id, user_id, options = {})
# @example
# Oktakit.list_users_assigned_to_application('id')
def list_users_assigned_to_application(id, options = {})
get("/apps/#{id}/users", options)
get("apps/#{id}/users", options)
end

# List Applications Assigned to User
Expand All @@ -189,7 +189,7 @@ def list_users_assigned_to_application(id, options = {})
# @example
# Oktakit.list_applications_assigned_to_user('<user_id>')
def list_applications_assigned_to_user(user_id, options = {})
get("/apps?filter=user.id+eq+\"#{user_id}\"&expand=user/#{user_id}", options)
get("apps?filter=user.id+eq+\"#{user_id}\"&expand=user/#{user_id}", options)
end

# Update Application Credentials for Assigned User
Expand All @@ -206,7 +206,7 @@ def list_applications_assigned_to_user(user_id, options = {})
# @example
# Oktakit.update_application_credentials_for_assigned_user('user_id', 'app_id')
def update_application_credentials_for_assigned_user(app_id, user_id, options = {})
post("/apps/#{app_id}/users/#{user_id}", options)
post("apps/#{app_id}/users/#{user_id}", options)
end

# Update Application Profile for Assigned User
Expand All @@ -223,7 +223,7 @@ def update_application_credentials_for_assigned_user(app_id, user_id, options =
# @example
# Oktakit.update_application_profile_for_assigned_user('user_id', 'app_id')
def update_application_profile_for_assigned_user(app_id, user_id, options = {})
post("/apps/#{app_id}/users/#{user_id}", options)
post("apps/#{app_id}/users/#{user_id}", options)
end

# Remove User from Application
Expand All @@ -240,7 +240,7 @@ def update_application_profile_for_assigned_user(app_id, user_id, options = {})
# @example
# Oktakit.remove_user_from_application('user_id', 'app_id')
def remove_user_from_application(app_id, user_id, options = {})
delete("/apps/#{app_id}/users/#{user_id}", options)
delete("apps/#{app_id}/users/#{user_id}", options)
end

# Assign Group to Application
Expand All @@ -257,7 +257,7 @@ def remove_user_from_application(app_id, user_id, options = {})
# @example
# Oktakit.assign_group_to_application('group_id', 'app_id')
def assign_group_to_application(app_id, group_id, options = {})
put("/apps/#{app_id}/groups/#{group_id}", options)
put("apps/#{app_id}/groups/#{group_id}", options)
end

# Get Assigned Group for Application
Expand All @@ -274,7 +274,7 @@ def assign_group_to_application(app_id, group_id, options = {})
# @example
# Oktakit.get_assigned_group_for_application('group_id', 'app_id')
def get_assigned_group_for_application(app_id, group_id, options = {})
get("/apps/#{app_id}/groups/#{group_id}", options)
get("apps/#{app_id}/groups/#{group_id}", options)
end

# List Groups Assigned to Application
Expand All @@ -290,7 +290,7 @@ def get_assigned_group_for_application(app_id, group_id, options = {})
# @example
# Oktakit.list_groups_assigned_to_application('id')
def list_groups_assigned_to_application(id, options = {})
get("/apps/#{id}/groups", options)
get("apps/#{id}/groups", options)
end

# Remove Group from Application
Expand All @@ -307,7 +307,7 @@ def list_groups_assigned_to_application(id, options = {})
# @example
# Oktakit.remove_group_from_application('group_id', 'app_id')
def remove_group_from_application(app_id, group_id, options = {})
delete("/apps/#{app_id}/groups/#{group_id}", options)
delete("apps/#{app_id}/groups/#{group_id}", options)
end

# Generate New Application Key Credential
Expand All @@ -323,7 +323,7 @@ def remove_group_from_application(app_id, group_id, options = {})
# @example
# Oktakit.generate_new_application_key_credential('app_id')
def generate_new_application_key_credential(app_id, options = {})
post("/apps/#{app_id}/credentials/keys/generate", options)
post("apps/#{app_id}/credentials/keys/generate", options)
end

# List Key Credentials for Application
Expand All @@ -339,7 +339,7 @@ def generate_new_application_key_credential(app_id, options = {})
# @example
# Oktakit.list_key_credentials_for_application('app_id')
def list_key_credentials_for_application(app_id, options = {})
get("/apps/#{app_id}/credentials/keys", options)
get("apps/#{app_id}/credentials/keys", options)
end

# Get Key Credential for Application
Expand All @@ -356,7 +356,7 @@ def list_key_credentials_for_application(app_id, options = {})
# @example
# Oktakit.get_key_credential_for_application('app_id', 'key_id')
def get_key_credential_for_application(app_id, key_id, options = {})
get("/apps/#{app_id}/credentials/keys/#{key_id}", options)
get("apps/#{app_id}/credentials/keys/#{key_id}", options)
end

# Preview SAML metadata for Application
Expand All @@ -372,7 +372,7 @@ def get_key_credential_for_application(app_id, key_id, options = {})
# @example
# Oktakit.preview_saml_metadata_for_application('app_id')
def preview_saml_metadata_for_application(app_id, options = {})
get("/apps/#{app_id}/sso/saml/metadata", options)
get("apps/#{app_id}/sso/saml/metadata", options)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/oktakit/client/events.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module Events
# @example
# Oktakit.list_events
def list_events(options = {})
get('/events', options)
get('events', options)
end
end
end
Expand Down
Loading