Skip to content

Commit

Permalink
merge conflicts are always fun
Browse files Browse the repository at this point in the history
  • Loading branch information
pgoodjohn committed Dec 12, 2023
1 parent c90c61f commit a5fde1f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
14 changes: 10 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions crates/mollie_cli/src/org/permissions.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
use crate::config::MollieConfig;

use super::console;
use super::mollie;
use super::mollie::permissions::Permissions;
use log::info;
use colored_json::ToColoredJson;
use pad::{Alignment, PadStr};
use mollie_api::{Mollie, models::permission::PermissionsEmbeddedResource};

pub fn command(config: &MollieConfig, filter_granted: &bool) {
let permissions = Mollie::build(&config.bearer_token.unwrap().permissions().list().await?;
pub async fn command(config: &MollieConfig, filter_granted: &bool, with_response: bool) -> anyhow::Result<()> {
let permissions = Mollie::build(&config.bearer_token().unwrap().as_str()).permissions().list().await?;

if *filter_granted {
list_granted_permissions(&permissions.embedded)
Expand Down

0 comments on commit a5fde1f

Please # to comment.