Skip to content

Commit 24c9cba

Browse files
authored
[Auth] Revert reCAPTCHA integration PRs (#11617)
Reverted reCAPTCHA <-> Auth integration PRs (#11231, #11606, #11609, #11610) due to an issue with the zip build.
1 parent 4084532 commit 24c9cba

File tree

53 files changed

+191
-2500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+191
-2500
lines changed

CoreOnly/NOTICES

Lines changed: 0 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,210 +2178,6 @@ More information at <a href="http://landonf.org/2009/02/index.html">Landon
21782178
Fuller's blog</a>
21792179

21802180

2181-
RecaptchaInterop
2182-
2183-
Apache License
2184-
Version 2.0, January 2004
2185-
http://www.apache.org/licenses/
2186-
2187-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
2188-
2189-
1. Definitions.
2190-
2191-
"License" shall mean the terms and conditions for use, reproduction,
2192-
and distribution as defined by Sections 1 through 9 of this document.
2193-
2194-
"Licensor" shall mean the copyright owner or entity authorized by
2195-
the copyright owner that is granting the License.
2196-
2197-
"Legal Entity" shall mean the union of the acting entity and all
2198-
other entities that control, are controlled by, or are under common
2199-
control with that entity. For the purposes of this definition,
2200-
"control" means (i) the power, direct or indirect, to cause the
2201-
direction or management of such entity, whether by contract or
2202-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
2203-
outstanding shares, or (iii) beneficial ownership of such entity.
2204-
2205-
"You" (or "Your") shall mean an individual or Legal Entity
2206-
exercising permissions granted by this License.
2207-
2208-
"Source" form shall mean the preferred form for making modifications,
2209-
including but not limited to software source code, documentation
2210-
source, and configuration files.
2211-
2212-
"Object" form shall mean any form resulting from mechanical
2213-
transformation or translation of a Source form, including but
2214-
not limited to compiled object code, generated documentation,
2215-
and conversions to other media types.
2216-
2217-
"Work" shall mean the work of authorship, whether in Source or
2218-
Object form, made available under the License, as indicated by a
2219-
copyright notice that is included in or attached to the work
2220-
(an example is provided in the Appendix below).
2221-
2222-
"Derivative Works" shall mean any work, whether in Source or Object
2223-
form, that is based on (or derived from) the Work and for which the
2224-
editorial revisions, annotations, elaborations, or other modifications
2225-
represent, as a whole, an original work of authorship. For the purposes
2226-
of this License, Derivative Works shall not include works that remain
2227-
separable from, or merely link (or bind by name) to the interfaces of,
2228-
the Work and Derivative Works thereof.
2229-
2230-
"Contribution" shall mean any work of authorship, including
2231-
the original version of the Work and any modifications or additions
2232-
to that Work or Derivative Works thereof, that is intentionally
2233-
submitted to Licensor for inclusion in the Work by the copyright owner
2234-
or by an individual or Legal Entity authorized to submit on behalf of
2235-
the copyright owner. For the purposes of this definition, "submitted"
2236-
means any form of electronic, verbal, or written communication sent
2237-
to the Licensor or its representatives, including but not limited to
2238-
communication on electronic mailing lists, source code control systems,
2239-
and issue tracking systems that are managed by, or on behalf of, the
2240-
Licensor for the purpose of discussing and improving the Work, but
2241-
excluding communication that is conspicuously marked or otherwise
2242-
designated in writing by the copyright owner as "Not a Contribution."
2243-
2244-
"Contributor" shall mean Licensor and any individual or Legal Entity
2245-
on behalf of whom a Contribution has been received by Licensor and
2246-
subsequently incorporated within the Work.
2247-
2248-
2. Grant of Copyright License. Subject to the terms and conditions of
2249-
this License, each Contributor hereby grants to You a perpetual,
2250-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
2251-
copyright license to reproduce, prepare Derivative Works of,
2252-
publicly display, publicly perform, sublicense, and distribute the
2253-
Work and such Derivative Works in Source or Object form.
2254-
2255-
3. Grant of Patent License. Subject to the terms and conditions of
2256-
this License, each Contributor hereby grants to You a perpetual,
2257-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
2258-
(except as stated in this section) patent license to make, have made,
2259-
use, offer to sell, sell, import, and otherwise transfer the Work,
2260-
where such license applies only to those patent claims licensable
2261-
by such Contributor that are necessarily infringed by their
2262-
Contribution(s) alone or by combination of their Contribution(s)
2263-
with the Work to which such Contribution(s) was submitted. If You
2264-
institute patent litigation against any entity (including a
2265-
cross-claim or counterclaim in a lawsuit) alleging that the Work
2266-
or a Contribution incorporated within the Work constitutes direct
2267-
or contributory patent infringement, then any patent licenses
2268-
granted to You under this License for that Work shall terminate
2269-
as of the date such litigation is filed.
2270-
2271-
4. Redistribution. You may reproduce and distribute copies of the
2272-
Work or Derivative Works thereof in any medium, with or without
2273-
modifications, and in Source or Object form, provided that You
2274-
meet the following conditions:
2275-
2276-
(a) You must give any other recipients of the Work or
2277-
Derivative Works a copy of this License; and
2278-
2279-
(b) You must cause any modified files to carry prominent notices
2280-
stating that You changed the files; and
2281-
2282-
(c) You must retain, in the Source form of any Derivative Works
2283-
that You distribute, all copyright, patent, trademark, and
2284-
attribution notices from the Source form of the Work,
2285-
excluding those notices that do not pertain to any part of
2286-
the Derivative Works; and
2287-
2288-
(d) If the Work includes a "NOTICE" text file as part of its
2289-
distribution, then any Derivative Works that You distribute must
2290-
include a readable copy of the attribution notices contained
2291-
within such NOTICE file, excluding those notices that do not
2292-
pertain to any part of the Derivative Works, in at least one
2293-
of the following places: within a NOTICE text file distributed
2294-
as part of the Derivative Works; within the Source form or
2295-
documentation, if provided along with the Derivative Works; or,
2296-
within a display generated by the Derivative Works, if and
2297-
wherever such third-party notices normally appear. The contents
2298-
of the NOTICE file are for informational purposes only and
2299-
do not modify the License. You may add Your own attribution
2300-
notices within Derivative Works that You distribute, alongside
2301-
or as an addendum to the NOTICE text from the Work, provided
2302-
that such additional attribution notices cannot be construed
2303-
as modifying the License.
2304-
2305-
You may add Your own copyright statement to Your modifications and
2306-
may provide additional or different license terms and conditions
2307-
for use, reproduction, or distribution of Your modifications, or
2308-
for any such Derivative Works as a whole, provided Your use,
2309-
reproduction, and distribution of the Work otherwise complies with
2310-
the conditions stated in this License.
2311-
2312-
5. Submission of Contributions. Unless You explicitly state otherwise,
2313-
any Contribution intentionally submitted for inclusion in the Work
2314-
by You to the Licensor shall be under the terms and conditions of
2315-
this License, without any additional terms or conditions.
2316-
Notwithstanding the above, nothing herein shall supersede or modify
2317-
the terms of any separate license agreement you may have executed
2318-
with Licensor regarding such Contributions.
2319-
2320-
6. Trademarks. This License does not grant permission to use the trade
2321-
names, trademarks, service marks, or product names of the Licensor,
2322-
except as required for reasonable and customary use in describing the
2323-
origin of the Work and reproducing the content of the NOTICE file.
2324-
2325-
7. Disclaimer of Warranty. Unless required by applicable law or
2326-
agreed to in writing, Licensor provides the Work (and each
2327-
Contributor provides its Contributions) on an "AS IS" BASIS,
2328-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
2329-
implied, including, without limitation, any warranties or conditions
2330-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
2331-
PARTICULAR PURPOSE. You are solely responsible for determining the
2332-
appropriateness of using or redistributing the Work and assume any
2333-
risks associated with Your exercise of permissions under this License.
2334-
2335-
8. Limitation of Liability. In no event and under no legal theory,
2336-
whether in tort (including negligence), contract, or otherwise,
2337-
unless required by applicable law (such as deliberate and grossly
2338-
negligent acts) or agreed to in writing, shall any Contributor be
2339-
liable to You for damages, including any direct, indirect, special,
2340-
incidental, or consequential damages of any character arising as a
2341-
result of this License or out of the use or inability to use the
2342-
Work (including but not limited to damages for loss of goodwill,
2343-
work stoppage, computer failure or malfunction, or any and all
2344-
other commercial damages or losses), even if such Contributor
2345-
has been advised of the possibility of such damages.
2346-
2347-
9. Accepting Warranty or Additional Liability. While redistributing
2348-
the Work or Derivative Works thereof, You may choose to offer,
2349-
and charge a fee for, acceptance of support, warranty, indemnity,
2350-
or other liability obligations and/or rights consistent with this
2351-
License. However, in accepting such obligations, You may act only
2352-
on Your own behalf and on Your sole responsibility, not on behalf
2353-
of any other Contributor, and only if You agree to indemnify,
2354-
defend, and hold each Contributor harmless for any liability
2355-
incurred by, or claims asserted against, such Contributor by reason
2356-
of your accepting any such warranty or additional liability.
2357-
2358-
END OF TERMS AND CONDITIONS
2359-
2360-
APPENDIX: How to apply the Apache License to your work.
2361-
2362-
To apply the Apache License to your work, attach the following
2363-
boilerplate notice, with the fields enclosed by brackets "[]"
2364-
replaced with your own identifying information. (Don't include
2365-
the brackets!) The text should be enclosed in the appropriate
2366-
comment syntax for the file format. We also recommend that a
2367-
file or class name and description of purpose be included on the
2368-
same "printed page" as the copyright notice for easier
2369-
identification within third-party archives.
2370-
2371-
Copyright [yyyy] [name of copyright owner]
2372-
2373-
Licensed under the Apache License, Version 2.0 (the "License");
2374-
you may not use this file except in compliance with the License.
2375-
You may obtain a copy of the License at
2376-
2377-
http://www.apache.org/licenses/LICENSE-2.0
2378-
2379-
Unless required by applicable law or agreed to in writing, software
2380-
distributed under the License is distributed on an "AS IS" BASIS,
2381-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2382-
See the License for the specific language governing permissions and
2383-
limitations under the License.
2384-
23852181
SwiftProtobuf
23862182
Apache License
23872183
Version 2.0, January 2004

FirebaseAuth.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
5757
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.8'
5858
s.dependency 'GoogleUtilities/Environment', '~> 7.8'
5959
s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
60-
s.ios.dependency 'RecaptchaInterop', '~> 18.2.0'
60+
6161
s.test_spec 'unit' do |unit_tests|
6262
unit_tests.scheme = { :code_coverage => true }
6363
# Unit tests can't run on watchOS.

FirebaseAuth/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 10.13.0
2-
- [added] Added reCAPTCHA verification support in email authentication flows. (#11231)
32
- [fixed] Fixed a compilation error regression introduced in 10.12.0 building iOS App Extensions. (#11537)
43

54
# 10.12.0

0 commit comments

Comments
 (0)