omniauth-bungie-oauth2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902e8466e478598129f2cfaddf9be23a7c208ae9
-  data.tar.gz: 3dd6a9d0b761309041f052b6d6a51019c37891e3
+  metadata.gz: c61ec53e71ca799b4ca1b7d81e660c2e66420af2
+  data.tar.gz: '080e78001f67eacdc86d5e606673f67c128b3eb9'
 SHA512:
-  metadata.gz: d622358e21d6ea2cdc0c250cc78f0202f2ac399cd369baa4bc8e83d09b7cc31f28172001b09645ec8436d7745e706a60c5047a136b1301ef970647d3d096529a
-  data.tar.gz: 6a8b7d04d85dfc5fd84e6d02705588337b8c911d7393a8925bb2e89e9c6a3a7826ae5fff625705a564af47927144da973b47d40259a4de971fb2bc24c30ba343
+  metadata.gz: e2523fa010311c7786fbfad35b4ca2d13f207c8e47023ae8d53e64b5f4ee609ce6f257fcb13c682258302b76364439ebe691819216dd705a3ad959d495c72539
+  data.tar.gz: e4781cfe6382f59ec9d9d77a8a7737ce928559850e4a657928fec2536f84eb0466063e7124a2b0fa2d0d9ce45ab908c071b562f097913b04d997303cbd605cab

data/.gitignore

@@ -8,4 +8,6 @@
 /spec/reports/
 /tmp/
 .idea
-.gem
+*.gem
+.rspec
+.tags

data/README.md

@@ -1,5 +1,8 @@
 # Omniauth::Bungie::Oauth2
 
+[![Gem Version](https://badge.fury.io/rb/omniauth-bungie-oauth2.svg)](https://badge.fury.io/rb/omniauth-bungie-oauth2)
+[![Build Status](https://travis-ci.org/RuBAN-GT/omniauth-bungie-oauth2.svg?branch=master)](https://travis-ci.org/RuBAN-GT/omniauth-bungie-oauth2)
+
 A Bungie OAuth2 strategy for Omniauth.
 
 ## Installation

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "bungie_client"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/omniauth/strategies/bungie.rb

@@ -26,6 +26,13 @@ module OmniAuth
         end
       end
 
+      def merge_stack(stack)
+        stack.inject({}) do |a, e|
+          a.merge!(e) unless e.nil?
+          a
+        end
+      end
+
       # Updated callback phase with new refreshing
       def callback_phase
         error = request.params["error_reason"] || request.params["error"]
@@ -39,6 +46,7 @@ module OmniAuth
           self.access_token = access_token.refresh!(token_params) if access_token.expired?
 
           env['omniauth.auth'] = auth_hash
+
           call_app!
         end
       rescue ::OAuth2::Error, CallbackError => e
@@ -74,13 +82,22 @@ module OmniAuth
       # Get important data
       uid { raw_info.dig('bungieNetUser', 'membershipId') }
       info do
-        destiny = raw_info['destinyAccounts']&.first
+        if raw_info['destinyAccounts'].any?
+          destiny = raw_info['destinyAccounts'].first
+          {
+            :membership_id => destiny.dig('userInfo', 'membershipId'),
+            :membership_type => destiny.dig('userInfo', 'membershipType'),
+            :display_name => destiny.dig('userInfo', 'displayName')
+          }
+        else
+          destiny = raw_info['bungieNetUser']
 
-        {
-          :membership_id => destiny.dig('userInfo', 'membershipId'),
-          :membership_type => destiny.dig('userInfo', 'membershipType'),
-          :display_name => destiny.dig('userInfo', 'displayName')
-        } unless destiny.nil?
+          {
+            :membership_id => destiny['membershipId'],
+            :membership_type => 254,
+            :display_name => destiny['displayName']
+          }
+        end
       end
       extra do
         {

data/lib/omniauth-bungie-oauth2/version.rb

@@ -1,5 +1,5 @@
-module Omniauth
+module OmniAuth
   module BungieOauth2
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/omniauth-bungie-oauth2.gemspec

@@ -5,7 +5,7 @@ require 'omniauth-bungie-oauth2/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'omniauth-bungie-oauth2'
-  spec.version       = Omniauth::BungieOauth2::VERSION
+  spec.version       = OmniAuth::BungieOauth2::VERSION
   spec.authors       = ['Dmitry Ruban']
   spec.email         = ['dkruban@gmail.com']
 
@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split("\n")
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'

data/spec/omniauth/strategies/bungie_oauth2_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
+require 'omniauth-bungie-oauth2/version'
 require 'omniauth-bungie-oauth2'
 
-describe Omniauth::Strategies::Bungie do
+describe OmniAuth::Strategies::Bungie do
   it "has a version number" do
-    expect(Omniauth::BungieOauth2::VERSION).not_to be nil
-  end
-
-  it "does something useful" do
-    expect(false).to eq(true)
+    expect(OmniAuth::BungieOauth2::VERSION).not_to be nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-bungie-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitry Ruban
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,6 +155,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - lib/oauth2/bungie_access_token.rb
 - lib/oauth2/bungie_client.rb
 - lib/omniauth-bungie-oauth2.rb