Commit: 57b88b17f31e853c7479bded797a1edd78075cd9 - todocmd (git)

*NIXコンソール用Google ToDo(Tasks) クライアント

Commit MetaInfo

• Revision: 57b88b17f31e853c7479bded797a1edd78075cd9 (tree)
• Zeit: 2020-01-15 21:40:23
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

• WorkBackup
  

Ändern Zusammenfassung

• modified: src/libtodo.h
• modified: src/libtodo_api.c
• modified: src/libtodo_configfile.c
• modified: src/libtodo_configfile.h
• modified: src/libtodo_glapi_base.c
• modified: src/libtodo_glapi_base.h
• modified: src/todocmd_setup.c

Diff

--- a/src/libtodo.h
+++ b/src/libtodo.h
@@ -69,6 +69,8 @@ LIBTODO_API_API_EXTERN
 LIBTODO_API_API_EXTERN
 	int LibToDo_CreateUserOAuthURL( char *pstr_url );
 LIBTODO_API_API_EXTERN
+	int LibToDo_CreateConfigFile( char *pstr_code );
+LIBTODO_API_API_EXTERN
 	int LibToDo_GetData( LibToDo_Data *p_data, int i_id );
 LIBTODO_API_API_EXTERN
 	int LibToDo_GetTopDataID( void );

--- a/src/libtodo_api.c
+++ b/src/libtodo_api.c
@@ -80,6 +80,24 @@ int
 /* ===================================================================*/
 LIBTODO_API_API_EXTERN
 int
+	LibToDo_CreateConfigFile(
+			char *pstr_code )
+{
+	int		i_result;
+
+	if( NULL == pstr_code )	{
+		return -0x01;
+	}
+
+	i_result	= ConfigFile_CreateConfig( pstr_code );
+
+	return i_result;
+}
+
+
+/* ===================================================================*/
+LIBTODO_API_API_EXTERN
+int
 	LibToDo_GetData(
 			LibToDo_Data	*p_data,
 			int				i_id )

--- a/src/libtodo_configfile.c
+++ b/src/libtodo_configfile.c
@@ -138,16 +138,58 @@ int
 	ConfigFile_CreateConfig(
 			char *pstr_code )
 {
-	//int		i_len;
-	//FILE	*fp;
-	//char	str_buf[1024];
+	int		i_len;
+	int		i_result;
+	FILE	*fp;
+	char	str_buf[1024];
 	struct stat	t_buf;
 
 	if( 0x00 == stat( gstr_configfile, &t_buf ) )	{ return 0x01; }
 
 	memset( &gt_config, 0x00, sizeof( LibToDo_Config ) );
 
-	ConfigFile_WriteConfig();
+
+	fp	= fopen("../../todocmd.conf", "r" );
+	if( NULL == fp )	{
+		return -0x01;
+	}
+
+	do	{
+		if( NULL == fgets( str_buf, 1024, fp ))	{ break; }
+
+		i_len	= strnlen( str_buf, 1024 );
+		if( 14 > i_len )	{ continue; }
+
+		str_buf[13]	= '\0';		// '=' -> NULL (for seperate key & value)
+		if( '\n' == str_buf[i_len - 1] )	{
+			str_buf[i_len - 1]	= '\0';
+			i_len--;
+		}
+		if( !strcmp( str_buf, "client_id    " ))
+			{ strncpy( gt_config.str_client_id, (str_buf + 14), 256 ); }
+		if( !strcmp( str_buf, "client_secret" ))
+			{ strncpy( gt_config.str_client_secret, (str_buf + 14), 256 ); }
+		
+	}while( !feof(fp) );
+	fclose( fp );
+
+	strncpy( gt_config.str_code, pstr_code, 256 );
+
+	i_result	= GLAPI_Base_GetToken();
+	if( 0x00 != i_result )	{
+		return -0x02;
+	}
+
+	//printf( "access_token =%s\n", gt_config.str_access_token );
+	//printf( "refresh_token=%s\n", gt_config.str_refresh_token );
+	//printf( "token_type   =%s\n", gt_config.str_token_type );
+	//printf( "client_id    =%s\n", gt_config.str_client_id );
+	//printf( "client_secret=%s\n", gt_config.str_client_secret );
+	
+	i_result	= ConfigFile_WriteConfig();
+	if( 0x00 != i_result )	{
+		return -0x03;
+	}
 
 	return 0x00;
 }

--- a/src/libtodo_configfile.h
+++ b/src/libtodo_configfile.h
@@ -45,6 +45,8 @@ LIBTODO_CONFIGFILE_EXTERN
 LIBTODO_CONFIGFILE_EXTERN
 	int ConfigFile_Global_CreateOAuthURL( char *pstr_url );
 LIBTODO_CONFIGFILE_EXTERN
