Taking out a Few Lines of Code

Lee Cavazos · Lee Cavazos · commit ddc196a84e72 · 2024-08-05T16:27:21.000-05:00
diff --git a/Zephyr.Directory.Ldap/LdapServer.cs b/Zephyr.Directory.Ldap/LdapServer.cs
@@ -250,9 +250,6 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                     parsed_string = nextTokenStr.Split("-");
                     nextToken = Utils.Base64ToBytes(parsed_string[0]);
                     Pick_up_Here = Int32.Parse(parsed_string[1]);
-                    if(Pick_up_Here == 0){
-                        Pick_up_Here = 1;
-                    }
                 }
                 
             }
@@ -457,6 +454,7 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                                         }
                                     }
                                     else{
+                                        // Logic to help determine the next Client Based Token
                                         if(Token_present)
                                             continue_token = $"-0{iteration}";
                                         else{
@@ -563,12 +561,8 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                 if (nextToken != null && nextToken.Length > 0)
                     if (iteration >= 1 && string.IsNullOrEmpty(PossibleNextToken))
                         response.NextToken = String.Concat(Utils.BytesToBase64(nextToken), String.Concat("-", iteration.ToString()));
-                    else{
-                        if(TokenType == "Client")
-                            response.NextToken = Utils.BytesToBase64(nextToken);
-                        else
-                            response.NextToken = String.Concat(Utils.BytesToBase64(nextToken), String.Concat("-", iteration.ToString()));
-                    }
+                    else
+                        response.NextToken = Utils.BytesToBase64(nextToken);
             }
             catch (Exception e)
             {

Original file line number	Diff line number	Diff line change
`@@ -250,9 +250,6 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search`
`250`	`250`	`parsed_string = nextTokenStr.Split("-");`
`251`	`251`	`nextToken = Utils.Base64ToBytes(parsed_string[0]);`
`252`	`252`	`Pick_up_Here = Int32.Parse(parsed_string[1]);`
`253`		`- if(Pick_up_Here == 0){`
`254`		`- Pick_up_Here = 1;`
`255`		`- }`
`256`	`253`	`}`
`257`	`254`
`258`	`255`	`}`
`@@ -457,6 +454,7 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search`
`457`	`454`	`}`
`458`	`455`	`}`
`459`	`456`	`else{`
	`457`	`+ // Logic to help determine the next Client Based Token`
`460`	`458`	`if(Token_present)`
`461`	`459`	`continue_token = $"-0{iteration}";`
`462`	`460`	`else{`
`@@ -563,12 +561,8 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search`
`563`	`561`	`if (nextToken != null && nextToken.Length > 0)`
`564`	`562`	`if (iteration >= 1 && string.IsNullOrEmpty(PossibleNextToken))`
`565`	`563`	`response.NextToken = String.Concat(Utils.BytesToBase64(nextToken), String.Concat("-", iteration.ToString()));`
`566`		`- else{`
`567`		`- if(TokenType == "Client")`
`568`		`- response.NextToken = Utils.BytesToBase64(nextToken);`
`569`		`- else`
`570`		`- response.NextToken = String.Concat(Utils.BytesToBase64(nextToken), String.Concat("-", iteration.ToString()));`
`571`		`- }`
	`564`	`+ else`
	`565`	`+ response.NextToken = Utils.BytesToBase64(nextToken);`
`572`	`566`	`}`
`573`	`567`	`catch (Exception e)`
`574`	`568`	`{`