Skip to content

Commit 5feca94

Browse files
authored
Merge pull request #589 from testmycode/api-set-password-handled-by-moocfi
Add api endpoint for setting user password to be handled by moocfi
2 parents d8da21c + 9fb251e commit 5feca94

21 files changed

+297
-307
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: Checkout repository
1313
uses: actions/checkout@v2
14-
with:
14+
with:
1515
submodules: false
1616
- name: Setup git submodules
1717
run: |
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- name: Checkout repository
3131
uses: actions/checkout@v2
32-
with:
32+
with:
3333
submodules: false
3434
- name: Setup git submodules
3535
run: |
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- name: Checkout repository
4949
uses: actions/checkout@v2
50-
with:
50+
with:
5151
submodules: false
5252
- name: Setup git submodules
5353
run: |
@@ -65,7 +65,7 @@ jobs:
6565
steps:
6666
- name: Checkout repository
6767
uses: actions/checkout@v2
68-
with:
68+
with:
6969
submodules: false
7070
- name: Setup git submodules
7171
run: |
@@ -83,7 +83,7 @@ jobs:
8383
steps:
8484
- name: Checkout repository
8585
uses: actions/checkout@v2
86-
with:
86+
with:
8787
submodules: false
8888
- name: Setup git submodules
8989
run: |
@@ -101,7 +101,7 @@ jobs:
101101
steps:
102102
- name: Checkout repository
103103
uses: actions/checkout@v2
104-
with:
104+
with:
105105
submodules: false
106106
- name: Setup git submodules
107107
run: |
@@ -112,4 +112,4 @@ jobs:
112112
- name: Setup database & test env
113113
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
114114
- name: Run spec_integration tests
115-
run: docker compose run web bin/spec_integration
115+
run: docker compose run web bin/spec_integration

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ gem 'bootstrap', '~> 4.6' # Held back to 4.6
1313
gem 'cancancan', '~> 3.6', '>= 3.6.1'
1414
gem 'doorkeeper', '~> 5.7', '>= 5.7.1'
1515
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.9'
16+
gem 'faraday', '~> 2.14'
1617
gem 'file_validators', '~> 3.0' # Used to validate organization logo
1718
gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.8'
18-
gem 'google_drive', '~> 3.0', '>= 3.0.7', require: false
1919
gem 'gravtastic', '~> 3.2', '>= 3.2.6' # Used to display user avatars
2020
gem 'image_processing', '~> 1.12', '>= 1.12.2' # Used by active_storage to make logo 100x100 on the fly
2121
gem 'logstasher', '~> 2.1', '>= 2.1.5'

Gemfile.lock

