Skip to content

Commit 13eead8

Browse files
committed
Add default client ID for MS Entrada ID.
1 parent e706c77 commit 13eead8

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

cups/oauth.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@ typedef enum _cups_otype_e // OAuth data type
110110
// Local constants...
111111
//
112112

113+
#define _CUPS_CONNECTOR_CLIENT_ID "a92130af-5eac-4a8a-8ba3-e17276b52ca1"
114+
// CUPS Universal Print Connector client ID
115+
#define _CUPS_CONNECTOR_OAUTH_URI "https://login.microsoftonline.com/"
116+
// OAuth URI prefix for MS Entrada ID
117+
#define _CUPS_CONNECTOR_OAUTH_URILEN 34
118+
// Length of OAuth URI prefix
119+
113120
#define _CUPS_OAUTH_REDIRECT_FORMAT "http://127.0.0.1:%d/"
114121
// Redirect URI with port
115122
#define _CUPS_OAUTH_REDIRECT_PATH "/?"
@@ -235,7 +242,16 @@ cupsOAuthCopyClientId(
235242
const char *auth_uri, // I - Authorization Server URI
236243
const char *redirect_uri) // I - Redirection URI
237244
{
238-
return (oauth_load_value(auth_uri, redirect_uri, _CUPS_OTYPE_CLIENT_ID));
245+
char *client_id; // Client ID value
246+
247+
248+
if ((client_id = oauth_load_value(auth_uri, redirect_uri, _CUPS_OTYPE_CLIENT_ID)) == NULL && !strncmp(auth_uri, _CUPS_CONNECTOR_OAUTH_URI, _CUPS_CONNECTOR_OAUTH_URILEN))
249+
{
250+
// Use the default CUPS Universal Print connector client ID with MS Entrada ID...
251+
client_id = strdup(_CUPS_CONNECTOR_CLIENT_ID);
252+
}
253+
254+
return (client_id);
239255
}
240256

241257

0 commit comments

Comments
 (0)