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

Rename: auth setting prepended with screenly_ #198

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Rename: auth setting prepended with screenly_ #198

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
28 changes: 14 additions & 14 deletions src/commands/edge_app_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,11 +684,11 @@ mod tests {
assert!(changes
.creates
.iter()
.any(|s| s.name == "basic_auth_username" && !s.is_global));
.any(|s| s.name == "screenly_basic_auth_username" && !s.is_global));
assert!(changes
.creates
.iter()
.any(|s| s.name == "basic_auth_password" && !s.is_global));
.any(|s| s.name == "screenly_basic_auth_password" && !s.is_global));
}

#[test]
Expand All @@ -709,7 +709,7 @@ mod tests {
assert!(result.is_ok());
let changes = result.unwrap();
assert_eq!(changes.creates.len(), 1);
assert_eq!(changes.creates[0].name, "bearer_token");
assert_eq!(changes.creates[0].name, "screenly_bearer_token");
assert!(!changes.creates[0].is_global);
}

Expand All @@ -727,14 +727,14 @@ mod tests {
Setting::new(
SettingType::String,
"Username",
"basic_auth_username",
"screenly_basic_auth_username",
"Basic auth username",
false,
),
Setting::new(
SettingType::Secret,
"Password",
"basic_auth_password",
"screenly_basic_auth_password",
"Basic auth password",
false,
),
Expand All @@ -747,17 +747,17 @@ mod tests {
assert!(result.is_ok());
let changes = result.unwrap();
assert_eq!(changes.creates.len(), 1);
assert_eq!(changes.creates[0].name, "bearer_token");
assert_eq!(changes.creates[0].name, "screenly_bearer_token");
assert!(!changes.creates[0].is_global);
assert_eq!(changes.deleted.len(), 2);
assert!(changes
.deleted
.iter()
.any(|s| s.name == "basic_auth_username"));
.any(|s| s.name == "screenly_basic_auth_username"));
assert!(changes
.deleted
.iter()
.any(|s| s.name == "basic_auth_password"));
.any(|s| s.name == "screenly_basic_auth_password"));
}

#[test]
Expand All @@ -773,7 +773,7 @@ mod tests {
remote_settings.push(Setting::new(
SettingType::String,
"Token",
"bearer_token",
"screenly_bearer_token",
"Bearer token",
false,
));
Expand All @@ -788,13 +788,13 @@ mod tests {
assert!(changes
.creates
.iter()
.any(|s| s.name == "basic_auth_username" && !s.is_global));
.any(|s| s.name == "screenly_basic_auth_username" && !s.is_global));
assert!(changes
.creates
.iter()
.any(|s| s.name == "basic_auth_password" && !s.is_global));
.any(|s| s.name == "screenly_basic_auth_password" && !s.is_global));
assert_eq!(changes.deleted.len(), 1);
assert_eq!(changes.deleted[0].name, "bearer_token");
assert_eq!(changes.deleted[0].name, "screenly_bearer_token");
}

#[test]
Expand All @@ -818,11 +818,11 @@ mod tests {
assert!(changes
.creates
.iter()
.any(|s| s.name == "basic_auth_username" && s.is_global));
.any(|s| s.name == "screenly_basic_auth_username" && s.is_global));
assert!(changes
.creates
.iter()
.any(|s| s.name == "basic_auth_password" && s.is_global));
.any(|s| s.name == "screenly_basic_auth_password" && s.is_global));
}

#[test]
Expand Down
12 changes: 6 additions & 6 deletions src/commands/manifest_auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ impl AuthType {
Setting::new(
SettingType::String,
"Username",
"basic_auth_username",
"screenly_basic_auth_username",
"The username for Basic Authentication.",
global,
),
Setting::new(
SettingType::Secret,
"Password",
"basic_auth_password",
"screenly_basic_auth_password",
"The password for Basic Authentication.",
global,
),
],
AuthType::Bearer => vec![Setting::new(
SettingType::String,
"Token",
"bearer_token",
"screenly_bearer_token",
"The Bearer token for authentication.",
global,
)],
Expand All @@ -52,7 +52,7 @@ mod tests {

let username_setting = &settings[0];
assert_eq!(username_setting.type_, SettingType::String);
assert_eq!(username_setting.name, "basic_auth_username");
assert_eq!(username_setting.name, "screenly_basic_auth_username");
assert_eq!(username_setting.title, Some("Username".to_string()));
assert!(!username_setting.optional);
assert!(username_setting
Expand All @@ -61,7 +61,7 @@ mod tests {

let password_setting = &settings[1];
assert_eq!(password_setting.type_, SettingType::Secret);
assert_eq!(password_setting.name, "basic_auth_password");
assert_eq!(password_setting.name, "screenly_basic_auth_password");
assert_eq!(password_setting.title, Some("Password".to_string()));
assert!(!password_setting.optional);
assert!(password_setting
Expand All @@ -78,7 +78,7 @@ mod tests {

let token_setting = &settings[0];
assert_eq!(token_setting.type_, SettingType::String);
assert_eq!(token_setting.name, "bearer_token");
assert_eq!(token_setting.name, "screenly_bearer_token");
assert_eq!(token_setting.title, Some("Token".to_string()));
assert!(!token_setting.optional);
assert!(token_setting
Expand Down
Loading