Lines changed: 10 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ GEM
130130
database_cleaner-core (~> 2.0.0)
131131
database_cleaner-core (2.0.1)
132132
date (3.3.4)
133-
declarative (0.0.20)
134133
diff-lcs (1.5.1)
135134
docile (1.4.1)
136135
domain_name (0.6.20240107)
@@ -148,29 +147,12 @@ GEM
148147
factory_bot_rails (6.4.3)
149148
factory_bot (~> 6.4)
150149
railties (>= 5.0.0)
151-
faraday (1.10.3)
152-
faraday-em_http (~> 1.0)
153-
faraday-em_synchrony (~> 1.0)
154-
faraday-excon (~> 1.1)
155-
faraday-httpclient (~> 1.0)
156-
faraday-multipart (~> 1.0)
157-
faraday-net_http (~> 1.0)
158-
faraday-net_http_persistent (~> 1.0)
159-
faraday-patron (~> 1.0)
160-
faraday-rack (~> 1.0)
161-
faraday-retry (~> 1.0)
162-
ruby2_keywords (>= 0.0.4)
163-
faraday-em_http (1.0.0)
164-
faraday-em_synchrony (1.0.0)
165-
faraday-excon (1.1.0)
166-
faraday-httpclient (1.0.1)
167-
faraday-multipart (1.0.4)
168-
multipart-post (~> 2)
169-
faraday-net_http (1.0.2)
170-
faraday-net_http_persistent (1.2.0)
171-
faraday-patron (1.0.0)
172-
faraday-rack (1.0.0)
173-
faraday-retry (1.0.3)
150+
faraday (2.14.0)
151+
faraday-net_http (>= 2.0, < 3.5)
152+
json
153+
logger
154+
faraday-net_http (3.4.2)
155+
net-http (~> 0.5)
174156
ffi (1.17.0)
175157
ffi-compiler (1.3.2)
176158
ffi (>= 1.15.5)
@@ -182,36 +164,11 @@ GEM
182164
railties (>= 3.2, < 8.0)
183165
globalid (1.2.1)
184166
activesupport (>= 6.1)
185-
google-apis-core (0.11.3)
186-
addressable (~> 2.5, >= 2.5.1)
187-
googleauth (>= 0.16.2, < 2.a)
188-
httpclient (>= 2.8.1, < 3.a)
189-
mini_mime (~> 1.0)
190-
representable (~> 3.0)
191-
retriable (>= 2.0, < 4.a)
192-
rexml
193-
google-apis-drive_v3 (0.46.0)
194-
google-apis-core (>= 0.11.0, < 2.a)
195-
google-apis-sheets_v4 (0.26.0)
196-
google-apis-core (>= 0.11.0, < 2.a)
197-
google_drive (3.0.7)
198-
google-apis-drive_v3 (>= 0.5.0, < 1.0.0)
199-
google-apis-sheets_v4 (>= 0.4.0, < 1.0.0)
200-
googleauth (>= 0.5.0, < 1.0.0)
201-
nokogiri (>= 1.5.3, < 2.0.0)
202-
googleauth (0.17.1)
203-
faraday (>= 0.17.3, < 2.0)
204-
jwt (>= 1.4, < 3.0)
205-
memoist (~> 0.16)
206-
multi_json (~> 1.11)
207-
os (>= 0.9, < 2.0)
208-
signet (~> 0.15)
209167
gravtastic (3.2.6)
210168
hiredis (0.6.3)
211169
http-accept (1.7.0)
212170
http-cookie (1.0.6)
213171
domain_name (~> 0.5)
214-
httpclient (2.8.3)
215172
i18n (1.14.5)
216173
concurrent-ruby (~> 1.0)
217174
image_processing (1.13.0)
@@ -250,7 +207,6 @@ GEM
250207
net-smtp
251208
marcel (1.0.4)
252209
matrix (0.4.2)
253-
memoist (0.16.2)
254210
method_source (1.1.0)
255211
mime-types (3.5.2)
256212
mime-types-data (~> 3.2015)
@@ -265,11 +221,12 @@ GEM
265221
mini_mime (1.1.5)
266222
minitest (5.24.1)
267223
multi_json (1.15.0)
268-
multipart-post (2.4.1)
269224
mustermann (3.0.0)
270225
ruby2_keywords (~> 0.0.1)
271226
mutex_m (0.2.0)
272227
natcmp (1.4.3)
228+
net-http (0.8.0)
229+
uri (>= 0.11.1)
273230
net-imap (0.4.14)
274231
date
275232
net-protocol
@@ -294,7 +251,6 @@ GEM
294251
racc (~> 1.4)
295252
nokogiri (1.16.7-x86_64-linux)
296253
racc (~> 1.4)
297-
os (1.1.4)
298254
parallel (1.25.1)
299255
parser (3.3.4.0)
300256
ast (~> 2.4.1)
@@ -386,10 +342,6 @@ GEM
386342
regexp_parser (2.9.2)
387343
reline (0.5.9)
388344
io-console (~> 0.5)
389-
representable (3.2.0)
390-
declarative (< 0.1.0)
391-
trailblazer-option (>= 0.1.1, < 0.2.0)
392-
uber (< 0.2.0)
393345
request_store (1.7.0)
394346
rack (>= 1.4)
395347
responders (3.1.1)
@@ -400,7 +352,6 @@ GEM
400352
http-cookie (>= 1.0.2, < 2.0)
401353
mime-types (>= 1.16, < 4.0)
402354
netrc (~> 0.8)
403-
retriable (3.1.2)
404355
rexml (3.3.2)
405356
strscan
406357
rspec (3.13.0)
@@ -478,11 +429,6 @@ GEM
478429
sprockets (> 3.0)
479430
sprockets-rails
480431
tilt
481-
signet (0.19.0)
482-
addressable (~> 2.8)
483-
faraday (>= 0.17.5, < 3.a)
484-
jwt (>= 1.5, < 3.0)
485-
multi_json (~> 1.10)
486432
simplecov (0.22.0)
487433
docile (~> 1.1)
488434
simplecov-html (~> 0.11)
@@ -511,13 +457,12 @@ GEM
511457
thor (1.3.1)
512458
tilt (2.4.0)
513459
timeout (0.4.1)
514-
trailblazer-option (0.1.2)
515460
tzinfo (2.0.6)
516461
concurrent-ruby (~> 1.0)
517-
uber (0.1.0)
518462
uglifier (4.2.0)
519463
execjs (>= 0.3.0, < 3)
520464
unicode-display_width (2.5.0)
465+
uri (1.1.1)
521466
webrick (1.8.1)
522467
websocket-driver (0.7.6)
523468
websocket-extensions (>= 0.1.0)
@@ -557,9 +502,9 @@ DEPENDENCIES
557502
doorkeeper (~> 5.7, >= 5.7.1)
558503
doorkeeper-openid_connect (~> 1.8, >= 1.8.9)
559504
factory_bot_rails (~> 6.4, >= 6.4.3)
505+
faraday (~> 2.14)
560506
file_validators (~> 3.0)
561507
font-awesome-rails (~> 4.7, >= 4.7.0.8)
562-
google_drive (~> 3.0, >= 3.0.7)
563508
gravtastic (~> 3.2, >= 3.2.6)
564509
hiredis (~> 0.6.3)
565510
image_processing (~> 1.12, >= 1.12.2)

app/controllers/api/v8/apidocs_controller.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ class ApidocsController < ActionController::Base
6262
key :required, true
6363
key :type, :integer
6464
end
65+
parameter :path_user_email do
66+
key :name, :user_email
67+
key :in, :path
68+
key :description, "User's email"
69+
key :required, true
70+
key :type, :string
71+
end
6572
parameter :path_exercise_id do
6673
key :name, :exercise_id
6774
key :in, :path

0 commit comments

Comments
 (0)