From 79c11e597c766fc0b898c29f757a97a402eccd53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karsten=20Ku=CC=88pper?= Date: Wed, 4 Dec 2024 16:34:03 -0500 Subject: [PATCH 1/2] allow providing an access_token in the url --- common/app/scripts/services/_api.js | 30 ++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/common/app/scripts/services/_api.js b/common/app/scripts/services/_api.js index 7bc52dfe..03de0fbb 100644 --- a/common/app/scripts/services/_api.js +++ b/common/app/scripts/services/_api.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('bmmLibApp') - .factory('_api', function ($timeout, $rootScope, _api_queue, $analytics, ngOidcClient, $q) { + .factory('_api', function ($timeout, $rootScope, _api_queue, $analytics, ngOidcClient, $q, $location) { var factory = {}, oidcUser = {}, @@ -661,10 +661,38 @@ angular.module('bmmLibApp') }; + + factory.loadNewlyCreatedUser = + /** Get the users profile **/ factory.loginUser = function() { var deferred = $q.defer(); + var searchObject = $location.search(); + if (searchObject.access_token) { + console.log("basic auth detected"); + + console.log("bypass login and use provided basic auth token"); + + oidcUser = { + access_token: searchObject.access_token, + profile: { + "https://members.bcc.no/app_metadata": { + person_id: 1 + } + } + }; + + factory.sendXHR({ + method: 'GET', + url: serverUrl+'currentUser' + }, false).then(function(apiUser) { + deferred.resolve(apiUser); + }); + return deferred.promise; + } + + ngOidcClient.manager.events.addUserLoaded(function(user) { // Update user when silent renew is triggered oidcUser = user; From 2c9856e2ba195b9bdff0eeb1e23e75dfa38b98fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karsten=20Ku=CC=88pper?= Date: Thu, 5 Dec 2024 15:46:47 -0500 Subject: [PATCH 2/2] change to basic_auth --- common/app/scripts/services/_api.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/app/scripts/services/_api.js b/common/app/scripts/services/_api.js index 03de0fbb..3d0fe366 100644 --- a/common/app/scripts/services/_api.js +++ b/common/app/scripts/services/_api.js @@ -235,6 +235,9 @@ angular.module('bmmLibApp') }; factory.getAuthorizationHeader = function() { + if (oidcUser.basic_auth) { + return "Basic " + oidcUser.basic_auth; + } return "Bearer " + oidcUser.access_token; }; @@ -669,13 +672,12 @@ angular.module('bmmLibApp') var deferred = $q.defer(); var searchObject = $location.search(); - if (searchObject.access_token) { + if (searchObject.basic_auth) { console.log("basic auth detected"); - console.log("bypass login and use provided basic auth token"); oidcUser = { - access_token: searchObject.access_token, + basic_auth: searchObject.basic_auth, profile: { "https://members.bcc.no/app_metadata": { person_id: 1