Skip to content

Commit 8b350d4

Browse files
authored
Merge pull request #19 from nativeapptemplate/Backdoor_Authentication_Bypass
Remove backdoor authentication bypass
2 parents 67554ae + 5b130f9 commit 8b350d4

5 files changed

Lines changed: 8 additions & 35 deletions

File tree

NativeAppTemplate.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@
161161
01E0A5B825BD0FCD00298D35 /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5B325BD0FC700298D35 /* ErrorView.swift */; };
162162
01E0A60125BD149200298D35 /* MainButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5F925BD148800298D35 /* MainButtonView.swift */; };
163163
01E0A60C25BD440300298D35 /* SignInEmailAndPasswordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A60B25BD440300298D35 /* SignInEmailAndPasswordView.swift */; };
164-
01E0A62225BD4A7800298D35 /* Shopkeeper+Backdoor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A62125BD4A7800298D35 /* Shopkeeper+Backdoor.swift */; };
165164
01E0A63025BD53FD00298D35 /* Shop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A62F25BD53FD00298D35 /* Shop.swift */; };
166165
01E1CECC287787A700E724FC /* SignUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E1CECB287787A700E724FC /* SignUpView.swift */; };
167166
01E2477029A570D300D4B00D /* SignUp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E2476F29A570D300D4B00D /* SignUp.swift */; };
@@ -338,7 +337,6 @@
338337
01E0A5B525BD0FC700298D35 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
339338
01E0A5F925BD148800298D35 /* MainButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainButtonView.swift; sourceTree = "<group>"; };
340339
01E0A60B25BD440300298D35 /* SignInEmailAndPasswordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInEmailAndPasswordView.swift; sourceTree = "<group>"; };
341-
01E0A62125BD4A7800298D35 /* Shopkeeper+Backdoor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Shopkeeper+Backdoor.swift"; sourceTree = "<group>"; };
342340
01E0A62F25BD53FD00298D35 /* Shop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shop.swift; sourceTree = "<group>"; };
343341
01E1CECB287787A700E724FC /* SignUpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpView.swift; sourceTree = "<group>"; };
344342
01E2476F29A570D300D4B00D /* SignUp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUp.swift; sourceTree = "<group>"; };
@@ -629,7 +627,6 @@
629627
children = (
630628
017203C725A9708A008FD63B /* SessionController.swift */,
631629
0199CD3D2E075CBB00109DC6 /* SessionControllerProtocol.swift */,
632-
01E0A62125BD4A7800298D35 /* Shopkeeper+Backdoor.swift */,
633630
);
634631
path = Sessions;
635632
sourceTree = "<group>";
@@ -906,7 +903,7 @@
906903
attributes = {
907904
BuildIndependentTargetsInParallel = YES;
908905
LastSwiftUpdateCheck = 1620;
909-
LastUpgradeCheck = 1640;
906+
LastUpgradeCheck = 2630;
910907
TargetAttributes = {
911908
011F6DEC259EF16400BED22E = {
912909
CreatedOnToolsVersion = 12.3;
@@ -960,9 +957,6 @@
960957
};
961958
/* End PBXResourcesBuildPhase section */
962959

963-
/* Begin PBXShellScriptBuildPhase section */
964-
/* End PBXShellScriptBuildPhase section */
965-
966960
/* Begin PBXSourcesBuildPhase section */
967961
011F6DE9259EF16400BED22E /* Sources */ = {
968962
isa = PBXSourcesBuildPhase;
@@ -1040,7 +1034,6 @@
10401034
01ED197B2A037B9E00CD4735 /* AppTabView.swift in Sources */,
10411035
0110A1612AC81978003EDCBA /* ResendConfirmationInstructionsView.swift in Sources */,
10421036
01D85BA72E081C6D00A95798 /* ScanViewModel.swift in Sources */,
1043-
01E0A62225BD4A7800298D35 /* Shopkeeper+Backdoor.swift in Sources */,
10441037
0106413C29A9EDFF00B46FED /* AccountPasswordRequest.swift in Sources */,
10451038
0172035625A9642E008FD63B /* ShopAdapter.swift in Sources */,
10461039
0172788B2D7D936E00CE424F /* CompletedTag.swift in Sources */,
@@ -1200,6 +1193,7 @@
12001193
MTL_FAST_MATH = YES;
12011194
ONLY_ACTIVE_ARCH = YES;
12021195
SDKROOT = iphoneos;
1196+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
12031197
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
12041198
SWIFT_EMIT_LOC_STRINGS = YES;
12051199
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1262,6 +1256,7 @@
12621256
MTL_ENABLE_DEBUG_INFO = NO;
12631257
MTL_FAST_MATH = YES;
12641258
SDKROOT = iphoneos;
1259+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
12651260
SWIFT_COMPILATION_MODE = wholemodule;
12661261
SWIFT_EMIT_LOC_STRINGS = YES;
12671262
SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -1397,6 +1392,7 @@
13971392
MTL_ENABLE_DEBUG_INFO = NO;
13981393
MTL_FAST_MATH = YES;
13991394
SDKROOT = iphoneos;
1395+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
14001396
SWIFT_COMPILATION_MODE = wholemodule;
14011397
SWIFT_EMIT_LOC_STRINGS = YES;
14021398
SWIFT_OPTIMIZATION_LEVEL = "-O";

NativeAppTemplate.xcodeproj/xcshareddata/xcschemes/NativeAppTemplate.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1640"
3+
LastUpgradeVersion = "2630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

NativeAppTemplate/Constants.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ extension String {
211211
static let passwordUpdatedError = "There was a problem updating the password."
212212

213213
static let sentResetPasswordInstruction =
214-
"An email has been sent the email containing instructions for resetting your password."
214+
"If your email address exists in our database, you will receive a password recovery link " +
215+
"at your email address in a few minutes."
215216
static let sentResetPasswordInstructionError = "Unable to find user with the email."
216217

217218
static let sentConfirmationInstruction =

NativeAppTemplate/Sessions/SessionController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import Observation
6868
init(loginRepository: LoginRepositoryProtocol) {
6969
self.loginRepository = loginRepository
7070

71-
let shopkeeper = Shopkeeper.backdoor ?? loginRepository.currentShopkeeper
71+
let shopkeeper = loginRepository.currentShopkeeper
7272
let token = shopkeeper?.token ?? ""
7373
let tokenClient = shopkeeper?.client ?? ""
7474
let expiry = shopkeeper?.expiry ?? ""

NativeAppTemplate/Sessions/Shopkeeper+Backdoor.swift

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)