Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .github/workflows/swiftformat.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
name: SwiftFormat

on:
pull_request:
branches: [ master ]
on: pull_request

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
format:
uses: infomaniak/.github/.github/workflows/swiftformat.yml@v1
uses: infomaniak/.github/.github/workflows/swiftformat.yml@v2
Comment thread
PhilippeWeidmann marked this conversation as resolved.
Dismissed
6 changes: 2 additions & 4 deletions .github/workflows/swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
name: SwiftLint

on:
pull_request:
branches: [ master ]
on: pull_request

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
lint:
uses: infomaniak/.github/.github/workflows/swiftlint.yml@v1
uses: infomaniak/.github/.github/workflows/swiftlint.yml@v2
Comment thread
PhilippeWeidmann marked this conversation as resolved.
Dismissed
8 changes: 8 additions & 0 deletions Sources/InfomaniakCore/Account/KeychainHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class KeychainHelper {
}

let query: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: lockedKey,
kSecAttrAccessGroup as String: accessGroup,
Expand Down Expand Up @@ -73,6 +74,7 @@ public class KeychainHelper {
func initKeychainAccessibility() {
accessibilityValueWritten = true
let queryAdd: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrAccessGroup as String: accessGroup,
kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock,
Expand All @@ -88,6 +90,7 @@ public class KeychainHelper {
public func deleteToken(for userId: Int) {
keychainQueue.sync {
let queryDelete: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: tag,
kSecAttrAccessGroup as String: accessGroup,
Expand All @@ -101,6 +104,7 @@ public class KeychainHelper {
public func deleteAllTokens() {
keychainQueue.sync {
let queryDelete: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: tag,
kSecAttrAccessGroup as String: accessGroup
Expand All @@ -127,6 +131,7 @@ public class KeychainHelper {
if let savedToken = getSavedToken(for: token.userId)?.apiToken {
keychainQueue.sync {
let queryUpdate: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrAccount as String: "\(token.userId)",
kSecAttrAccessGroup as String: accessGroup
Expand Down Expand Up @@ -158,6 +163,7 @@ public class KeychainHelper {
deleteToken(for: token.userId)
keychainQueue.sync {
let queryAdd: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrAccessGroup as String: accessGroup,
kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock,
Expand All @@ -183,6 +189,7 @@ public class KeychainHelper {

keychainQueue.sync {
let queryFindOne: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: tag,
kSecAttrAccessGroup as String: accessGroup,
Expand Down Expand Up @@ -215,6 +222,7 @@ public class KeychainHelper {
var values = [AssociatedApiToken]()
keychainQueue.sync {
let query: [String: Any] = [
kSecUseDataProtectionKeychain as String: true,
Comment thread
PhilippeWeidmann marked this conversation as resolved.
Resolved
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: tag,
kSecAttrAccessGroup as String: accessGroup,
Expand Down
Loading