From b4051750b51ad5b9ee0574fa5ceaa71649c19e95 Mon Sep 17 00:00:00 2001 From: mo khan Date: Sun, 14 Jul 2013 15:05:55 -0600 Subject: add keychain constants --- cakeside-ios.xcodeproj/project.pbxproj | 4 ++++ .../mo.xcuserdatad/UserInterfaceState.xcuserstate | Bin 15072 -> 18418 bytes cakeside-ios/cakeside-ios-Prefix.pch | 7 +++++++ cakeside-ios/controllers/LoginViewController.m | 5 +++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cakeside-ios.xcodeproj/project.pbxproj b/cakeside-ios.xcodeproj/project.pbxproj index 346f190..e8a45dc 100644 --- a/cakeside-ios.xcodeproj/project.pbxproj +++ b/cakeside-ios.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ CDCB348A1793405E00A25F1E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CDCB34881793405E00A25F1E /* InfoPlist.strings */; }; CDCB348D1793405E00A25F1E /* cakeside_iosTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CDCB348C1793405E00A25F1E /* cakeside_iosTests.m */; }; CDE67AB0179347D400B4742C /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE67AAF179347D400B4742C /* LoginViewController.m */; }; + CDE67AB2179348EB00B4742C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDE67AB1179348EB00B4742C /* Security.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,6 +61,7 @@ CDCB348C1793405E00A25F1E /* cakeside_iosTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cakeside_iosTests.m; sourceTree = ""; }; CDE67AAE179347D400B4742C /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; CDE67AAF179347D400B4742C /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = ""; }; + CDE67AB1179348EB00B4742C /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; CE65D4B28521438085302B5E /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -68,6 +70,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CDE67AB2179348EB00B4742C /* Security.framework in Frameworks */, CDCB345C1793405E00A25F1E /* UIKit.framework in Frameworks */, CDCB345E1793405E00A25F1E /* Foundation.framework in Frameworks */, CDCB34601793405E00A25F1E /* CoreGraphics.framework in Frameworks */, @@ -91,6 +94,7 @@ CDCB344F1793405E00A25F1E = { isa = PBXGroup; children = ( + CDE67AB1179348EB00B4742C /* Security.framework */, CDCB34611793405E00A25F1E /* cakeside-ios */, CDCB34851793405E00A25F1E /* cakeside-iosTests */, CDCB345A1793405E00A25F1E /* Frameworks */, diff --git a/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate b/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate index 9a54ebc..59e1991 100644 Binary files a/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate and b/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/cakeside-ios/cakeside-ios-Prefix.pch b/cakeside-ios/cakeside-ios-Prefix.pch index 7e47aca..796d29f 100644 --- a/cakeside-ios/cakeside-ios-Prefix.pch +++ b/cakeside-ios/cakeside-ios-Prefix.pch @@ -12,3 +12,10 @@ #import #import #endif + + +// KeyChain defs +#define KEYCHAIN_ACCOUNT @"cakeside" +#define KEYCHAIN_USER_NAME @"KEYCHAIN_USER_NAME" +#define KEYCHAIN_USER_PASSWORD @"KEYCHAIN_USER_PASSWORD" +#define KEYCHAIN_API_TOKEN @"KEYCHAIN_API_TOKEN" \ No newline at end of file diff --git a/cakeside-ios/controllers/LoginViewController.m b/cakeside-ios/controllers/LoginViewController.m index 5c0d897..11baea4 100644 --- a/cakeside-ios/controllers/LoginViewController.m +++ b/cakeside-ios/controllers/LoginViewController.m @@ -7,6 +7,7 @@ // #import "LoginViewController.h" +#import "SSKeychain.h" @interface LoginViewController () @@ -29,7 +30,7 @@ // self.contentView.$y = 0; // prepopulate username/password with stored information - /* + NSError *error; NSString *username = [SSKeychain passwordForService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT error:&error]; if (error) { username = nil; } @@ -44,7 +45,7 @@ { self.passwordTextBox.text = password; } - */ + } -- cgit v1.2.3