[DLVR-6993] merge upstream

.formatter.exs

@@ -0,0 +1,4 @@
+# Used by "mix format"
+[
+  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+]

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Order is important. The last matching pattern takes the most precedence.
+# Default owners for everything in the repo.
+* @ueberauth/developers

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: sobolevn

.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: Continuous Integration
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  push:
+    branches:
+      - 'master'
+jobs:
+  Test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v1
+
+      - name: Set up Elixir
+        uses: erlef/setup-elixir@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-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v1
+
+      - name: Set up Elixir
+        uses: erlef/setup-elixir@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

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Hexpm Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Elixir
+      uses: erlef/setup-elixir@v1
+      with:
+        elixir-version: '1.11'
+        otp-version: '22.3'
+    - name: Restore dependencies cache
+      uses: actions/cache@v2
+      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 }}

.tool-versions

@@ -0,0 +1,2 @@
+erlang 23.2.3
+elixir 1.11

.travis.yml

@@ -3,18 +3,19 @@ language: elixir
 sudo: false
 
 elixir:
-  - 1.2
-  - 1.3
+  - 1.6
+  - 1.5
   - 1.4
 
 otp_release:
-  - 17.4
-  - 18.1
+  - 20.3
+  - 19.3
 
 env: MIX_ENV=test
 
 script:
-  - mix coveralls.travis && mix credo --strict
+  - mix credo --strict
+  - mix coveralls.travis
 
 notifications:
   email: false

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v0.4.0
+
+* Fixes VK API version
+
+## v0.3.1
+
+* Fixes docs generation
+
+## v0.3.0
+
+* Updates requirements versions
+* Fixes failing tests
+
+## v0.2.4
+
+* Fixes `state` issue, see https://github.com/sobolevn/ueberauth_vk/issues/21
+
+## v0.2.3
+
+* Adds `state` parameter
+
 ## v0.2.2
 
 * Fixed `ex_doc` version

README.md

@@ -6,7 +6,7 @@
 
 ## Requirements
 
-We support `elixir` versions `1.2` and bellow.
+We support `elixir` versions `1.4` and above.
 
 ## Installation
 
@@ -17,7 +17,7 @@ We support `elixir` versions `1.2` and bellow.
     ```elixir
     def deps do
       # installation via hex:
-      [{:ueberauth_vk, "~> 0.2"}]
+      [{:ueberauth_vk, "~> 0.3"}]
       # if you want to use github:
       # [{:ueberauth_vk, github: "sobolevn/ueberauth_vk"}]
     end
@@ -73,11 +73,11 @@ We support `elixir` versions `1.2` and bellow.
 
 For an example implementation see the [Überauth Example](https://github.com/ueberauth/ueberauth_example) application.
 
-## Calling
+## Customizing
 
-Depending on the configured url you can initial the request through: `/auth/vk`
+You can customize [multiple fields](https://vk.com/dev/auth_sites), such as `default_scope`, `default_display`, `default_state`, `profile_fields`, and `uid_field`.
 
-Or with options: `/auth/vk?scope=friends,video,offline`
+### Scope
 
 By default the requested scope is `"public_profile"`. Scope can be configured either explicitly as a `scope` query value on the request path or in your configuration:
 
@@ -88,6 +88,8 @@ config :ueberauth, Ueberauth,
   ]
 ```
 
+### Profile Fields
+
 You can also provide custom fields for user profile:
 
 ```elixir
@@ -99,6 +101,33 @@ config :ueberauth, Ueberauth,
 
 See [VK API Method Reference > User](https://vk.com/dev/users.get) for full list of fields.
 
+### State
+
+You can also set the custom field called [`state`](https://github.com/sobolevn/ueberauth_vk/pull/20). It is used to prevent "man in the middle" attacks.
+
+```elixir
+config :ueberauth, Ueberauth,
+  providers: [
+    vk: {Ueberauth.Strategy.VK, [default_state: "secret-state-value"]}
+  ]
+```
+
+This state will be passed to you in the callback as `/auth/vk?state=<session_id>` and will be available in the success struct.
+
+### UID Field
+
+You can use alternate fields to identify users. For example, you can use `email`.
+
+```elixir
+config :ueberauth, Ueberauth,
+  providers: [
+    vk: {Ueberauth.Strategy.VK, [
+      default_scope: "email",
+      uid_field: :email
+    ]}
+  ]
+```
+
 
 ## License
 

config/config.exs

@@ -17,4 +17,4 @@ use Mix.Config
 #     import_config "#{Mix.env}.exs"
 #     import_config "#{Mix.env}.exs"
 
-if Mix.env == :test, do: import_config "test.exs"
+if Mix.env() == :test, do: import_config("test.exs")

config/test.exs

@@ -2,10 +2,15 @@ use Mix.Config
 
 config :ueberauth, Ueberauth,
   providers: [
-    vk: { Ueberauth.Strategy.VK, [] },
+    vk: {Ueberauth.Strategy.VK, []}
   ]
 
 config :ueberauth, Ueberauth.Strategy.VK.OAuth,
   client_id: "appid",
   client_secret: "secret",
   redirect_uri: "/callback"
+
+config :exvcr,
+  vcr_cassette_library_dir: "test/fixtures/vcr_cassettes"
+
+config :plug, :validate_header_keys_during_test, true