SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-02 13:03:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

decouple http from login manager (#6108)

Browse Source
This commit is contained in:
Lars Hvam 2023-03-01 15:04:20 +01:00 committed by GitHub
parent 4a68f896b1
commit 323b345d03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/http/zcl_abapgit_http.clas.abap
View File

@ -48,7 +48,7 @@ ENDCLASS.
CLASS zcl_abapgit_http IMPLEMENTATION. CLASS ZCL_ABAPGIT_HTTP IMPLEMENTATION.
METHOD acquire_login_details. METHOD acquire_login_details.
@ -119,6 +119,7 @@ CLASS zcl_abapgit_http IMPLEMENTATION.
DATA: lv_uri TYPE string, DATA: lv_uri TYPE string,
lv_scheme TYPE string, lv_scheme TYPE string,
lv_authorization TYPE string,
li_client TYPE REF TO if_http_client, li_client TYPE REF TO if_http_client,
lo_proxy_configuration TYPE REF TO zcl_abapgit_proxy_config, lo_proxy_configuration TYPE REF TO zcl_abapgit_proxy_config,
lv_text TYPE string. lv_text TYPE string.
@ -188,9 +189,13 @@ CLASS zcl_abapgit_http IMPLEMENTATION.
" Disable internal auth dialog (due to its unclarity) " Disable internal auth dialog (due to its unclarity)
li_client->propertytype_logon_popup = if_http_client=>co_disabled. li_client->propertytype_logon_popup = if_http_client=>co_disabled.
zcl_abapgit_login_manager=>load( lv_authorization = zcl_abapgit_login_manager=>load( iv_url ).
iv_uri = iv_url IF lv_authorization IS NOT INITIAL.
ii_client = li_client ). li_client->request->set_header_field(
name = 'authorization'
value = lv_authorization ).
li_client->propertytype_logon_popup = li_client->co_disabled.
ENDIF.
zcl_abapgit_exit=>get_instance( )->http_client( zcl_abapgit_exit=>get_instance( )->http_client(
iv_url = iv_url iv_url = iv_url
@ -206,8 +211,9 @@ CLASS zcl_abapgit_http IMPLEMENTATION.
ro_client->check_http_200( ). ro_client->check_http_200( ).
IF lv_scheme <> c_scheme-digest. IF lv_scheme <> c_scheme-digest.
zcl_abapgit_login_manager=>save( iv_uri = iv_url zcl_abapgit_login_manager=>save(
ii_client = li_client ). iv_uri = iv_url
iv_authorization = li_client->request->get_header_field( 'authorization' ) ).
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.

20
src/http/zcl_abapgit_login_manager.clas.abap
View File

@ -8,7 +8,6 @@ CLASS zcl_abapgit_login_manager DEFINITION
CLASS-METHODS load CLASS-METHODS load
IMPORTING IMPORTING
!iv_uri TYPE string !iv_uri TYPE string
!ii_client TYPE REF TO if_http_client OPTIONAL
RETURNING RETURNING
VALUE(rv_authorization) TYPE string VALUE(rv_authorization) TYPE string
RAISING RAISING
@ -16,7 +15,7 @@ CLASS zcl_abapgit_login_manager DEFINITION
CLASS-METHODS save CLASS-METHODS save
IMPORTING IMPORTING
!iv_uri TYPE string !iv_uri TYPE string
!ii_client TYPE REF TO if_http_client !iv_authorization TYPE string
RAISING RAISING
zcx_abapgit_exception . zcx_abapgit_exception .
CLASS-METHODS clear . CLASS-METHODS clear .
@ -97,18 +96,11 @@ CLASS ZCL_ABAPGIT_LOGIN_MANAGER IMPLEMENTATION.
METHOD load. METHOD load.
DATA: ls_auth LIKE LINE OF gt_auth. DATA ls_auth LIKE LINE OF gt_auth.
READ TABLE gt_auth INTO ls_auth WITH KEY uri = zcl_abapgit_url=>host( iv_uri ). READ TABLE gt_auth INTO ls_auth WITH KEY uri = zcl_abapgit_url=>host( iv_uri ).
IF sy-subrc = 0. IF sy-subrc = 0.
rv_authorization = ls_auth-authorization. rv_authorization = ls_auth-authorization.
IF NOT ii_client IS INITIAL.
ii_client->request->set_header_field(
name = 'authorization'
value = ls_auth-authorization ).
ii_client->propertytype_logon_popup = ii_client->co_disabled.
ENDIF.
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.
@ -116,13 +108,9 @@ CLASS ZCL_ABAPGIT_LOGIN_MANAGER IMPLEMENTATION.
METHOD save. METHOD save.
DATA: lv_auth TYPE string. IF NOT iv_authorization IS INITIAL.
lv_auth = ii_client->request->get_header_field( 'authorization' ).
IF NOT lv_auth IS INITIAL.
append( iv_uri = iv_uri append( iv_uri = iv_uri
iv_auth = lv_auth ). iv_auth = iv_authorization ).
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.

24
src/http/zcl_abapgit_login_manager.clas.testclasses.abap
View File

@ -7,10 +7,9 @@ CLASS ltcl_login_manager DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHO
METHODS: METHODS:
setup, setup,
teardown, teardown,
encoding FOR TESTING encoding FOR TESTING RAISING zcx_abapgit_exception,
RAISING zcx_abapgit_exception, save FOR TESTING RAISING zcx_abapgit_exception,
same_server FOR TESTING same_server FOR TESTING RAISING zcx_abapgit_exception.
RAISING zcx_abapgit_exception.
ENDCLASS. ENDCLASS.
@ -24,9 +23,24 @@ CLASS ltcl_login_manager IMPLEMENTATION.
zcl_abapgit_login_manager=>clear( ). zcl_abapgit_login_manager=>clear( ).
ENDMETHOD. ENDMETHOD.
METHOD save.
CONSTANTS lc_uri TYPE string VALUE 'https://abapgit.org/foo/bar'.
CONSTANTS lc_auth TYPE string VALUE 'foobar'.
zcl_abapgit_login_manager=>save(
iv_uri = lc_uri
iv_authorization = lc_auth ).
cl_abap_unit_assert=>assert_equals(
act = zcl_abapgit_login_manager=>get( lc_uri )
exp = lc_auth ).
ENDMETHOD.
METHOD encoding. METHOD encoding.
DATA: lv_auth TYPE string. DATA lv_auth TYPE string.
lv_auth = zcl_abapgit_login_manager=>set( lv_auth = zcl_abapgit_login_manager=>set(
iv_uri = 'https://github.com/abapGit/abapGit.git' iv_uri = 'https://github.com/abapGit/abapGit.git'