System-End/hackatime
1
0
Fork 0
mirror of https://github.com/System-End/hackatime.git synced 2026-04-19 23:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix HCA scopes (#685)

Browse source
This commit is contained in:
Max Wofford 2025-12-03 15:03:21 -05:00 • committed by GitHub
parent 336ae5c944
commit 6fedc362f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/models/user.rb
View file

@ -332,7 +332,7 @@ class User < ApplicationRecord
redirect_uri:,
client_id: ENV["HCA_CLIENT_ID"],
response_type: "code",
scope: "email"
scope: "email slack_id verification_status"
}
URI.parse("#{HCAService.host}/oauth/authorize?#{params.to_query}")
@ -382,23 +382,33 @@ class User < ApplicationRecord
return nil if access_token.nil?
# get user info
identity = ::HCAService.me(access_token)
hca_data = ::HCAService.me(access_token)
identity = hca_data["identity"]
# find by HCA ID
@user = User.find_by_hca_id(identity["id"]) unless identity["id"].blank?
# find by slack_id
@user ||= User.find_by_slack_uid(identity["slack_id"]) unless identity["slack_id"].blank?
# find by email
@user ||= begin
EmailAddress.find_by(email: identity["email"])&.user unless identity["email"].blank?
EmailAddress.find_by(email: identity["primary_email"])&.user unless identity["primary_email"].blank?
end
# update scopes if user exists
@user.update(hca_scopes: identity["scopes"], hca_id: identity["id"]) if @user
# update scopes etc if user exists
@user.update(
hca_scopes: hca_data["scopes"],
hca_id: identity["id"],
hca_access_token: access_token
) if !!@user
# if no user, create one
@user ||= begin
u = User.create!(hca_id: identity["id"], slack_uid: identity["slack_id"], hca_scopes: identity["scopes"])
EmailAddress.create!(email: identity["email"], user: u) unless identity["email"].blank?
u = User.create!(
hca_id: identity["id"],
slack_uid: identity["slack_id"],
hca_scopes: hca_data["scopes"],
hca_access_token: access_token,
)
EmailAddress.create!(email: identity["primary_email"], user: u) unless identity["primary_email"].blank?
u
end
end