fix(pcm): redirect uri was incorrect

ryancurrah · Jan 3, 2021 · b5ac0ed · b5ac0ed
1 parent 987487b
commit b5ac0ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/smartdevicemanagement_exporter/main.go b/cmd/smartdevicemanagement_exporter/main.go
@@ -68,6 +68,7 @@ func main() {
 		AuthorizationCodeChan: authorizationCodeChan,
 		ClientID:              config.ClientID,
 		ProjectID:             *pid,
+		AuthorizedPath:        "/authorized",
 	}
 
 	sdme := smartdevicemanagementexporter.SmartDeviceManagementExporter{

diff --git a/partnerconnmanager/partnerconnmanager.go b/partnerconnmanager/partnerconnmanager.go
@@ -22,6 +22,7 @@ type PartnerConnManager struct {
 	AuthorizationCodeChan chan AuthorizationCode
 	ClientID              string
 	ProjectID             string
+	AuthorizedPath        string
 }
 
 func (p *PartnerConnManager) AuthorizeHandler(w http.ResponseWriter, r *http.Request) {
@@ -39,6 +40,8 @@ func (p *PartnerConnManager) AuthorizeHandler(w http.ResponseWriter, r *http.Req
 		return
 	}
 
+	uri.Path = p.AuthorizedPath
+
 	v := url.Values{
 		"access_type":   {"offline"},
 		"prompt":        {"consent"},
@@ -70,6 +73,8 @@ func (p *PartnerConnManager) AuthorizedHandler(w http.ResponseWriter, r *http.Re
 		return
 	}
 
+	uri.Path = r.URL.Path
+
 	p.AuthorizationCodeChan <- AuthorizationCode{Code: code, RedirectURI: uri.String()}
 
 	fmt.Fprint(w, "authorization code received from partner connection manager")
@@ -86,7 +91,5 @@ func redirectURI(r *http.Request) (*url.URL, error) {
 		return nil, err
 	}
 
-	u.Path = r.URL.Path
-
 	return u, nil
 }