+	int ConfigFile_CreateConfig( char *pstr_code );
+LIBTODO_CONFIGFILE_EXTERN
 	void ConfigFile_SetConfigFilePath( char *pstr_cfgpath );
 LIBTODO_CONFIGFILE_EXTERN
 	int ConfigFile_ReadConfig( void );

--- a/src/libtodo_glapi_base.c
+++ b/src/libtodo_glapi_base.c
@@ -269,17 +269,19 @@ int
 LIBTODO_GLAPI_BASE_EXTERN
 int
 	GLAPI_Base_GetToken(
-			char *pstr_code )
+			void )
 {
 	int				i_result;
-	//json_object		*p_json;
+	json_object		*p_json;
+	json_object		*p_jerr;
 	GLAPI_Result	t_glrefresh;
+	char			str_err[64];
 
     GLAPI_Base_AllocResultArea( &t_glrefresh );
 
 	snprintf( (char *)t_glrefresh.pb_request, 32767,
-				"code=%s&client_id=%s&client_secret=%sredirect_uri=urn%%3Aietf%%3Awg%%3Aoauth%%3A2.0%%3Aoob&grant_type=authorization_code&access_type=offline",
-				pstr_code, gt_config.str_client_id, gt_config.str_client_secret );
+				"code=%s&client_id=%s&client_secret=%s&redirect_uri=urn%%3Aietf%%3Awg%%3Aoauth%%3A2.0%%3Aoob&grant_type=authorization_code&access_type=offline",
+				gt_config.str_code, gt_config.str_client_id, gt_config.str_client_secret );
 
     i_result    = GLAPI_Base_SendAPI( &t_glrefresh, SENDAPI_MODE_POST, LIBTODO_GL_TOKEN_URI, NULL );
 	if( 0 > i_result )	{
@@ -287,11 +289,17 @@ int
 		return -0x01;
 	}
 
-/* XXX (2020/01/14)
 	p_json		= json_tokener_parse( (const char *)t_glrefresh.pb_result );
-	i_result	= ProcJson_GetAccessToken( p_json );
+
+	p_jerr	= ProcJson_GetJsonChildString( str_err, p_json, "error", 64 );
+	if( NULL == p_jerr )	{ 
+		ProcJson_GetJsonChildString( gt_config.str_access_token, p_json, "access_token", 256 );
+		ProcJson_GetJsonChildString( gt_config.str_refresh_token, p_json, "refresh_token", 256 );
+		ProcJson_GetJsonChildString( gt_config.str_token_type, p_json, "token_type", 64 );
+	}
+
 	json_object_put( p_json );
-*/
+
 	GLAPI_Base_FreeResultArea( &t_glrefresh );
 
 	return 0x00;

--- a/src/libtodo_glapi_base.h
+++ b/src/libtodo_glapi_base.h
@@ -61,6 +61,8 @@ LIBTODO_GLAPI_BASE_EXTERN
 LIBTODO_GLAPI_BASE_EXTERN
 	int GLAPI_Base_RefreshToken( void );
 LIBTODO_GLAPI_BASE_EXTERN
+	int GLAPI_Base_GetToken( void );
+LIBTODO_GLAPI_BASE_EXTERN
 	int GLAPI_Base_DoAPI( GLAPI_Result *p_glresult, Byte b_mode, char *pstr_url );
 
 #endif

--- a/src/todocmd_setup.c
+++ b/src/todocmd_setup.c
@@ -39,13 +39,13 @@ int
 	Setup_SetupScenery(
 			void )
 {
-	int		i_err;
+	int		i_len;
 	int		i_result;
 	char	str_url[1024];
 	char	str_code[512];
 
-	i_err	= LibToDo_CreateUserOAuthURL( str_url );
-	if( 0x00 != i_err )	{
+	i_result	= LibToDo_CreateUserOAuthURL( str_url );
+	if( 0x00 != i_result )	{
 		return -0x01;
 	}
 
@@ -57,6 +57,12 @@ int
 
 	fgets( str_code, 512, stdin );
 
+	i_len	= strnlen( str_code, 512 );
+	if( 0 < i_len )	{
+		str_code[i_len - 1]	= '\0';
+		i_len--;
+	}
+
 	puts(" Is the input code correct below? (Y/N): " );
 
 	printf("    CODE: [%s]\n", str_code );
@@ -65,8 +71,12 @@ int
 		return 0x00;
 	}
 
+	i_result	= LibToDo_CreateConfigFile( str_code );
+	if( 0x00 != i_result )	{
+		return -0x02;
+	}
 
-
+	puts(" Success! - Create ConfigFile.");
 
 	return 0x00;
 }