From b9ea8c37ea8f7842b15c23d5ebdd1fb16527e8a1 Mon Sep 17 00:00:00 2001 From: Seth Law Date: Thu, 20 Oct 2016 13:13:36 -0600 Subject: [PATCH] removed locksmith requirements --- Swift.nV/Environment.plist | 12 +- Swift.nV/ItemHelper.swift | 3 +- Swift.nV/NVLoginViewController.swift | 2 +- swift.nV.xcodeproj/project.pbxproj | 111 ------------------ .../xcshareddata/swift.nV.xcscmblueprint | 2 +- 5 files changed, 10 insertions(+), 120 deletions(-) diff --git a/Swift.nV/Environment.plist b/Swift.nV/Environment.plist index 657f075..c613ba2 100644 --- a/Swift.nV/Environment.plist +++ b/Swift.nV/Environment.plist @@ -7,18 +7,18 @@ externalURL http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/tutorial TutorialURL - http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/tutorial + http://localhost:4567/tutorial CryptoKey password AuthenticateURL - http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/users/authenticate + http://localhost:4567/users/authenticate RegisterURL - http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/users/register + http://localhost:4567/users/register NewSecretURL - http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/secret + http://localhost:4567/secret SecretsURL - http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/secrets + http://localhost:4567/secrets UpdateSecretURL - http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/secret/ + http://localhost:4567/secret/ diff --git a/Swift.nV/ItemHelper.swift b/Swift.nV/ItemHelper.swift index 032c068..a0de133 100644 --- a/Swift.nV/ItemHelper.swift +++ b/Swift.nV/ItemHelper.swift @@ -8,7 +8,6 @@ import Foundation import Security -import Locksmith func encryptString(toEncrypt: String) -> String { @@ -47,6 +46,7 @@ func generateChecksum(myItem: Item) -> String { return crypto.sha256HashFor("\(myItem.name)\(myItem.value)\(myItem.notes)") } +/* Example of using keychain for storing data func saveToKeychain(key: String, data: String) { do { try Locksmith.saveData([key:data], forUserAccount: "swift-nv") @@ -66,3 +66,4 @@ func loadFromKeychain(key: String) -> String? { } return nil } + */ diff --git a/Swift.nV/NVLoginViewController.swift b/Swift.nV/NVLoginViewController.swift index e2e6ba5..52df71d 100644 --- a/Swift.nV/NVLoginViewController.swift +++ b/Swift.nV/NVLoginViewController.swift @@ -139,7 +139,7 @@ class NVLoginViewController: UIViewController, NSURLConnectionDataDelegate { defaults.synchronize() NSLog("Setting email key in NSUserDefaults to \(self.username.text)") - saveToKeychain("email", data: self.username.text!) + //saveToKeychain("email", data: self.username.text!) self.data.setData(NSData()) self.performSegueWithIdentifier("Home", sender: self) diff --git a/swift.nV.xcodeproj/project.pbxproj b/swift.nV.xcodeproj/project.pbxproj index d95b42f..48366ed 100644 --- a/swift.nV.xcodeproj/project.pbxproj +++ b/swift.nV.xcodeproj/project.pbxproj @@ -28,51 +28,6 @@ 8133383319828AD1004F1C31 /* Crypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 8133383219828AD1004F1C31 /* Crypto.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 5D2B81F91D99D5FC00315E5D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0EC25C591BA385AA004191AF; - remoteInfo = "Locksmith iOS"; - }; - 5D2B81FB1D99D5FC00315E5D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0EC25C621BA385AB004191AF; - remoteInfo = "Locksmith iOS Tests"; - }; - 5D2B81FD1D99D5FC00315E5D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0EC25C751BA385F6004191AF; - remoteInfo = "Locksmith OS X"; - }; - 5D2B81FF1D99D5FC00315E5D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0EC25C7E1BA385F6004191AF; - remoteInfo = "Locksmith OS X Tests"; - }; - 5D2B82011D99D5FC00315E5D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0EC25CA71BA39C9F004191AF; - remoteInfo = "Locksmith watchOS"; - }; - 5D2B82031D99D5FC00315E5D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FBD0C9491C1866BE00291F2A; - remoteInfo = "Locksmith tvOS"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 5D2E37DE1D97381C00DD168C /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -87,7 +42,6 @@ /* Begin PBXFileReference section */ 5D23C055196323BE00053E65 /* NVHomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NVHomeViewController.swift; sourceTree = ""; }; - 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Locksmith.xcodeproj; path = Locksmith/Locksmith.xcodeproj; sourceTree = ""; }; 5D41359619632DF800DAC6C5 /* NVSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NVSettingsViewController.swift; sourceTree = ""; }; 5D41359A19635A5200DAC6C5 /* Item.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = ""; }; 5D41359C1963651900DAC6C5 /* NVAddItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NVAddItemViewController.swift; sourceTree = ""; }; @@ -124,23 +78,9 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5D2B81F11D99D5FC00315E5D /* Products */ = { - isa = PBXGroup; - children = ( - 5D2B81FA1D99D5FC00315E5D /* Locksmith.framework */, - 5D2B81FC1D99D5FC00315E5D /* Locksmith iOS Tests.xctest */, - 5D2B81FE1D99D5FC00315E5D /* Locksmith.framework */, - 5D2B82001D99D5FC00315E5D /* Locksmith OS X Tests.xctest */, - 5D2B82021D99D5FC00315E5D /* Locksmith.framework */, - 5D2B82041D99D5FC00315E5D /* Locksmith.framework */, - ); - name = Products; - sourceTree = ""; - }; 5D8BE0051958C25B0030428C = { isa = PBXGroup; children = ( - 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */, 5DE870731D932717002DABE4 /* swift.nV.entitlements */, 5D8BE0101958C25B0030428C /* swift.nV */, 5D8BE00F1958C25B0030428C /* Products */, @@ -246,12 +186,6 @@ mainGroup = 5D8BE0051958C25B0030428C; productRefGroup = 5D8BE00F1958C25B0030428C /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 5D2B81F11D99D5FC00315E5D /* Products */; - ProjectRef = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 5D8BE00D1958C25B0030428C /* Swift.nV */, @@ -259,51 +193,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 5D2B81FA1D99D5FC00315E5D /* Locksmith.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Locksmith.framework; - remoteRef = 5D2B81F91D99D5FC00315E5D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5D2B81FC1D99D5FC00315E5D /* Locksmith iOS Tests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Locksmith iOS Tests.xctest"; - remoteRef = 5D2B81FB1D99D5FC00315E5D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5D2B81FE1D99D5FC00315E5D /* Locksmith.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Locksmith.framework; - remoteRef = 5D2B81FD1D99D5FC00315E5D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5D2B82001D99D5FC00315E5D /* Locksmith OS X Tests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Locksmith OS X Tests.xctest"; - remoteRef = 5D2B81FF1D99D5FC00315E5D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5D2B82021D99D5FC00315E5D /* Locksmith.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Locksmith.framework; - remoteRef = 5D2B82011D99D5FC00315E5D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5D2B82041D99D5FC00315E5D /* Locksmith.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Locksmith.framework; - remoteRef = 5D2B82031D99D5FC00315E5D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 5D8BE00C1958C25B0030428C /* Resources */ = { isa = PBXResourcesBuildPhase; diff --git a/swift.nV.xcodeproj/project.xcworkspace/xcshareddata/swift.nV.xcscmblueprint b/swift.nV.xcodeproj/project.xcworkspace/xcshareddata/swift.nV.xcscmblueprint index 6c2082e..1817411 100644 --- a/swift.nV.xcodeproj/project.xcworkspace/xcshareddata/swift.nV.xcscmblueprint +++ b/swift.nV.xcodeproj/project.xcworkspace/xcshareddata/swift.nV.xcscmblueprint @@ -12,7 +12,7 @@ "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { "AFADF01AFBA46DFD7A5AFD980110E89E8E63AACD" : "KeychainAccess\/", "8B27742E93FC1682D786B54C3194B2FD3E688A76" : "swift.nv\/", - "4E8FE33026C73951A712CD33348204351A71B278" : "Locksmith\/" + "4E8FE33026C73951A712CD33348204351A71B278" : "swift.nv\/Locksmith\/" }, "DVTSourceControlWorkspaceBlueprintNameKey" : "swift.nV", "DVTSourceControlWorkspaceBlueprintVersion" : 204,