|
1 | 1 | package org.azd.authentication; |
2 | 2 |
|
3 | 3 | import org.azd.exceptions.AzDException; |
| 4 | +import org.azd.helpers.URLHelper; |
4 | 5 | import org.azd.oauth.OAuthAccessTokenBuilder; |
5 | 6 | import org.azd.oauth.types.AuthorizedToken; |
6 | 7 |
|
@@ -75,7 +76,7 @@ public OAuthAccessTokenCredential(String organizationUrl, String projectName, |
75 | 76 | Objects.requireNonNull(authCode, "Auth code cannot be null."); |
76 | 77 |
|
77 | 78 | this.organizationUrl = organizationUrl; |
78 | | - this.projectName = projectName; |
| 79 | + this.projectName = URLHelper.encodeSpace(projectName); |
79 | 80 | this.appSecret = appSecret; |
80 | 81 | this.authCode = authCode; |
81 | 82 | this.callbackUrl = callbackUrl; |
@@ -119,7 +120,7 @@ public String getProjectName() { |
119 | 120 | */ |
120 | 121 | @Override |
121 | 122 | public void setProjectName(String projectName) { |
122 | | - this.projectName = projectName; |
| 123 | + this.projectName = URLHelper.encodeSpace(projectName); |
123 | 124 | } |
124 | 125 |
|
125 | 126 | /** |
@@ -150,12 +151,12 @@ public void setAccessToken(String accessToken) { |
150 | 151 | private void authenticate() { |
151 | 152 | var oauthBuilder = new OAuthAccessTokenBuilder(); |
152 | 153 | try { |
153 | | - if (authorizedToken != null) |
154 | | - if (oauthBuilder.hasTokenExpired(authorizedToken)) |
155 | | - authorizedToken = oauthBuilder.getRefreshToken(appSecret, authorizedToken.getRefreshToken(), callbackUrl); |
156 | | - else authorizedToken = oauthBuilder.getAccessToken(appSecret, authCode, callbackUrl); |
157 | | - if (authorizedToken != null) |
| 154 | + if (authorizedToken != null) { |
| 155 | + authorizedToken = oauthBuilder.hasTokenExpired(authorizedToken) ? |
| 156 | + oauthBuilder.getRefreshToken(appSecret, authorizedToken.getRefreshToken(), callbackUrl) : |
| 157 | + oauthBuilder.getAccessToken(appSecret, authCode, callbackUrl); |
158 | 158 | setAccessToken(authorizedToken.getAccessToken()); |
| 159 | + } |
159 | 160 | } catch (AzDException e) { |
160 | 161 | throw new RuntimeException(e); |
161 | 162 | } |
|
0 commit comments