Skip to content

Commit bc6d435

Browse files
soffessoffes
committed
Switch to SAMKeychain
1 parent adb3949 commit bc6d435

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

‎CanvasCore.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
216B1C971D17199B007D022B /* CanvasCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 216B1C8C1D17199B007D022B /* CanvasCore.framework */; };
1919
216B1CAD1D1719F6007D022B /* CanvasCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 216B1CA81D1719F6007D022B /* CanvasCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
2020
216B1CB11D171A04007D022B /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 216B1CAC1D1719F6007D022B /* Tests.swift */; };
21+
21730A001D46F3C9001B63D7 /* SAMKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217309FF1D46F3C9001B63D7 /* SAMKeychain.framework */; };
22+
21730A021D46F3D5001B63D7 /* SAMKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21730A011D46F3D5001B63D7 /* SAMKeychain.framework */; };
23+
21730A031D46F3E5001B63D7 /* SAMKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217309FF1D46F3C9001B63D7 /* SAMKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
24+
21730A041D46F3EA001B63D7 /* SAMKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 21730A011D46F3D5001B63D7 /* SAMKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2125
2175D2FD1D172262009C6845 /* AccountController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D2FC1D172262009C6845 /* AccountController.swift */; };
2226
2175D3241D1722AE009C6845 /* CanvasCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2175D31A1D1722AD009C6845 /* CanvasCore.framework */; };
2327
2175D3311D1722CA009C6845 /* AccountController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2175D2FC1D172262009C6845 /* AccountController.swift */; };
@@ -56,7 +60,6 @@
5660
217C55411D42CFDC0064A2AD /* Diff.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55361D42CFDC0064A2AD /* Diff.framework */; };
5761
217C55421D42CFDC0064A2AD /* ISO8601.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55371D42CFDC0064A2AD /* ISO8601.framework */; };
5862
217C55431D42CFDC0064A2AD /* OperationalTransformation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55381D42CFDC0064A2AD /* OperationalTransformation.framework */; };
59-
217C55441D42CFDC0064A2AD /* SSKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55391D42CFDC0064A2AD /* SSKeychain.framework */; };
6063
217C55451D42CFDC0064A2AD /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C553A1D42CFDC0064A2AD /* Starscream.framework */; };
6164
217C55461D42CFDC0064A2AD /* X.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C553B1D42CFDC0064A2AD /* X.framework */; };
6265
217C555C1D42CFF10064A2AD /* Cache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55481D42CFEE0064A2AD /* Cache.framework */; };
@@ -66,7 +69,6 @@
6669
217C55601D42CFF10064A2AD /* Diff.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554C1D42CFEE0064A2AD /* Diff.framework */; };
6770
217C55611D42CFF10064A2AD /* ISO8601.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554D1D42CFEE0064A2AD /* ISO8601.framework */; };
6871
217C55621D42CFF10064A2AD /* OperationalTransformation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554E1D42CFEE0064A2AD /* OperationalTransformation.framework */; };
69-
217C55631D42CFF10064A2AD /* SSKeychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554F1D42CFEE0064A2AD /* SSKeychain.framework */; };
7072
217C55641D42CFF10064A2AD /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55501D42CFEE0064A2AD /* Starscream.framework */; };
7173
217C55651D42CFF10064A2AD /* X.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55511D42CFEE0064A2AD /* X.framework */; };
7274
217C55791D42D3740064A2AD /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55781D42D3740064A2AD /* Crypto.framework */; };
@@ -79,7 +81,6 @@
7981
217C55821D42D3940064A2AD /* Diff.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55361D42CFDC0064A2AD /* Diff.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8082
217C55831D42D3940064A2AD /* ISO8601.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55371D42CFDC0064A2AD /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8183
217C55841D42D3940064A2AD /* OperationalTransformation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55381D42CFDC0064A2AD /* OperationalTransformation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
82-
217C55851D42D3940064A2AD /* SSKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55391D42CFDC0064A2AD /* SSKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8384
217C55861D42D3940064A2AD /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C553A1D42CFDC0064A2AD /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8485
217C55871D42D3940064A2AD /* X.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C553B1D42CFDC0064A2AD /* X.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8586
217C55891D42D3B80064A2AD /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55881D42D3B80064A2AD /* Crypto.framework */; };
@@ -91,7 +92,6 @@
9192
217C55901D42D3C70064A2AD /* Diff.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554C1D42CFEE0064A2AD /* Diff.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9293
217C55911D42D3C70064A2AD /* ISO8601.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554D1D42CFEE0064A2AD /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9394
217C55921D42D3C70064A2AD /* OperationalTransformation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554E1D42CFEE0064A2AD /* OperationalTransformation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
94-
217C55931D42D3C70064A2AD /* SSKeychain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C554F1D42CFEE0064A2AD /* SSKeychain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9595
217C55941D42D3C70064A2AD /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55501D42CFEE0064A2AD /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9696
217C55951D42D3C70064A2AD /* X.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 217C55511D42CFEE0064A2AD /* X.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9797
219D23081D171B4900D32F65 /* Accountable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219D22FD1D171B4900D32F65 /* Accountable.swift */; };
@@ -130,7 +130,7 @@
130130
217C55821D42D3940064A2AD /* Diff.framework in Embed Frameworks */,
131131
217C55831D42D3940064A2AD /* ISO8601.framework in Embed Frameworks */,
132132
217C55841D42D3940064A2AD /* OperationalTransformation.framework in Embed Frameworks */,
133-
217C55851D42D3940064A2AD /* SSKeychain.framework in Embed Frameworks */,
133+
21730A031D46F3E5001B63D7 /* SAMKeychain.framework in Embed Frameworks */,
134134
217C55861D42D3940064A2AD /* Starscream.framework in Embed Frameworks */,
135135
217C55871D42D3940064A2AD /* X.framework in Embed Frameworks */,
136136
);
@@ -151,7 +151,7 @@
151151
217C55901D42D3C70064A2AD /* Diff.framework in Embed Frameworks */,
152152
217C55911D42D3C70064A2AD /* ISO8601.framework in Embed Frameworks */,
153153
217C55921D42D3C70064A2AD /* OperationalTransformation.framework in Embed Frameworks */,
154-
217C55931D42D3C70064A2AD /* SSKeychain.framework in Embed Frameworks */,
154+
21730A041D46F3EA001B63D7 /* SAMKeychain.framework in Embed Frameworks */,
155155
217C55941D42D3C70064A2AD /* Starscream.framework in Embed Frameworks */,
156156
217C55951D42D3C70064A2AD /* X.framework in Embed Frameworks */,
157157
);
@@ -171,6 +171,8 @@
171171
216B1CA91D1719F6007D022B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
172172
216B1CAA1D1719F6007D022B /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
173173
216B1CAC1D1719F6007D022B /* Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
174+
217309FF1D46F3C9001B63D7 /* SAMKeychain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SAMKeychain.framework; path = Carthage/Build/iOS/SAMKeychain.framework; sourceTree = "<group>"; };
175+
21730A011D46F3D5001B63D7 /* SAMKeychain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SAMKeychain.framework; path = Carthage/Build/Mac/SAMKeychain.framework; sourceTree = "<group>"; };
174176
2175D2FC1D172262009C6845 /* AccountController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountController.swift; sourceTree = "<group>"; };
175177
2175D31A1D1722AD009C6845 /* CanvasCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CanvasCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
176178
2175D3231D1722AE009C6845 /* CanvasCoreTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "CanvasCoreTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -185,7 +187,6 @@
185187
217C55361D42CFDC0064A2AD /* Diff.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Diff.framework; path = Carthage/Build/iOS/Diff.framework; sourceTree = "<group>"; };
186188
217C55371D42CFDC0064A2AD /* ISO8601.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ISO8601.framework; path = Carthage/Build/iOS/ISO8601.framework; sourceTree = "<group>"; };
187189
217C55381D42CFDC0064A2AD /* OperationalTransformation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OperationalTransformation.framework; path = Carthage/Build/iOS/OperationalTransformation.framework; sourceTree = "<group>"; };
188-
217C55391D42CFDC0064A2AD /* SSKeychain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SSKeychain.framework; path = Carthage/Build/iOS/SSKeychain.framework; sourceTree = "<group>"; };
189190
217C553A1D42CFDC0064A2AD /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/iOS/Starscream.framework; sourceTree = "<group>"; };
190191
217C553B1D42CFDC0064A2AD /* X.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = X.framework; path = Carthage/Build/iOS/X.framework; sourceTree = "<group>"; };
191192
217C55481D42CFEE0064A2AD /* Cache.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cache.framework; path = Carthage/Build/Mac/Cache.framework; sourceTree = "<group>"; };
@@ -195,7 +196,6 @@
195196
217C554C1D42CFEE0064A2AD /* Diff.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Diff.framework; path = Carthage/Build/Mac/Diff.framework; sourceTree = "<group>"; };
196197
217C554D1D42CFEE0064A2AD /* ISO8601.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ISO8601.framework; path = Carthage/Build/Mac/ISO8601.framework; sourceTree = "<group>"; };
197198
217C554E1D42CFEE0064A2AD /* OperationalTransformation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OperationalTransformation.framework; path = Carthage/Build/Mac/OperationalTransformation.framework; sourceTree = "<group>"; };
198-
217C554F1D42CFEE0064A2AD /* SSKeychain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SSKeychain.framework; path = Carthage/Build/Mac/SSKeychain.framework; sourceTree = "<group>"; };
199199
217C55501D42CFEE0064A2AD /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/Mac/Starscream.framework; sourceTree = "<group>"; };
200200
217C55511D42CFEE0064A2AD /* X.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = X.framework; path = Carthage/Build/Mac/X.framework; sourceTree = "<group>"; };
201201
217C55781D42D3740064A2AD /* Crypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crypto.framework; path = Carthage/Build/iOS/Crypto.framework; sourceTree = "<group>"; };
@@ -228,7 +228,7 @@
228228
217C55421D42CFDC0064A2AD /* ISO8601.framework in Frameworks */,
229229
217C55401D42CFDC0064A2AD /* CommonCrypto.framework in Frameworks */,
230230
217C55791D42D3740064A2AD /* Crypto.framework in Frameworks */,
231-
217C55441D42CFDC0064A2AD /* SSKeychain.framework in Frameworks */,
231+
21730A001D46F3C9001B63D7 /* SAMKeychain.framework in Frameworks */,
232232
217C553D1D42CFDC0064A2AD /* CanvasKit.framework in Frameworks */,
233233
);
234234
runOnlyForDeploymentPostprocessing = 0;
@@ -247,10 +247,10 @@
247247
files = (
248248
217C555F1D42CFF10064A2AD /* CommonCrypto.framework in Frameworks */,
249249
217C555C1D42CFF10064A2AD /* Cache.framework in Frameworks */,
250-
217C55631D42CFF10064A2AD /* SSKeychain.framework in Frameworks */,
251250
217C55891D42D3B80064A2AD /* Crypto.framework in Frameworks */,
252251
217C55621D42CFF10064A2AD /* OperationalTransformation.framework in Frameworks */,
253252
217C55641D42CFF10064A2AD /* Starscream.framework in Frameworks */,
253+
21730A021D46F3D5001B63D7 /* SAMKeychain.framework in Frameworks */,
254254
217C55601D42CFF10064A2AD /* Diff.framework in Frameworks */,
255255
217C555E1D42CFF10064A2AD /* CanvasNative.framework in Frameworks */,
256256
217C55651D42CFF10064A2AD /* X.framework in Frameworks */,
@@ -273,10 +273,10 @@
273273
216B1C821D17199B007D022B = {
274274
isa = PBXGroup;
275275
children = (
276-
217C552F1D42CFC30064A2AD /* Frameworks */,
277276
216B1CA61D1719F6007D022B /* Sources */,
278277
216B1CA71D1719F6007D022B /* Support */,
279278
216B1CAB1D1719F6007D022B /* Tests */,
279+
217C552F1D42CFC30064A2AD /* Frameworks */,
280280
216B1C8D1D17199B007D022B /* Products */,
281281
);
282282
sourceTree = "<group>";
@@ -347,6 +347,7 @@
347347
217C55301D42CFC80064A2AD /* iOS */ = {
348348
isa = PBXGroup;
349349
children = (
350+
217309FF1D46F3C9001B63D7 /* SAMKeychain.framework */,
350351
217C55781D42D3740064A2AD /* Crypto.framework */,
351352
217C55311D42CFDC0064A2AD /* Cache.framework */,
352353
217C55321D42CFDC0064A2AD /* CanvasKit.framework */,
@@ -356,7 +357,6 @@
356357
217C55361D42CFDC0064A2AD /* Diff.framework */,
357358
217C55371D42CFDC0064A2AD /* ISO8601.framework */,
358359
217C55381D42CFDC0064A2AD /* OperationalTransformation.framework */,
359-
217C55391D42CFDC0064A2AD /* SSKeychain.framework */,
360360
217C553A1D42CFDC0064A2AD /* Starscream.framework */,
361361
217C553B1D42CFDC0064A2AD /* X.framework */,
362362
);
@@ -366,6 +366,7 @@
366366
217C55471D42CFDF0064A2AD /* macOS */ = {
367367
isa = PBXGroup;
368368
children = (
369+
21730A011D46F3D5001B63D7 /* SAMKeychain.framework */,
369370
217C55881D42D3B80064A2AD /* Crypto.framework */,
370371
217C55481D42CFEE0064A2AD /* Cache.framework */,
371372
217C55491D42CFEE0064A2AD /* CanvasKit.framework */,
@@ -374,7 +375,6 @@
374375
217C554C1D42CFEE0064A2AD /* Diff.framework */,
375376
217C554D1D42CFEE0064A2AD /* ISO8601.framework */,
376377
217C554E1D42CFEE0064A2AD /* OperationalTransformation.framework */,
377-
217C554F1D42CFEE0064A2AD /* SSKeychain.framework */,
378378
217C55501D42CFEE0064A2AD /* Starscream.framework */,
379379
217C55511D42CFEE0064A2AD /* X.framework */,
380380
);

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github "soffes/Cache"
22
github "soffes/Crypto"
3-
github "soffes/SSKeychain"
3+
github "soffes/SAMKeychain"
44
github "usecanvas/CanvasKit"
55
github "usecanvas/CanvasText"
66
github "usecanvas/Starscream"

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ github "soffes/CommonCrypto" "v1.0"
33
github "soffes/Diff" "v0.1.2"
44
github "soffes/ISO8601" "v0.6.0"
55
github "usecanvas/OperationalTransformation" "v0.1.1"
6-
github "soffes/SSKeychain" "v1.4.0"
6+
github "soffes/SAMKeychain" "v1.5.0"
77
github "usecanvas/Starscream" "1.1.3"
88
github "soffes/X" "v0.3.1"
99
github "usecanvas/CanvasKit" "v0.4.0"

‎Sources/AccountController.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import CanvasKit
10-
import SSKeychain
10+
import SAMKeychain
1111

1212
public class AccountController {
1313

@@ -16,9 +16,9 @@ public class AccountController {
1616
public var currentAccount: Account? {
1717
didSet {
1818
if let account = currentAccount, data = try? NSJSONSerialization.dataWithJSONObject(account.dictionary, options: []) {
19-
SSKeychain.setPasswordData(data, forService: "Canvas", account: "Account")
19+
SAMKeychain.setPasswordData(data, forService: "Canvas", account: "Account")
2020
} else {
21-
SSKeychain.deletePasswordForService("Canvas", account: "Account")
21+
SAMKeychain.deletePasswordForService("Canvas", account: "Account")
2222
NSUserDefaults.standardUserDefaults().removeObjectForKey("Organizations")
2323
NSUserDefaults.standardUserDefaults().removeObjectForKey("SelectedOrganization")
2424
}
@@ -35,13 +35,13 @@ public class AccountController {
3535
// MARK: - Initializers
3636

3737
init() {
38-
guard let data = SSKeychain.passwordDataForService("Canvas", account: "Account") else { return }
38+
guard let data = SAMKeychain.passwordDataForService("Canvas", account: "Account") else { return }
3939

4040
guard let json = try? NSJSONSerialization.JSONObjectWithData(data, options: []),
4141
dictionary = json as? JSONDictionary,
4242
account = Account(dictionary: dictionary)
4343
else {
44-
SSKeychain.deletePasswordForService("Canvas", account: "Account")
44+
SAMKeychain.deletePasswordForService("Canvas", account: "Account")
4545
return
4646
}
4747

0 commit comments

Comments
 (0)