Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase upstream #5

Closed
wants to merge 110 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
e4a5a2d
Update dependencies and version
doomspork Jul 18, 2017
67ef990
Add OSX and vim files to ignore
doomspork Jul 18, 2017
c215a14
fixes crash on regular OAuth callback errors (#41)
evadne Sep 1, 2017
3a7949f
Fix CaseClauseError in fetch_user for {:error, Response} tuple (#43)
davydog187 Nov 17, 2017
c751fb0
Release 0.7
doomspork Nov 17, 2017
3f5c126
Corrected "email" scope. (#46)
cgorshing Jan 8, 2018
453e52a
Update README.md (#47)
cgorshing Feb 26, 2018
5a79321
replaced deprecated approval_prompt with prompt (#51)
venkatd Apr 25, 2018
6b88c9f
Fixed redirect_uri from config (#55)
henb Jun 21, 2018
c191686
Release 0.8
doomspork Dec 19, 2018
26e2a44
TravisCI minimal config for Elixir projects using Elixir ~>1.3 (#54)
Grantimus9 Dec 19, 2018
b696c6d
Update release version in README (#57)
carpodaster Jan 3, 2019
88b9ae8
Amended oAuth strategy to resolve m/f/a tuples (#60)
evadne Mar 9, 2019
ad0a110
Added information about reading client_id/client_secret from MFA to t…
mspanc Mar 14, 2019
e4a3728
Merge pull request #62 from mspanc/master
yordis Mar 14, 2019
c0ff1cb
Set json library on OAuth2
snewcomer Jan 5, 2019
4351403
use json_library hook. Need new release of ueberauth with new hooks
snewcomer Jan 6, 2019
a728ae4
Update to latest ueberauth and oauth2
snewcomer Mar 15, 2019
6c1b383
removed unused deps from lockfile
snewcomer Mar 15, 2019
381bc29
remove space
snewcomer Mar 15, 2019
34fe5dc
Revert "remove space"
snewcomer Mar 15, 2019
6525cb8
actually use json_library method
snewcomer Mar 15, 2019
0aa46b1
Merge pull request #58 from snewcomer/sn/oauth-register-serializer
yordis Mar 15, 2019
c2cc703
Add support for optional login_hint param
andykent Jul 7, 2019
ecc0cf3
add birthday
foxtrod Aug 1, 2019
41ba33f
change mix
foxtrod Aug 2, 2019
17b7c9d
Merge pull request #61 from andykent/login-hint
yordis Aug 3, 2019
dee3f5b
Fix markdown
yordis Aug 3, 2019
3feed4b
Bump version and add changelog
yordis Aug 3, 2019
98d3e73
Fix elixir versions
yordis Aug 5, 2019
1456715
Allow newest oauth2 client with security fixes
PragTob Aug 21, 2019
9200724
travis please?
PragTob Aug 21, 2019
dcf016e
newer elixir versions so travis doesnt fail
PragTob Aug 21, 2019
76577e2
Merge pull request #68 from PragTob/allow-newest-oauth2
yordis Aug 21, 2019
501c430
Merge branch 'master' into yordis/releasing
yordis Aug 21, 2019
ba188d3
Merge pull request #66 from ueberauth/yordis/releasing
yordis Aug 21, 2019
e7d8e2c
Fix deps
yordis Aug 21, 2019
29028cd
Merge branch 'yordis/releasing'
yordis Aug 21, 2019
997375a
Include version badge in README
PragTob Aug 21, 2019
2dc1592
Merge pull request #69 from PragTob/patch-1
yordis Aug 21, 2019
bec7fa7
`hd:` doesn't limit login to a domain but only suggests it
PragTob Aug 23, 2019
d441f2e
Merge pull request #70 from PragTob/fix-hd-docs
yordis Aug 23, 2019
fd69ba6
Added OAuth version relaxation to Changelog
PragTob Aug 24, 2019
b8593fa
Merge pull request #71 from PragTob/patch-1
yordis Aug 25, 2019
be8de6f
change mix
foxtrod Oct 23, 2019
0e8da6e
Allow the userinfo endpoint to be configured via options. This is use…
mpinkston Feb 28, 2020
174cba0
added tests
mpinkston Mar 5, 2020
50956cc
tweak for elixir < 1.9 compatibility
mpinkston Mar 5, 2020
6a430de
Merge pull request #75 from tablecheck/userinfo-endpoint
Hanspagh Mar 5, 2020
b3c95fa
update ueberauth dep
Hanspagh Mar 5, 2020
4e0c985
Merge branch 'master' into master
Hanspagh Mar 5, 2020
c9ef791
use version 0.6.3
Hanspagh Mar 5, 2020
3b43145
Merge pull request #73 from foxtrod/master
Hanspagh Mar 6, 2020
b6686fb
Update lock version of plug and ueberauth
ramortegui Apr 16, 2020
194a34b
Update docs to match current version of the app
ramortegui Apr 16, 2020
af3138e
Merge pull request #76 from ramortegui/version-updates
Hanspagh May 11, 2020
9abed05
Add support for optional include_granted_scopes param
mdlkxzmcp Aug 21, 2020
cd1aa7f
Merge pull request #79 from mdlkxzmcp/incremental_auth
Hanspagh Oct 20, 2020
2e5df9d
release 0.10.0
Hanspagh Oct 20, 2020
b2088d1
Misc doc changes
kianmeng Apr 1, 2021
ea1e292
Merge pull request #81 from kianmeng/misc-doc-changes
yordis Apr 1, 2021
abeb907
upgrade ueberauth to 0.7.0 + refactor state param logic so it's compa…
Jul 15, 2021
79090d2
mix format
Jul 15, 2021
dea2497
Merge pull request #82 from greg-rychlewski/master
yordis Jul 15, 2021
1b830f6
Versioning
yordis Jul 15, 2021
ee6f9dd
Update version
yordis Jul 16, 2021
e38f39b
Remove :applications instructions from readme
axelson Sep 8, 2021
7fd849a
Merge pull request #85 from axelson/remove-applications-instructions
yordis Sep 10, 2021
facf8b7
chore: add workflows
yordis Oct 17, 2021
4d06272
Merge branch 'master' of github.com:ueberauth/ueberauth_google
yordis Oct 17, 2021
65e506b
chore: fix ci
yordis Oct 17, 2021
becc953
chore: fix credo
yordis Oct 17, 2021
adf5907
fix crash on not handled Oauth2.Error
lukaszsamson Dec 29, 2021
3e7c319
Merge pull request #88 from lukaszsamson/master
Hanspagh Apr 7, 2022
3b8ee40
import Config to fix warning
wkirschbaum May 21, 2022
c2b86b9
Allow ueberauth 0.9
wkirschbaum May 21, 2022
720d9a4
Run mix format
wkirschbaum May 24, 2022
4f301e2
Merge pull request #92 from floatpays/master
yordis May 24, 2022
b0cff0a
Updated ueberauth to 0.10
asliwka-jobvalley Jul 8, 2022
341b289
Merge pull request #93 from asliwka-jobvalley/master
yordis Jul 8, 2022
0d264f0
Prefer local configuration over global configuration
aj-foster Sep 8, 2022
d2f890c
Merge pull request #95 from codesandbox/draft/gracious-andras
yordis Sep 23, 2022
f69d03d
chore: add changelog
yordis Sep 23, 2022
e083a8d
Use erlef/setup-beam and bump GHA versions
kianmeng Nov 14, 2022
fdd44cd
Merge pull request #96 from kianmeng/use-erlef-setup-beam-and-bump-gha
yordis Nov 14, 2022
ca133dd
Handle 503 response with no error_description
angelikatyborska Aug 2, 2023
195c6e5
Use the real life error code in test
angelikatyborska Aug 3, 2023
f7b9328
Fix erlang version not found in version list on CI
angelikatyborska Aug 3, 2023
829ea97
Add entry to CHANGELOG
angelikatyborska Aug 3, 2023
cb74966
Merge pull request #100 from angelikatyborska/fix-erlang-version-not-…
yordis Aug 3, 2023
231fbac
Merge branch 'master' into handle-503-response-with-no-error-description
yordis Aug 3, 2023
2013403
Merge pull request #99 from angelikatyborska/handle-503-response-with…
yordis Aug 3, 2023
a430ec7
versioning
yordis Aug 3, 2023
14d3682
Add the option to get the client secret dynamically
alejandrodevs Sep 19, 2023
a4c9875
Add unit tests for dynamic client secret generation
alejandrodevs Sep 20, 2023
be040ed
Add sync true in tests for OAuth module
alejandrodevs Sep 20, 2023
78e5db0
Update CHANGELOG and bumping package version
alejandrodevs Sep 20, 2023
34a6652
Improve a little bit the codebase
alejandrodevs Sep 20, 2023
fcfc954
Merge pull request #101 from alejandrodevs/master
yordis Sep 20, 2023
6981399
Add support to hl param in handle_request
alejandrodevs Sep 25, 2023
91784d8
Bump application version and add entry in the changelog
alejandrodevs Sep 25, 2023
ad1de54
Merge pull request #102 from alejandrodevs/master
yordis Sep 25, 2023
9302f16
Add support for access_token callback
antonmedv May 18, 2017
dda067f
Add google verification for apps id_token
antonmedv Jun 13, 2017
080ebe4
Add empty access token
antonmedv Jun 13, 2017
f0340b0
Fix typo
antonmedv Jun 13, 2017
f049df9
dev(): wrong aud error message added
nikitabulatov Aug 27, 2018
b0d0a6c
Use dynamic env and remove unused deps
Bassov May 6, 2020
9c01cf9
Add webview param to auth url
JulieNikitina Apr 13, 2022
35252c7
Merge branch 'master' into rebase-upstream
maxp36 Oct 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .formatter.exs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Used by "mix format"
[
inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
line_length: 120
]
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Order is important. The last matching pattern takes the most precedence.
# Default owners for everything in the repo.
* @ueberauth/developers
51 changes: 51 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Continuous Integration

on:
pull_request:
types: [opened, reopened, synchronize]
push:
branches:
- 'master'
jobs:
Test:
runs-on: ubuntu-20.04
steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up Elixir
uses: erlef/setup-beam@v1
with:
elixir-version: '1.11'
otp-version: '22.3'

- name: Install Dependencies
run: |
mix local.rebar --force
mix local.hex --force
mix deps.get
- name: Run Tests
run: mix test

Linting:
runs-on: ubuntu-20.04
steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up Elixir
uses: erlef/setup-beam@v1
with:
elixir-version: '1.11'
otp-version: '22.3'

- name: Install Dependencies
run: |
mix local.rebar --force
mix local.hex --force
mix deps.get
- name: Run Formatter
run: mix format --check-formatted

- name: Run Credo
run: mix credo
32 changes: 32 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Hexpm Release

on:
release:
types: [published]

jobs:
publish:
name: Publish
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Set up Elixir
uses: erlef/setup-beam@v1
with:
elixir-version: '1.11'
otp-version: '22.3'
- name: Restore dependencies cache
uses: actions/cache@v3
with:
path: deps
key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }}
restore-keys: ${{ runner.os }}-mix-
- name: Install dependencies
run: |
mix local.rebar --force
mix local.hex --force
mix deps.get
- name: Run Hex Publish
run: mix hex.publish --yes
env:
HEX_API_KEY: ${{ secrets.HEX_API_KEY }}
55 changes: 54 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,58 @@

# Created by https://www.gitignore.io/api/elixir,osx,vim

### Elixir ###
/_build
/cover
/deps
/tmp
/.fetch
erl_crash.dump
ueberauth_google-*.tar
*.ez
.idea
*.beam

### Elixir Patch ###
/doc
### OSX ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Vim ###
# swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session
Session.vim
# temporary
.netrwhist
*~
# auto-generated tag files
tags

# End of https://www.gitignore.io/api/elixir,osx,vim
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: elixir

cache:
directories:
- ~/.hex
- ~/.mix
- deps

elixir:
- '1.8'
- '1.9'

script:
- mix test
72 changes: 59 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,68 @@
# v 0.6.0
# Changelog

* Add support for access_type per request using url parameter
## (Unreleased)

# v 0.5.0
## v0.12.0

* Add support for new params: access_type, approval_prompt, state.
* Fix Elixir warnings
* Add support to hl param in handle_request! [102](https://github.com/ueberauth/ueberauth_google/pull/102)

# v 0.4.0
## v0.11.0

* Target Elixir 1.3 and greater
* Fix OAuth bug with 0.6.0 pin
* Allow using a function to generate the client secret [101](https://github.com/ueberauth/ueberauth_google/pull/101)

# v 0.3.0
## v0.10.3

* Use OpenID endpoint for profile information
* Update authorize and token URLs
* Handle `%OAuth2.Response{status_code: 503}` with no `error_description` in `get_access_token` [99](https://github.com/ueberauth/ueberauth_google/pull/99)

# v 0.2.0
## v0.10.2

* Release 0.2.0 to follow Ueberauth
* Prefer Local Over Global Configuration [95](https://github.com/ueberauth/ueberauth_google/pull/95)

## v0.10.1

* Misc doc changes [81](https://github.com/ueberauth/ueberauth_google/pull/81)
* Upgrade Ueberauth and Refactor CSRF State Logic [82](https://github.com/ueberauth/ueberauth_google/pull/82)

## v0.10.0 - 2020-10-20

### Enhancement

* Updated docs [#69](https://github.com/ueberauth/ueberauth_google/pull/69) [#70](https://github.com/ueberauth/ueberauth_google/pull/70)
* Support for birthday [#73](https://github.com/ueberauth/ueberauth_google/pull/73)
* Allow for userinfo endpoint to be configured [#75](https://github.com/ueberauth/ueberauth_google/pull/75)
* Updated plug and ueberauth packages [#76](https://github.com/ueberauth/ueberauth_google/pull/76)

Thanks goes to all the contributes

## v0.9.0 - 2019-08-21

### Enhancement

* Add support for optional login_hint param [#61](https://github.com/ueberauth/ueberauth_google/pull/61)
* Use `json_library` method from Ueberauth config [#58](https://github.com/ueberauth/ueberauth_google/pull/58)
* Allows specifying `{m, f, a}` tuples for things such as Client ID
and Client Secret [#60](https://github.com/ueberauth/ueberauth_google/pull/60)
* Allows the newest oauth2 package versions with potential security fixes [#68](https://github.com/ueberauth/ueberauth_google/pull/68)

## v0.6.0 - 2017-07-18

* Add support for `access_type` per request using `url` parameter.

## v0.5.0 - 2016-12-27

* Add support for new params: `access_type`, `approval_prompt`, `state`.
* Fix Elixir warnings.

## v0.4.0 - 2016-09-21

* Target Elixir 1.3 and greater.
* Fix OAuth bug with 0.6.0 pin.

## v0.3.0 - 2016-08-15

* Use OpenID endpoint for profile information.
* Update authorize and token URLs.

## v0.2.0 - 2016-12-10

* Release 0.2.0 to follow Ueberauth.
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Contributing to Ueberauth Google
# Contributing

## Pull Requests Welcome

1. Fork ueberauth_google
2. Create a topic branch
3. Make logically-grouped commits with clear commit messages
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Sean
Copyright (c) 2015 Sean Callan

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

Loading
Loading